From b2c4dd6b8717aadc383e9727fefbf98af5643025 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 7 Sep 2010 13:21:01 +0530
Subject: [PATCH 001/632] [MOD/IMP]res_user : Usability Improvement

bzr revid: dbr@tinyerp.com-20100907075101-ki0rwisnslqjqd93
---
 bin/addons/base/base_update.xml | 14 ++++++++------
 bin/addons/base/res/res_user.py |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7639418f825..02ea1c58e5c 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -114,16 +114,18 @@
                     <newline/>
                     <notebook colspan="4">
                         <page string="User">
-                            <field name="address_id" select="1"/>
-                            <field name="user_email" widget="email"/>
                             <field name="company_id" required="1"
                                 context="{'user_id': self, 'user_preference': 1}"
                                 on_change="on_change_company_id(company_id)"
                                 groups="base.group_multi_company"
-                                />
+                                />                        
+                            <field name="address_id" select="1"/>
+                            <field name="user_email" widget="email"/>
+                            <field name="context_lang"/>   
+                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
                             <field name="action_id" required="True"/>
-                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
-                            <field name="context_lang"/>
+
+
                             <field name="context_tz"/>
                             <field name="view" readonly="0"/>
                             <field name="menu_tips" colspan="2"/>
@@ -141,7 +143,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Companies">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1" widget="selection"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d8645a83cc0..db76c333730 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -240,10 +240,10 @@ class users(osv.osv):
                  " aren't configured, it won't be possible to email new "
                  "users."),
         'signature': fields.text('Signature', size=64),
-        'address_id': fields.many2one('res.partner.address', 'Address'),
+        'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action',help="Always Display Tips"),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 

From 34577af85f3d9b2a4f578e66cf47d86e5de7a3aa Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Tue, 7 Sep 2010 10:49:02 +0200
Subject: [PATCH 002/632] [FIX] Fixed gettext translation (in particular, fixed
 translation in RML reports).

bzr revid: jth@openerp.com-20100907084902-0l323afsiju4y1i4
---
 bin/tools/translate.py | 62 ++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 18747a3c143..64f742924f3 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -29,6 +29,7 @@ import re
 import tarfile
 import tempfile
 from os.path import join
+import logging
 
 from datetime import datetime
 from lxml import etree
@@ -127,30 +128,55 @@ def translate(cr, name, source_type, lang, source=None):
     res = res_trans and res_trans[0] or False
     return res
 
+logger = logging.getLogger('translate')
+
 class GettextAlias(object):
+
+    def _get_cr(self, frame):
+        is_new_cr = False
+        cr = frame.f_locals.get('cr')
+        if not cr:
+            s = frame.f_locals.get('self', {})
+            cr = getattr(s, 'cr', False)
+            if not cr:
+                if frame.f_globals.get('pooler', False):
+                    # TODO: we should probably get rid of the 'is_new_cr' case: no cr in locals -> no translation for you
+                    dbs = frame.f_globals['pooler'].pool_dic.keys()
+                    if len(dbs) == 1:
+                        cr = pooler.get_db(dbs[0]).cursor()
+                        is_new_cr = True
+        return cr, is_new_cr
+    
+    def _get_lang(self, frame):
+        lang = frame.f_locals.get('context', {}).get('lang', False)
+        if not lang:
+            args = frame.f_locals.get('args', False)
+            if args:
+                lang = args[-1].get('lang', False)
+            if not lang:
+                s = frame.f_locals.get('self', {})
+                c = getattr(s, 'localcontext', {})
+                lang = c.get('lang', False)
+        return lang
+    
     def __call__(self, source):
+        is_new_cr = False
+        res = source
         try:
             frame = inspect.stack()[1][0]
+            cr, is_new_cr = self._get_cr(frame)
+            lang = self._get_lang(frame)
+            if lang and cr:
+                cr.execute('SELECT value FROM ir_translation WHERE lang=%s AND type IN (%s, %s) AND src=%s', (lang, 'code','sql_constraint', source))
+                res_trans = cr.fetchone()
+                res = res_trans and res_trans[0] or source
         except:
-            return source
+            logger.warn('translation went wrong for string %s', repr(source))
+        finally:
+            if is_new_cr:
+                cr.close()
+        return res
 
-        cr = frame.f_locals.get('cr')
-        try:
-            lang = (frame.f_locals.get('context') or {}).get('lang', False)
-            if not (cr and lang):
-                args = frame.f_locals.get('args',False)
-                if args:
-                    lang = args[-1].get('lang',False)
-                    if frame.f_globals.get('pooler',False):
-                        cr = pooler.get_db(frame.f_globals['pooler'].pool_dic.keys()[0]).cursor()
-            if not (lang and cr):
-                return source
-        except:
-            return source
-
-        cr.execute('select value from ir_translation where lang=%s and type IN (%s,%s) and src=%s', (lang, 'code','sql_constraint', source))
-        res_trans = cr.fetchone()
-        return res_trans and res_trans[0] or source
 _ = GettextAlias()
 
 

From 1e5bd3dc4c5dfde324ed559b01ffdc89d2367c63 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 8 Sep 2010 11:35:34 +0530
Subject: [PATCH 003/632] [IMP] res_user view improved

bzr revid: vir@tinyerp.com-20100908060534-pod7b4b10lxd193n
---
 bin/addons/base/base_update.xml | 2 +-
 bin/addons/base/res/res_user.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 02ea1c58e5c..8e12c123b42 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -143,7 +143,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Companies">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1" widget="selection"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index db76c333730..9203d76dacc 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -243,7 +243,7 @@ class users(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action',help="Always Display Tips"),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 
@@ -264,7 +264,7 @@ class users(osv.osv):
                                 selection=[('simple','Simplified'),('extended','Extended')],
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
         'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to display tips on each menu action"),
+        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
 
     }
 

From ee198c29abe9a56dd9876afe53ca52b2a0e1a063 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 8 Sep 2010 13:36:22 +0200
Subject: [PATCH 004/632] [FIX] stock: properly handle child locations during
 inventory import

bzr revid: odo@openerp.com-20100908113622-csl1mcogawrkeee2
---
 addons/stock/wizard/stock_fill_inventory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index e133a9fc879..bc7d0453091 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -64,7 +64,7 @@ class stock_fill_inventory(osv.osv_memory):
             for product_id in res.keys():
                 prod = product_obj.browse(cr, uid, [product_id])[0]
                 uom = prod.uom_id.id
-                context.update({'uom': uom})
+                context.update(uom=uom, compute_child=False)
                 amount = stock_location_obj._product_get(cr, uid,
                          location, [product_id], context=context)[product_id]
 

From ce357b7f18cd7a96006046b46193c89690203dfd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 17:42:12 +0530
Subject: [PATCH 005/632] [ADD] stock : Add a partner_id field in stock and
 list view of picking

bzr revid: sbh@tinyerp.com-20100908121212-53b8kod0wfzd6kuj
---
 addons/stock/stock.py       |  3 ++-
 addons/stock/stock_view.xml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5ecbd5f40ba..2294da261d8 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -654,7 +654,8 @@ class stock_picking(osv.osv):
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'auto_picking': fields.boolean('Auto-Picking'),
-        'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
+        'address_id': fields.many2one('res.partner.address', 'Address', help="Address of partner"),
+        'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True),        
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 108237576a2..5d8156655b0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -941,13 +941,13 @@
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id"/>
+                        <field name="partner_id"/>
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -996,7 +996,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
@@ -1156,14 +1156,14 @@
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id" />
+                        <field name="partner_id" />
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
@@ -1208,7 +1208,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id" />
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -1363,7 +1363,7 @@
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id"/>
+                        <field name="partner_id"/>
                         <field name="origin"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
@@ -1372,7 +1372,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>

From d8318d66f66ea99d92c017e516190244b3eaebc9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 17:44:18 +0530
Subject: [PATCH 006/632] [ADD] stock : Add a partner_id field in delivery list
 view

bzr revid: sbh@tinyerp.com-20100908121418-8i0yj167floqoakg
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5d8156655b0..db2d9e59da1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -776,7 +776,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>

From 54ed33730f37978c457dd67109f31018af6a71a6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:07:05 +0530
Subject: [PATCH 007/632] [IMP] stock : change the contact_display of all
 picking

bzr revid: sbh@tinyerp.com-20100908123705-152r19r46odrfzoi
---
 addons/stock/stock_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index db2d9e59da1..88810e87bc1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -962,7 +962,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
@@ -1179,7 +1179,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner', 'search_default_available': 1}</field>
+            <field name="context">{'contact_display': 'partner_address', 'search_default_available': 1}</field>
             <field name="search_view_id" ref="view_picking_out_search"/>
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
@@ -1389,7 +1389,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@@ -1444,7 +1444,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
 

From b095ebd8268d7938409b0fa0bd3d48e45d00f8db Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:22:26 +0530
Subject: [PATCH 008/632] [ADD] stock: Add the list for stock_move in
 Production Lots

bzr revid: sbh@tinyerp.com-20100908125226-p5heeoa8s1hsvrpf
---
 addons/stock/stock_view.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 88810e87bc1..3f21ef33256 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -288,7 +288,20 @@
                             <field colspan="2" name="revisions" nolabel="1"/>
                         </page>
                         <page string="Stock Moves">
-                            <field colspan="2" name="move_ids" nolabel="1"/>
+                            <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="name" string="Move Name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="product_uos" groups="product.product_uos"/>
+                                    <field name="picking_id"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="state"/>
+                                </tree>
+                             </field>                            
                         </page>
                     </notebook>
                 </form>

From 51c5533ebec5259cb35f0238dff780a2170aa2d0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:36:57 +0530
Subject: [PATCH 009/632] [IMP] stock: Imrpove the view of Periodical
 Inventory,rename the label and add the list view of move_ids

bzr revid: sbh@tinyerp.com-20100908130657-6it84bme2brthnwo
---
 addons/stock/stock_view.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3f21ef33256..a05e3217613 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -85,14 +85,14 @@
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Lot Inventory">
+                <form string="Physical Inventory">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
                     <page string="General Informations">
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
-                            <tree string="Inventory Lines" editable="bottom">
+                            <tree string="Products" editable="bottom">
                                 <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
@@ -103,7 +103,7 @@
                                     string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
-                            <form string="Inventory Lines">
+                            <form string="Products ">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
@@ -117,7 +117,17 @@
                             </form>
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
-                        <field colspan="4" name="move_ids" nolabel="1"/>
+  						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
+                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                    <field name="name" string="Move Name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="prodlot_id" groups="base.group_extended"/>
+                                    <field name="date"/>
+                                    <field name="state"/>
+                                </tree>
+                             </field>                                                    
                     </page>
                     </notebook>
                     <field name="state"/>
@@ -132,7 +142,7 @@
         </record>
 
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Periodical Inventory</field>
+            <field name="name">Physical Inventory</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
@@ -143,7 +153,7 @@
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
 
         <record id="action_inventory_form_draft" model="ir.actions.act_window">
-            <field name="name">Draft Periodical Inventories</field>
+            <field name="name">Draft Physical Inventories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>

From e537bea1ac27dd9d9c60fc57dd64103c7ce0a9b8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 18:52:51 +0530
Subject: [PATCH 010/632] [IMP] stock: Improve the view and change the icon

bzr revid: sbh@tinyerp.com-20100908132251-ku151vivau677nyb
---
 addons/stock/stock_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a05e3217613..5851d31a40a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -41,7 +41,7 @@
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
                             string="Split inventory lines" groups="base.group_extended"
-                            type="action" icon="gtk-justify-fill"/>
+                            type="action" icon="terp-stock_effects-object-colorize"/>
                 </form>
             </field>
         </record>
@@ -101,19 +101,20 @@
                                 <field name="state" />
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_extended"
-                                    type="action" icon="gtk-justify-fill" states="draft"/>
+                                    type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
                             </tree>
                             <form string="Products ">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field  domain="[('usage','=','internal')]" name="location_id"/>
+                                <group colspan="2" col="4">
                                 <field name="prod_lot_id" groups="base.group_extended"/>
-                                <group colspan="2" col="3">
                                     <button name="%(stock.action_view_stock_inventory_line_split)d"
                                         string="Split inventory lines" groups="base.group_extended"
-                                        type="action" icon="gtk-justify-fill"/>
+                                        type="action" icon="terp-stock_effects-object-colorize"/>
                                 </group>
+                                
                             </form>
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
@@ -133,7 +134,7 @@
                     <field name="state"/>
                     <group col="4" colspan="2">
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
-                        <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                     </group>
 

From ba0880457624084a554cf9dd7c85de6d30643ee9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 19:13:53 +0530
Subject: [PATCH 011/632] [IMP] stock: Rename the Fill Inventory to Impor
 Inventory

bzr revid: sbh@tinyerp.com-20100908134353-leco6y3n7i7ejrhq
---
 addons/stock/wizard/stock_fill_inventory.py       | 4 ++--
 addons/stock/wizard/stock_fill_inventory_view.xml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index bc7d0453091..d79d9d61fe0 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -24,14 +24,14 @@ from tools.translate import _
 
 class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
-    _description = "Fill Inventory"
+    _description = "Import Inventory"
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'recursive': fields.boolean("Include all children for the location"),
     }
 
     def fill_inventory(self, cr, uid, ids, context):
-        """ To fill stock inventory according to products available in the selected locations.
+        """ To Import stock inventory according to products available in the selected locations.
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index ef95a3bf447..949df830a3c 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data>
    		<record id="view_stock_fill_inventory" model="ir.ui.view">
-            <field name="name">Fill Inventory</field>
+            <field name="name">Import Inventory</field>
             <field name="model">stock.fill.inventory</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Fill Inventory">
-             		<separator string="Fill Inventory for specific location" colspan="4" />
+              <form string="Import Inventory">
+             		<separator string="Import current product inventory from the following location" colspan="4" />
                 	<field name="location_id"/>
                 	<newline/>
                 	<field name="recursive"/>
@@ -19,7 +19,7 @@
             </field>
 		</record>
 
-         <act_window name="Fill Inventory"		    
+         <act_window name="Import Inventory"		    
 		    res_model="stock.fill.inventory"
 		    src_model="stock.inventory"
 		    view_mode="form"

From bc186ed6b279b51e385c41f607236b5324385aaf Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 8 Sep 2010 19:24:26 +0530
Subject: [PATCH 012/632] [IMP] small change

bzr revid: sbh@tinyerp.com-20100908135426-kvkvbjcv3d97dz7z
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5851d31a40a..032b905c551 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -119,7 +119,7 @@
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
   						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                <tree string="Stock Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>

From 11132ec477f598e200fb9d23edf0e260cdc9c4f3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 11:10:04 +0530
Subject: [PATCH 013/632] [IMP] stock: Add search_default_in_location in fill
 inventory wizard

bzr revid: sbh@tinyerp.com-20100909054004-o3h0vhmxmydmmw4r
---
 addons/stock/wizard/stock_fill_inventory_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 949df830a3c..04e66e525e5 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -24,6 +24,7 @@
 		    src_model="stock.inventory"
 		    view_mode="form"
 		    target="new"        
+		    context="{'search_default_in_location':1}" 
             key2="client_action_multi"    
 		    id="action_view_stock_fill_inventory"/>	
 

From 1239d4c8cdf199d4226e8c61bf94fec9893fca17 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 11:45:10 +0530
Subject: [PATCH 014/632] [ADD] stock: Improve the tooltips of fill_inventory
 wizard and merge set_stock_zero [REM] Remove the set_stock_zero wizard

bzr revid: sbh@tinyerp.com-20100909061510-3rdpvo4m48qxehnv
---
 addons/stock/__openerp__.py                   |  1 -
 addons/stock/wizard/__init__.py               |  1 -
 addons/stock/wizard/stock_fill_inventory.py   | 24 +++++-
 .../wizard/stock_fill_inventory_view.xml      |  1 +
 .../wizard/stock_inventory_set_stock_zero.py  | 74 -------------------
 .../stock_inventory_set_stock_zero_view.xml   | 31 --------
 6 files changed, 23 insertions(+), 109 deletions(-)
 delete mode 100644 addons/stock/wizard/stock_inventory_set_stock_zero.py
 delete mode 100644 addons/stock/wizard/stock_inventory_set_stock_zero_view.xml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index e33e347d612..07a9a73f10f 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -49,7 +49,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_move_view.xml",
         "wizard/stock_partial_picking_view.xml",
         "wizard/stock_partial_move_view.xml",
-        "wizard/stock_inventory_set_stock_zero_view.xml",
         "wizard/stock_fill_inventory_view.xml",
         "wizard/stock_invoice_onshipping_view.xml",
         "wizard/stock_inventory_merge_view.xml",
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 7a13dc26fd5..f6021e0fbe2 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -27,7 +27,6 @@ import stock_partial_move
 import stock_replacement
 import stock_ups
 import stock_inventory_merge
-import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index d79d9d61fe0..e9b3fb2e02c 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -27,7 +27,8 @@ class stock_fill_inventory(osv.osv_memory):
     _description = "Import Inventory"
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'recursive': fields.boolean("Include all children for the location"),
+        'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
+        'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done and when set all inventory lines that are added to the inventory should have zero as quantity"),
     }
 
     def fill_inventory(self, cr, uid, ids, context):
@@ -52,12 +53,31 @@ class stock_fill_inventory(osv.osv_memory):
                 for location in location_ids :
                     res = location_obj._product_get(cr, uid, location)
                     res_location[location] = res
+            if fill_inventory.set_stock_zero:
+                loc = fill_inventory.location_id.id
+                cr.execute('select distinct location_id,product_id \
+                            from stock_inventory_line \
+                            where inventory_id=%s', (context['active_id'],))
+                inv = cr.fetchall()
+                cr.execute('select distinct product_id from stock_move where \
+                            location_dest_id=%s or location_id=%s', (loc, loc,))
+                stock = cr.fetchall()
+                for s in stock:
+                    if (loc, s[0]) not in inv:
+                        p = prod_obj.browse(cr, uid, s[0])
+                        invent_line_obj.create(cr, uid, {
+                            'inventory_id': context['active_id'],
+                            'location_id': loc,
+                            'product_id': s[0],
+                            'product_uom': p.uom_id.id,
+                            'product_qty': 0.0,
+                            })                    
             else:
                 context.update({'compute_child': False})
                 res = location_obj._product_get(cr, uid,
                             fill_inventory.location_id.id, context=context)
                 res_location[fill_inventory.location_id.id] = res
-
+    
         product_ids = []
         for location in res_location.keys():
             res = res_location[location]
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 04e66e525e5..40cf34af26b 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -12,6 +12,7 @@
                 	<newline/>
                 	<field name="recursive"/>
     				<newline/>
+    				<field name="set_stock_zero"/>
         	        <separator string="" colspan="4" />
 					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
             	    <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
deleted file mode 100644
index 4cbba93bdb6..00000000000
--- a/addons/stock/wizard/stock_inventory_set_stock_zero.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-
-class inventory_set_stock_zero(osv.osv_memory):
-    _name = "stock.inventory.set.stock.zero"
-    _description = "Set Stock to 0"
-
-    _columns = {
-        'location_id': fields.many2one('stock.location', 'Location', required=True),
-    }
-
-    def do_merge(self, cr, uid, ids, context):
-        """ To set stock to Zero
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one
-        @param context: A standard dictionary
-        @return:
-        """
-        invent_obj = self.pool.get('stock.inventory')
-        invent_line_obj = self.pool.get('stock.inventory.line')
-        prod_obj =  self.pool.get('product.product')
-
-        if len(context['active_ids']) <> 1:
-            raise osv.except_osv(_('Warning'),
-                                       _('Please select one and only one inventory !'))
-        for id in ids:
-            datas = self.read(cr, uid, id)
-            loc = str(datas['location_id'])
-
-            cr.execute('select distinct location_id,product_id \
-                        from stock_inventory_line \
-                        where inventory_id=%s', (context['active_id'],))
-            inv = cr.fetchall()
-            cr.execute('select distinct product_id from stock_move where \
-                        location_dest_id=%s or location_id=%s', (loc, loc,))
-            stock = cr.fetchall()
-            for s in stock:
-                if (loc, s[0]) not in inv:
-                    p = prod_obj.browse(cr, uid, s[0])
-                    invent_line_obj.create(cr, uid, {
-                        'inventory_id': context['active_id'],
-                        'location_id': loc,
-                        'product_id': s[0],
-                        'product_uom': p.uom_id.id,
-                        'product_qty': 0.0,
-                        })
-        return {}
-
-inventory_set_stock_zero()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
deleted file mode 100644
index 0ee84d2045d..00000000000
--- a/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	<record id="view_inventory_set_stock_zero" model="ir.ui.view">
-            <field name="name">Set Stock to Zero</field>
-            <field name="model">stock.inventory.set.stock.zero</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Set Stock to Zero">
-             		<separator string="Set Stocks to Zero" colspan="4" />
-                	<field name="location_id"/>
-    				<newline/>
-    				<label colspan="4" string="Do you want to set stocks to zero ?"/>
-        	        <separator string="" colspan="4" />
-					<button special="cancel" icon='gtk-cancel' string="Cancel" />
-            	    <button name="do_merge" string="Set Stock to Zero" type="object" icon="gtk-ok"/>
-             </form>
-            </field>
-		</record>
-
-        <act_window name="Set Stock to Zero"		    
-		    res_model="stock.inventory.set.stock.zero"
-		    src_model="stock.inventory"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_view_inventory_set_stock_zero"/>			
-        
-    </data>
-</openerp>

From 319c65e5b9a87b859c2d02aae328b04a237e7f13 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 12:17:21 +0530
Subject: [PATCH 015/632] [IMP] stock: Improve the view

bzr revid: sbh@tinyerp.com-20100909064721-aeq7ygar8gvic1xc
---
 addons/stock/stock_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 032b905c551..58e858bc94b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -120,7 +120,6 @@
                     </page><page string="Posted Inventory" groups="base.group_extended">
   						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
                                 <tree string="Stock Moves">
-                                    <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>

From 16bee80a57cfd4dec9b120a8799cc1eba1176f88 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 12:20:39 +0530
Subject: [PATCH 016/632] [Fix] stock: Correct the object name

bzr revid: sbh@tinyerp.com-20100909065039-z2g8avrcpbknf5ue
---
 addons/stock/wizard/stock_fill_inventory.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index e9b3fb2e02c..539ae830687 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -64,8 +64,8 @@ class stock_fill_inventory(osv.osv_memory):
                 stock = cr.fetchall()
                 for s in stock:
                     if (loc, s[0]) not in inv:
-                        p = prod_obj.browse(cr, uid, s[0])
-                        invent_line_obj.create(cr, uid, {
+                        p = product_obj.browse(cr, uid, s[0])
+                        inventory_line_obj.create(cr, uid, {
                             'inventory_id': context['active_id'],
                             'location_id': loc,
                             'product_id': s[0],

From cbce82b237f4fd1f5ee1ef8414ea9b44d5a1d868 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 15:02:48 +0530
Subject: [PATCH 017/632] [Fix] stock: Add the field in list view of stock_move

bzr revid: sbh@tinyerp.com-20100909093248-b2p506n72d6x1u40
---
 addons/stock/stock_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 58e858bc94b..efddb92e82c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -299,13 +299,15 @@
                         </page>
                         <page string="Stock Moves">
                             <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="name" string="Move Name"/>
+                                <tree  string="Stock Moves">
+ 									<field name="picking_id" string="Reference"/>                                
+									<field name="origin"/>
+									<field name="partner_id"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
-                                    <field name="product_uos" groups="product.product_uos"/>
-                                    <field name="picking_id"/>
+                                    <field name="tracking_id"/>
+                                    <field name="date"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>

From e9806cae8d0c1093b685bbc584b5afaa02572dd0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 9 Sep 2010 14:05:14 +0200
Subject: [PATCH 018/632] [IMP] stock inventory: spellchecking + moved button
 column in inv. lines o2m

bzr revid: odo@openerp.com-20100909120514-n4mwthszd41nvobc
---
 addons/stock/stock_view.xml                 | 10 +++++-----
 addons/stock/wizard/stock_fill_inventory.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index efddb92e82c..09dde138a5f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -97,11 +97,11 @@
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id" groups="base.group_extended"/>
-                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
-                                <field name="state" />
                                 <button name="%(stock.action_view_stock_inventory_line_split)d"
                                     string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
+                                <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
+                                <field name="state" />
                             </tree>
                             <form string="Products ">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
@@ -118,7 +118,7 @@
                             </form>
                         </field>
                     </page><page string="Posted Inventory" groups="base.group_extended">
-  						<field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
+                             <field colspan="2" name="move_ids" nolabel="1"  readonly="1" widget="one2many_list">
                                 <tree string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -127,7 +127,7 @@
                                     <field name="date"/>
                                     <field name="state"/>
                                 </tree>
-                             </field>                                                    
+                             </field>
                     </page>
                     </notebook>
                     <field name="state"/>
@@ -142,7 +142,7 @@
         </record>
 
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Physical Inventory</field>
+            <field name="name">Physical Inventories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 539ae830687..a6976e884a5 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -28,7 +28,7 @@ class stock_fill_inventory(osv.osv_memory):
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
-        'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done and when set all inventory lines that are added to the inventory should have zero as quantity"),
+        'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"),
     }
 
     def fill_inventory(self, cr, uid, ids, context):

From 9b99c73b00930b55b15fe9671b4aac482301d1a6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 18:12:01 +0530
Subject: [PATCH 019/632] [ADD] stock: Add the field in list view ofposted 
 inventory

bzr revid: sbh@tinyerp.com-20100909124201-a5vlnswldntqp6um
---
 addons/stock/stock_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 09dde138a5f..0b48a9970c0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -124,6 +124,8 @@
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
+                                   	<field name="location_id"/>
+                                    <field name="location_dest_id"/>                                    
                                     <field name="date"/>
                                     <field name="state"/>
                                 </tree>

From 8ae1b3b8d74793f3f3b4ab233232ecf38d3ed2df Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 9 Sep 2010 14:39:06 +0200
Subject: [PATCH 020/632] [IMP] stock: add missing columns in posted inventory
 moves

bzr revid: odo@openerp.com-20100909123906-dvkibjfdkys3hlkj
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0b48a9970c0..34e508fdc84 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -124,9 +124,9 @@
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
-                                   	<field name="location_id"/>
-                                    <field name="location_dest_id"/>                                    
-                                    <field name="date"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="date" string="Date"/>
                                     <field name="state"/>
                                 </tree>
                              </field>

From 5feb1fd1e1a9c7fb91aece5685ae166c1f10bac6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 9 Sep 2010 14:46:41 +0200
Subject: [PATCH 021/632] [IMP] stock inventory: don't count products
 recursively when computing the delta

bzr revid: odo@openerp.com-20100909124641-5jv31k8nqji8c2xu
---
 addons/stock/stock.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2294da261d8..5f1aab239d6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2344,14 +2344,19 @@ class stock_inventory(osv.osv):
         """
         if context is None:
             context = {}
+
+        # to perform the correct inventory corrections we need analyze stock location by
+        # location, never recursively, so we use a special context
+        product_context = dict(context, compute_child=False)
+
+        location_obj = self.pool.get('stock.location')
         for inv in self.browse(cr, uid, ids):
             move_ids = []
             move_line = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
-
-                amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
-                #TOCHECK: Why put restriction like new inventory qty should greater available qty ?
+                product_context.update(uom=line.product_uom.id)
+                amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
                 change = line.product_qty - amount
                 lot_id = line.prod_lot_id.id
                 if change:

From 52b56ef04adf560484bc655c48ed94fe5eac4d66 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 18:33:11 +0530
Subject: [PATCH 022/632] [IMP] stock: Improve the Merge inventories wizard put
 the warning to use in list view

bzr revid: sbh@tinyerp.com-20100909130311-n51aas1gcgpf09kx
---
 addons/stock/wizard/stock_inventory_merge.py | 26 ++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index 46c589f18e9..cbb9f380cb1 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -25,7 +25,25 @@ from tools.translate import _
 class stock_inventory_merge(osv.osv_memory):
     _name = "stock.inventory.merge"
     _description = "Merge Inventory"
-
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+                        context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        if not context:
+            context={}
+        res = super(stock_inventory_merge, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if context.get('active_model','') == 'stock.inventory' and len(context['active_ids']) < 2:
+            raise osv.except_osv(_('Warning'),
+            _('Please select multiple physical inventories to merge in the list view.'))
+        return res    
+        
     def do_merge(self, cr, uid, ids, context):
         """ To merge selected Inventories.
         @param self: The object pointer.
@@ -37,13 +55,7 @@ class stock_inventory_merge(osv.osv_memory):
         """ 
         invent_obj = self.pool.get('stock.inventory')
         invent_line_obj = self.pool.get('stock.inventory.line')
-
         invent_lines = {}
-
-        if len(context['active_ids']) < 2:
-            raise osv.except_osv(_('Warning'),
-            _('Please select at least two inventories.'))
-
         for inventory in invent_obj.browse(cr, uid, context['active_ids'], context=context):
             if inventory.state == "done":
                 raise osv.except_osv(_('Warning'),

From 8b6e629f6dd384789de516f9f5c9f903f27ad57c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 19:35:55 +0530
Subject: [PATCH 023/632] [IMP] stock :Improve fill inventory wizard

bzr revid: sbh@tinyerp.com-20100909140555-kpheons7bt7gh822
---
 addons/stock/wizard/stock_fill_inventory.py | 57 ++++++++-------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index a6976e884a5..53a8fabcf2d 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -44,39 +44,24 @@ class stock_fill_inventory(osv.osv_memory):
         location_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')
         stock_location_obj = self.pool.get('stock.location')
-        for fill_inventory in self.browse(cr, uid, ids):
-            res = {}
-            res_location = {}
-            if fill_inventory.recursive :
-                location_ids = location_obj.search(cr, uid, [('location_id',
-                                 'child_of', fill_inventory.location_id.id)])
-                for location in location_ids :
-                    res = location_obj._product_get(cr, uid, location)
-                    res_location[location] = res
-            if fill_inventory.set_stock_zero:
-                loc = fill_inventory.location_id.id
-                cr.execute('select distinct location_id,product_id \
-                            from stock_inventory_line \
-                            where inventory_id=%s', (context['active_id'],))
-                inv = cr.fetchall()
-                cr.execute('select distinct product_id from stock_move where \
-                            location_dest_id=%s or location_id=%s', (loc, loc,))
-                stock = cr.fetchall()
-                for s in stock:
-                    if (loc, s[0]) not in inv:
-                        p = product_obj.browse(cr, uid, s[0])
-                        inventory_line_obj.create(cr, uid, {
-                            'inventory_id': context['active_id'],
-                            'location_id': loc,
-                            'product_id': s[0],
-                            'product_uom': p.uom_id.id,
-                            'product_qty': 0.0,
-                            })                    
-            else:
-                context.update({'compute_child': False})
-                res = location_obj._product_get(cr, uid,
-                            fill_inventory.location_id.id, context=context)
-                res_location[fill_inventory.location_id.id] = res
+        if ids and len(ids): 
+            ids = ids[0]
+        else:
+             return {}    
+        fill_inventory = self.browse(cr, uid, ids)
+        res = {}
+        res_location = {}
+        if fill_inventory.recursive :
+            location_ids = location_obj.search(cr, uid, [('location_id',
+                             'child_of', fill_inventory.location_id.id)])
+            for location in location_ids :
+                res = location_obj._product_get(cr, uid, location)
+                res_location[location] = res
+        else:
+            context.update({'compute_child': False})
+            res = location_obj._product_get(cr, uid,
+                        fill_inventory.location_id.id, context=context)
+            res_location[fill_inventory.location_id.id] = res
     
         product_ids = []
         for location in res_location.keys():
@@ -85,9 +70,11 @@ class stock_fill_inventory(osv.osv_memory):
                 prod = product_obj.browse(cr, uid, [product_id])[0]
                 uom = prod.uom_id.id
                 context.update(uom=uom, compute_child=False)
-                amount = stock_location_obj._product_get(cr, uid,
+                if fill_inventory.set_stock_zero:
+                    amount = 0
+                else:    
+                    amount = stock_location_obj._product_get(cr, uid,
                          location, [product_id], context=context)[product_id]
-
                 if(amount):
                     line_ids=inventory_line_obj.search(cr, uid,
                         [('inventory_id', '=', context['active_ids']),

From 7027a0130a5d56bb804004ea8e572de930a5ca48 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 9 Sep 2010 20:17:21 +0530
Subject: [PATCH 024/632] [IMP]: Fix stock_fill_inventory for set_stock_zero

bzr revid: sbh@tinyerp.com-20100909144721-1mcr7erveystgf9d
---
 addons/stock/wizard/stock_fill_inventory.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 53a8fabcf2d..d0469960381 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -70,12 +70,11 @@ class stock_fill_inventory(osv.osv_memory):
                 prod = product_obj.browse(cr, uid, [product_id])[0]
                 uom = prod.uom_id.id
                 context.update(uom=uom, compute_child=False)
-                if fill_inventory.set_stock_zero:
-                    amount = 0
-                else:    
-                    amount = stock_location_obj._product_get(cr, uid,
+                amount = stock_location_obj._product_get(cr, uid,
                          location, [product_id], context=context)[product_id]
                 if(amount):
+                    if fill_inventory.set_stock_zero:
+                        amount = 0                    
                     line_ids=inventory_line_obj.search(cr, uid,
                         [('inventory_id', '=', context['active_ids']),
                          ('location_id', '=', location),

From f8590fbfd6d0492e871535198e908f6db7d155e2 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Sat, 11 Sep 2010 11:55:08 +0530
Subject: [PATCH 025/632] [IMP] Improved the viwe of User Preferences

bzr revid: vir@tinyerp.com-20100911062508-9ze77rhm45veup5o
---
 bin/addons/base/base_update.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 8e12c123b42..50f923d1b20 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -82,16 +82,15 @@
                                     context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
-                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <newline/>
-                            <separator colspan="4" string="Preferences"/>
                         </page>
                          <page string="Preferences">
-                            <field name="password" password="True" readonly="0" colspan="4"/>
+                            <field name="password" password="True" readonly="0" />
+                            <field name="context_lang" completion="1" readonly="0"/>
                             <label string="" colspan="1"/>
                             <label colspan="3" string="You must logout and login again after changing your password."/>
-                            <field name="context_lang" completion="1" readonly="0"/>
                             <field name="context_tz" completion="1" readonly="0"/>
+                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <separator string="Email &amp; Signature" colspan="4"/>
                             <group colspan="4"><field name="user_email" widget="email"/></group>
                             <field colspan="4" name="signature" readonly="0" nolabel="1"/>

From 4f43a5b3412ee356ab90f1cd6314e9c948911a7f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 13 Sep 2010 03:57:17 +0200
Subject: [PATCH 026/632] [IMP] procurement: rationalized procurement menus in
 procurement, stock, mrp: New structure: Procurement module installs its menus
 only in Warehouse. No need for a shared menu in "base" namespace.

bzr revid: odo@openerp.com-20100913015717-nx2hp4ezx7fxd58y
---
 addons/mrp/mrp_view.xml                       | 18 +------
 addons/mrp/process/procurement_process.xml    | 12 ++---
 .../mrp/process/service_product_process.xml   |  2 +-
 .../mrp/process/stockable_product_process.xml |  4 +-
 .../process/procurement_process.xml           |  4 +-
 addons/procurement/procurement_view.xml       | 52 +++++++------------
 addons/sale/process/sale_process.xml          |  2 +-
 7 files changed, 32 insertions(+), 62 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 4186a6e8722..52b165f69dd 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -5,10 +5,9 @@
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"/>
 
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
+
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
@@ -472,24 +471,9 @@
             </field>
         </record>
 
-        <!--
-        Procurement
-        -->
-
-        <menuitem action="procurement.procurement_action" id="base.menu_mrp_procurement_action"
-                  parent="mrp.menu_mrp_manufacturing" sequence="3" />
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="3"/>
-        <menuitem action="procurement.action_compute_schedulers" id="base.mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager"/>
-
-        <!--
-        Order Point
-        -->
-        <menuitem action="procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
-
         <!--
         Production Management
         -->
-
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
             <field name="model">mrp.production</field>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index ca08481d4e4..16aa1319ffd 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -26,7 +26,7 @@
         </record>
 
         <record id="process_node_stockproduct0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
@@ -38,7 +38,7 @@
         </record>
         
         <record id="process_node_stockproduct1" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
@@ -50,7 +50,7 @@
         </record>
 
         <record id="process_node_serviceproduct0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
@@ -62,7 +62,7 @@
         </record>
         
         <record id="process_node_serviceproduct1" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
@@ -74,7 +74,7 @@
         </record>
 
         <record id="process_node_purchaseprocure0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
@@ -118,7 +118,7 @@
             Process Transition
         -->
     	<record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index c23ed6e7a65..83f0fceed8b 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -9,7 +9,7 @@
 
 
 		<record id="process_node_servicemts0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 9dc45f0515f..6b6db4ccee3 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_mts0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_stock0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
index 42ee50782a1..955d9cf6416 100644
--- a/addons/procurement/process/procurement_process.xml
+++ b/addons/procurement/process/procurement_process.xml
@@ -12,7 +12,7 @@
             <field eval="1" name="active"/>
         </record>
     	<record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="menu_stock_procurement_action"/>
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 			<field eval="1" name="active"/>
 		</record>        
       	<record id="process_node_serviceonorder0" model="process.node">
-			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="menu_stock_procurement_action"/>
 			<field name="model_id" ref="procurement.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index aa5552f0b0c..b6bd670de1a 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -85,11 +85,13 @@
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
                        <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
-                       <filter icon="terp-gtk-go-back-rtl" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
+                       <separator orientation="vertical"/>
+                       <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
+                       <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
+                       <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="origin"/>
@@ -107,29 +109,29 @@
                 </search>
             </field>
         </record>
+
         <record id="procurement_action" model="ir.actions.act_window">
             <field name="name">Procurement Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">procurement.order</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
-            <field name="context">{'search_default_Current':1}</field>
-            <field name="help">The procurement order will schedule a proposal for automatic procurement for the product concerned. This procurement will start a task, a purchase order form for the supplier or a production depending on the product configuration.</field>
+            <field name="context">{'search_default_current':1}</field>
+            <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc.</field>
         </record>
 
-        <record id="procurement_action3" model="ir.actions.act_window">
-            <field name="name">Procurements</field>
+        <record id="procurement_exceptions" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">procurement.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_perm_exceptions':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
-            <field name="domain">[]</field>
-            <field name="context">{}</field>
+            <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)</field>
         </record>
-
+        
         <record id="procurement_action5" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
@@ -137,26 +139,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
-            <field name="help"> For each customer order line or raw materials in a manufacturing order, there is a procurement form . In normal system use, procurement orders are automatically generated by OpenERP. But if there are configuration problems, the system can remain blocked by a procurement without generating a corresponding document. It is a procurement exception. Some problems are link to timing and will be correct automatically by the system. If there is no procurement rule, the exception must be corrected manually.</field>
-        </record>
-
-        <record id="procurement_action4" model="ir.actions.act_window">
-            <field name="name">Procurement Exceptions to Fix</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">procurement.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <record id="procurement_action11" model="ir.actions.act_window">
-            <field name="name">Temporary Procurement Exceptions</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">procurement.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
         </record>
 
         <!-- Order Point -->
@@ -260,8 +242,12 @@
             res_model="stock.warehouse.orderpoint"
             src_model="procurement.order"/>
 
-		<menuitem id="base.menu_mrp_scheduler" name="Schedulers" parent="stock.menu_stock_root" groups="base.group_system" sequence="3"/>
-		<menuitem action="action_compute_schedulers" id="base.mrp_Sched_all" parent="base.menu_mrp_scheduler" sequence="50" groups="base.group_system"/>
-		<menuitem action="procurement.procurement_action" id="base.menu_mrp_procurement_action" parent="stock.menu_stock_warehouse_mgmt" sequence="9" groups="base.group_system"/>		
+        <!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it.  -->
+        <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="base.group_extended"/>
+            <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
+            <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
+        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5" groups="base.group_extended"/>
+            <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="menu_stock_procurement" sequence="10"/>
+
     </data>
 </openerp>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index b4a54d5afa5..d9211ae2e8c 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -63,7 +63,7 @@
         </record>
 
         <record id="process_node_saleprocurement0" model="process.node">
-            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>

From 13f77ea43f93d0e373cc46c4545d27878036d536 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 10:49:01 +0530
Subject: [PATCH 027/632] [IMP] stock:Partial Picking wizard take current cost
 price of the product if no so/po line

bzr revid: sbh@tinyerp.com-20100913051901-rdam3dhfl00dg985
---
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 3b6ce21b6ee..bbf7e86fc7f 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -174,7 +174,7 @@ class stock_partial_picking(osv.osv_memory):
 
                 if (m.product_id.cost_method == 'average'):
                     currency = False
-                    price = 0
+                    price = m.product_id.standard_price
                     if (pick.type == 'in') and 'purchase_id' in pick._columns.keys():
                         if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
                             price = m.purchase_line_id.price_unit

From 33814c739561f92f894ff1e0236ebcfb6ea8fefb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 11:31:02 +0530
Subject: [PATCH 028/632] [Fix] mrp,procurement: Fix the action name and menu
 id

bzr revid: sbh@tinyerp.com-20100913060102-jjd6x2ordhrqp5t8
---
 addons/mrp/board_manufacturing_view.xml    | 2 +-
 addons/mrp/process/procurement_process.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index aa8bd2ab69e..c5474670d9b 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -15,7 +15,7 @@
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
                             <action colspan="4" name="%(stock.action_picking_tree)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
-                            <action colspan="4" name="%(procurement.procurement_action4)d" string="Procurements in Exception"/>
+                            <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception"/>
                         </child1>
                         <child2>
                             <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 16aa1319ffd..70e3278ebc8 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -16,7 +16,7 @@
 
         
         <record id="process_node_minimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="procurement.menu_stock_order_points"/>
             <field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
@@ -85,7 +85,7 @@
         </record>
 
         <record id="process_node_productminimumstockrule0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
+            <field name="menu_id" ref="procurement.menu_stock_order_points"/>
             <field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>

From 969f0b9460373fdad20a19dcb436f3fe6f3d86af Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 15:57:24 +0530
Subject: [PATCH 029/632] [Fix] stock: Correct stock.invoice_onshipping
 sometimes chooses the wrong type of invoice
 https://bugs.launchpad.net/openobject-addons/+bug/352203

bzr revid: sbh@tinyerp.com-20100913102724-5sbydjdfis9jh7dx
---
 addons/stock/wizard/stock_invoice_onshipping.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index f931e575b2f..7e0693b9045 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -48,22 +48,22 @@ class stock_invoice_onshipping(osv.osv_memory):
         if context is None:
             context = {}
         picking_obj = self.pool.get('stock.picking')
-        usage = 'customer'
+        src_usage = dest_usage = None
         pick = picking_obj.browse(cr, uid, context['active_id'], context=context)
         if pick.invoice_state == 'invoiced':
             raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
         if pick.invoice_state == 'none':
             raise osv.except_osv(_('UserError'), _('This picking does not require any invoicing.'))
         if pick.move_lines:
-            usage = pick.move_lines[0].location_id.usage
-
-        if pick.type == 'out' and usage == 'supplier':
+            src_usage = pick.move_lines[0].location_id.usage
+            dest_usage = pick.move_lines[0].location_dest_id.usage
+        if pick.type == 'out' and dest_usage == 'supplier':
             type = 'in_refund'
-        elif pick.type == 'out' and usage == 'customer':
+        elif pick.type == 'out' and dest_usage == 'customer':
             type = 'out_invoice'
-        elif pick.type == 'in' and usage == 'supplier':
+        elif pick.type == 'in' and src_usage == 'supplier':
             type = 'in_invoice'
-        elif pick.type == 'in' and usage == 'customer':
+        elif pick.type == 'in' and src_usage == 'customer':
             type = 'out_refund'
         else:
             type = 'out_invoice'

From 4c1a6928cce257030d076594cc85253e0a695bb4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 13 Sep 2010 17:16:02 +0530
Subject: [PATCH 030/632] [IMP] stock: stock_fill_inventory wizard check if
 state is done the rasie the expection

bzr revid: sbh@tinyerp.com-20100913114602-3if7lmcd10wzsr26
---
 addons/stock/wizard/stock_fill_inventory.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index d0469960381..a2dd4190c6c 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -30,6 +30,20 @@ class stock_fill_inventory(osv.osv_memory):
         'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
         'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"),
     }
+    def view_init(self, cr, uid, fields_list, context=None):
+        """
+         Creates view dynamically and adding fields at runtime.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary
+         @return: New arch of view with new columns.
+        """
+        res = super(stock_fill_inventory, self).view_init(cr, uid, fields_list, context=context)
+        stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False) )
+        if stock.state=='done':
+                raise osv.except_osv('Error!','Stock Inventory is done')
+        True
 
     def fill_inventory(self, cr, uid, ids, context):
         """ To Import stock inventory according to products available in the selected locations.

From d33725df080d11de33ba35cc0ceeb4582d478c70 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 10:51:33 +0530
Subject: [PATCH 031/632] [IMP] stock: Improve the search view

bzr revid: sbh@tinyerp.com-20100914052133-jg9tm14qm1ed8ht0
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d17ae115302..c964e9a05b5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1396,10 +1396,10 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical" />
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
+                        <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
@@ -1794,8 +1794,8 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Supplier" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>

From db4e43e07b8e3c0bc68d38ddcc931b6f5be832eb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 11:56:43 +0530
Subject: [PATCH 032/632] [IMP] stock :Improve the fill_inventory wizard

bzr revid: sbh@tinyerp.com-20100914062643-s60j692m6207mshz
---
 addons/stock/wizard/stock_fill_inventory.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index a2dd4190c6c..599377fec1e 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -39,13 +39,16 @@ class stock_fill_inventory(osv.osv_memory):
          @param context: A standard dictionary
          @return: New arch of view with new columns.
         """
+        if context==None:
+            context={}
         res = super(stock_fill_inventory, self).view_init(cr, uid, fields_list, context=context)
-        stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False) )
-        if stock.state=='done':
+        if context.get('active_id', False):
+            stock = self.pool.get('stock.inventory').browse(cr, uid, context.get('active_id', False))
+            if stock.state=='done':
                 raise osv.except_osv('Error!','Stock Inventory is done')
         True
 
-    def fill_inventory(self, cr, uid, ids, context):
+    def fill_inventory(self, cr, uid, ids, context=None):
         """ To Import stock inventory according to products available in the selected locations.
         @param self: The object pointer.
         @param cr: A database cursor
@@ -54,6 +57,8 @@ class stock_fill_inventory(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context==None:
+            context={}        
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')

From e7c5054bd02ca46a1773f16ba22de076ab221e5c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 16:55:37 +0530
Subject: [PATCH 033/632] [IMP] stock: Add the short cut for cancel button in
 all view

bzr revid: sbh@tinyerp.com-20100914112537-5xyhjg2fkkk3thyb
---
 addons/stock/stock_view.xml                   | 24 +++++++++----------
 .../wizard/stock_fill_inventory_view.xml      |  2 +-
 .../wizard/stock_inventory_merge_view.xml     |  2 +-
 .../wizard/stock_invoice_onshipping_view.xml  |  2 +-
 .../wizard/stock_location_product_view.xml    |  2 +-
 addons/stock/wizard/stock_move_view.xml       |  2 +-
 .../stock/wizard/stock_picking_make_view.xml  |  2 +-
 .../stock/wizard/stock_replacement_view.xml   |  2 +-
 addons/stock/wizard/stock_splitinto_view.xml  |  2 +-
 addons/stock/wizard/stock_ups_view.xml        |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c964e9a05b5..f975637b3c0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -581,7 +581,7 @@
                     <field name="picking_id" invisible="True"/>
                     <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"  height="100" width="500"/><newline/>
                     <group colspan="4">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         <button name="action_move" string="Add" type="object" icon="gtk-add"/>
                     </group>
                     </group>
@@ -750,7 +750,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -810,7 +810,7 @@
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Delivery"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             </field>
         </record>
@@ -923,7 +923,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -935,7 +935,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1139,7 +1139,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1151,7 +1151,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1243,7 +1243,7 @@
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-ok" help="Receive products"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
         </record>
@@ -1350,7 +1350,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1362,7 +1362,7 @@
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">
@@ -1598,7 +1598,7 @@
                     <group col="4" colspan="2">
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
@@ -1767,7 +1767,7 @@
                     <group col="5" colspan="2">
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
                         <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
                     </group>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 40cf34af26b..3db42eb7be5 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -14,7 +14,7 @@
     				<newline/>
     				<field name="set_stock_zero"/>
         	        <separator string="" colspan="4" />
-					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
             	    <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
              </form>
             </field>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 5ae2987b59a..62cac877179 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -12,7 +12,7 @@
 				    	<label string="Do you want to merge theses inventories ?"/>
 				 <separator colspan="4"/>
     				<group colspan="4" col="6">
-					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
 					<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
 					</group>			
 				</form>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index e1e742d7aee..eddffb594aa 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -16,7 +16,7 @@
 					<newline/>
 					<field name="invoice_date" />
 			   	    <separator string="" colspan="4" />
-					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
 			       	<button name="create_invoice" string="Create Invoices" type="object" icon="gtk-ok"/>
              </form>
             </field>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 518bc6eab35..2459daac189 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -16,7 +16,7 @@
        				<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
         			<separator string="" colspan="4" />
         			<label string=""/>
-					<button special="cancel" string="Cancel" icon="gtk-cancel" />
+					<button special="cancel" string="_Cancel" icon="gtk-cancel" />
            	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
     			</form>
             </field>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 46d3893900b..06f6822e3c7 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -13,7 +13,7 @@
                         <newline/>
                         <separator string="" colspan="4" />
                         <button icon='gtk-cancel' special="cancel"
-                            string="Cancel" />
+                            string="_Cancel" />
                         <button name="track_lines" string="Ok"
                             type="object" icon="gtk-ok" />
                     </form>
diff --git a/addons/stock/wizard/stock_picking_make_view.xml b/addons/stock/wizard/stock_picking_make_view.xml
index fa77042c5d8..4ecebed1031 100644
--- a/addons/stock/wizard/stock_picking_make_view.xml
+++ b/addons/stock/wizard/stock_picking_make_view.xml
@@ -12,7 +12,7 @@
 				        width="600" height="300"/>
                 	<separator string="" colspan="4" />
                 	<button icon='gtk-cancel' special="cancel"
-                		string="Cancel" />
+                		string="_Cancel" />
                 	<button name="make_packing" string="Ok"
                 		type="object" icon="gtk-apply" />
                 </form>
diff --git a/addons/stock/wizard/stock_replacement_view.xml b/addons/stock/wizard/stock_replacement_view.xml
index ce5f7efbc9f..cea5bfedbe8 100644
--- a/addons/stock/wizard/stock_replacement_view.xml
+++ b/addons/stock/wizard/stock_replacement_view.xml
@@ -9,7 +9,7 @@
 	                <form string="Replace a component">
 	                	<label string="Component" colspan="4"/>
 						<separator string="" colspan="4" />
-	                	<button icon='gtk-cancel' special="cancel" string="Cancel" />
+	                	<button icon='gtk-cancel' special="cancel" string="_Cancel" />
 	                	<button name="replace_composant" string="Replace" type="object" />
 	                </form>
 	            </field>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index a325519ca75..7ed7266a163 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -10,7 +10,7 @@
                 <separator string="Quantity to leave in the current pack" colspan="4"/>
                 <field name="quantity"/>
                 <button icon='gtk-cancel' special="cancel"
-                    string="Cancel" />
+                    string="_Cancel" />
                 <button name="split" string="Ok"
                     type="object" icon="gtk-ok" />
             </form>
diff --git a/addons/stock/wizard/stock_ups_view.xml b/addons/stock/wizard/stock_ups_view.xml
index 89b5fe131e8..cbce721e1b9 100644
--- a/addons/stock/wizard/stock_ups_view.xml
+++ b/addons/stock/wizard/stock_ups_view.xml
@@ -11,7 +11,7 @@
 					<separator string="UPS generator" colspan="4"/>
 					<field name="weight" />
 					<separator string="" colspan="4" />
-					<button icon='gtk-cancel' special="cancel" string="Cancel" />
+					<button icon='gtk-cancel' special="cancel" string="_Cancel" />
 					<button name="ups_save" string="Get xml file" type="object" />
 					<button name="ups_upload" string="Upload xml file" type="object" />
 				</form>

From fe76938598f6252fba342e5972b493114b6e7e37 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 19:09:38 +0530
Subject: [PATCH 034/632] [Fix] stock,sale:Remove the sale_order_line in stock
 and add the code in sale

bzr revid: sbh@tinyerp.com-20100914133938-qv3zf19pjasx865u
---
 addons/purchase/stock_view.xml | 12 +++++++++++-
 addons/sale/stock.py           |  1 +
 addons/sale/stock_view.xml     | 11 +++++++++++
 addons/stock/stock.py          |  7 -------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 2b741536d3b..863b3ed77af 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+       <record id="stock_move_purchase" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="/form/group/field[@name='tracking_id']" position="before">
+                    <field name="purchase_line_id" colspan="2" />
+                </xpath>
+            </field>
+        </record>      
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
             <field name="name">Picking list</field>
             <field name="model">stock.picking</field>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 39260e759b4..b5c0e10e75d 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -186,6 +186,7 @@ class stock_picking(osv.osv):
                         'quantity': sale_line.product_uos_qty,
                         'invoice_line_tax_id': [(6, 0, tax_ids)],
                         'account_analytic_id': account_analytic_id,
+                        'notes':sale_line.notes
                     }, context=context)
                     self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced':True,
                         'invoice_lines': [(6, 0, [invoice_line_id])],
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 6b3c0e2c684..93529fd3b7d 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -13,6 +13,17 @@
             </field>
         </record>
         
+        <record id="stock_move_sale" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="/form/group/field[@name='tracking_id']"  position="before">
+                    <field name="sale_line_id" colspan="2"/>
+                </xpath>
+            </field>
+        </record>        
         <!-- Adding Sale Order Reference to outgoing picking -->
         
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5f1aab239d6..fa68c3c776b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1038,12 +1038,6 @@ class stock_picking(osv.osv):
                     uos_id = move_line.product_uom.id
 
                 account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, partner.property_account_position, account_id)
-                notes = False
-                if ('sale_line_id' in move_line._columns.keys()) and move_line.sale_line_id:
-                    notes = move_line.sale_line_id.notes
-                elif ('purchase_line_id' in move_line._columns.keys()) and move_line.purchase_line_id:
-                    notes = move_line.purchase_line_id.notes
-
                 invoice_line_id = invoice_line_obj.create(cr, uid, {
                     'name': name,
                     'origin': origin,
@@ -1056,7 +1050,6 @@ class stock_picking(osv.osv):
                     'quantity': move_line.product_uos_qty or move_line.product_qty,
                     'invoice_line_tax_id': [(6, 0, tax_ids)],
                     'account_analytic_id': account_analytic_id,
-                    'note': notes,
                 }, context=context)
                 self._invoice_line_hook(cr, uid, move_line, invoice_line_id)
 

From 79d751bb7666ad4e76a85c80739774b45f6aaa36 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 14 Sep 2010 19:34:07 +0530
Subject: [PATCH 035/632] [Fix] purchase: Move the code of stock in purchae

bzr revid: sbh@tinyerp.com-20100914140407-f8f5jhsdib083xdd
---
 addons/purchase/stock.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 49a28e352b2..e84a70d1b93 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -86,6 +86,9 @@ class stock_picking(osv.osv):
                 user, picking, move_line)
 
     def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
+        if move_line.purchase_line_id:
+            invoice_line_obj = self.pool.get('account.invoice.line')
+            invoice_line_obj.write(cursor, user, [invoice_line_id], {'note':  move_line.purchase_line_id.notes,})            
         return super(stock_picking, self)._invoice_line_hook(cursor, user,
                 move_line, invoice_line_id)
 

From 22daad45d3104bc790d6e789c17ebb48835258bb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 15 Sep 2010 02:10:44 +0200
Subject: [PATCH 036/632] [IMP] stock: improve labels and tooltips in
 stock-related fields on products

bzr revid: odo@openerp.com-20100915001044-1yhm564t5c9a7qpr
---
 addons/stock/product.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 951c3badcf4..831c130689d 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -318,8 +318,11 @@ class product_product(osv.osv):
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
         'location_id': fields.dummy(string='Stock Location', relation='stock.location', type='many2one'),
-        'valuation':fields.selection([('manual_periodic', 'Periodic (manual)'),
-                                        ('real_time','Real Time (automatized)'),], 'Stock Valuation', help="Decide if the system must automatically creates account moves based on stock moves", required=True),
+        'valuation':fields.selection([('manual_periodic', 'Periodical (manual)'),
+                                        ('real_time','Real Time (automated)'),], 'Inventory Valuation', 
+                                        help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
+                                             "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
+                                        , required=True),
     }
 
     _defaults = {
@@ -405,11 +408,11 @@ class product_template(osv.osv):
         'property_stock_account_input': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Input Account', method=True, view_load=True,
-            help='This account will be used, instead of the default one, to value input stock'),
+            help='When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
         'property_stock_account_output': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Output Account', method=True, view_load=True,
-            help='This account will be used, instead of the default one, to value output stock'),
+            help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
     }
 
 product_template()
@@ -421,21 +424,21 @@ class product_category(osv.osv):
         'property_stock_journal': fields.property('account.journal',
             relation='account.journal', type='many2one',
             string='Stock journal', method=True, view_load=True,
-            help="This journal will be used for the accounting move generated by stock move"),
+            help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
         'property_stock_account_input_categ': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Input Account', method=True, view_load=True,
-            help='This account will be used to value the input stock'),
+            help='When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
         'property_stock_account_output_categ': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Output Account', method=True, view_load=True,
-            help='This account will be used to value the output stock'),
+            help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
         'property_stock_variation': fields.property('account.account',
             type='many2one',
             relation='account.account',
             string="Stock Variation Account",
             method=True, view_load=True,
-            help="This account will be used in product when valuation type is real-time valuation ",),
+            help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
     }
 
 product_category()

From 784b5e5a464455df3646f7b6934633680794a420 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 16:01:58 +0530
Subject: [PATCH 037/632] [IMP] stock: Move the valuation field of the product
 into accountint tab and set Input Account and Output Account read-only if
 valuation is not Real Time

bzr revid: sbh@tinyerp.com-20100915103158-75ji09bpbw21tswf
---
 addons/stock/product_view.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ef9b833ec32..fda4c91592b 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -75,10 +75,16 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-                <field name="property_account_expense" position="after">
-                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-                </field>
+     		      <xpath expr="/form/notebook/page[@string='Accounting']" position="inside"> 
+     		      	<newline/>
+     				<group  groups="base.group_extended">
+	                	<separator string="Stock Input/Output Account" colspan="2"/>
+	                	<newline/>
+	                	<field name="valuation"/>
+	                    <field name="property_stock_account_output"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+	                    <field name="property_stock_account_input"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}"  domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                    </group>
+                    </xpath>
             </field>
         </record>
 
@@ -121,7 +127,7 @@
             </field>
         </record>
 
-        <record id="view_product_valuation_form" model="ir.ui.view">
+<!--        <record id="view_product_valuation_form" model="ir.ui.view">
             <field name="name">product.valuation.stock.form.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
@@ -131,7 +137,7 @@
                     <field name="valuation"/>
                 </field>
             </field>
-        </record>
+        </record>-->
 
     </data>
 </openerp>

From 3a52e3db6c86609b7cb0db4e008903d3e6272f40 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 16:18:07 +0530
Subject: [PATCH 038/632] [IMP] stock: Improve the view of product

bzr revid: sbh@tinyerp.com-20100915104807-ggnoeybdnnwhpfdx
---
 addons/account/product_view.xml | 2 +-
 addons/stock/product_view.xml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index cc9351d55f4..67352fd1120 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Accounting">
-                    <group  groups="base.group_extended">
+                    <group name="properties" groups="base.group_extended">
                         <separator string="Sales Properties" colspan="2"/>
                         <separator string="Purchase Properties" colspan="2"/>
                         <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"  groups="base.group_extended"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index fda4c91592b..c1fc739eda2 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -75,15 +75,15 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-     		      <xpath expr="/form/notebook/page[@string='Accounting']" position="inside"> 
-     		      	<newline/>
+     		      <xpath expr="/form/notebook/page/group[@name='properties']" position="before"> 
      				<group  groups="base.group_extended">
 	                	<separator string="Stock Input/Output Account" colspan="2"/>
-	                	<newline/>
+	                	 <newline/>
 	                	<field name="valuation"/>
 	                    <field name="property_stock_account_output"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
 	                    <field name="property_stock_account_input"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}"  domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
                     </group>
+                    <newline/>
                     </xpath>
             </field>
         </record>

From cbf69ba9386ba60072f83d23f560e18c04dcce85 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 16:55:08 +0530
Subject: [PATCH 039/632] [Fix] stock : Move the sale and purchase related code
 in to there module

bzr revid: sbh@tinyerp.com-20100915112508-9eq3w14bjylgzd7x
---
 addons/purchase/stock.py                     | 24 ++++++++++++++++++++
 addons/sale/stock.py                         | 24 ++++++++++++++++++++
 addons/stock/wizard/stock_partial_picking.py | 11 ---------
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index e84a70d1b93..a269f66d525 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -102,5 +102,29 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+class stock_partial_picking(osv.osv_memory):
+    _inherit = 'stock.partial.picking'
+      
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        pick_obj = self.pool.get('stock.picking')
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            for m in pick.move_lines:
+                if (m.product_id.cost_method == 'average'):
+                    if pick.type == 'in' and pick.purchase_id:
+                        if m.sale_line_id:
+                            res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
+                        if  pick.sale_id:
+                            res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
+        return res      
+stock_partial_picking()     
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index b5c0e10e75d..1d53b8b8754 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -209,4 +209,28 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+class stock_partial_picking(osv.osv_memory):
+    _inherit = 'stock.partial.picking'
+      
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        pick_obj = self.pool.get('stock.picking')
+        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            for m in pick.move_lines:
+                if (m.product_id.cost_method == 'average'):
+                    if pick.type == 'out' and pick.sale_id:
+                        if m.sale_line_id:
+                            res['move%s_product_price'%(m.id)] =  m.sale_line_id.price_unit
+                        if  pick.sale_id:
+                            res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id  
+        return res      
+stock_partial_picking()                                    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index bbf7e86fc7f..bbc9021d87c 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -171,20 +171,9 @@ class stock_partial_picking(osv.osv_memory):
                     res['move%s_product_uom'%(m.id)] = m.product_uom.id
                 if 'move%s_prodlot_id'%(m.id) in fields:
                     res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
-
                 if (m.product_id.cost_method == 'average'):
                     currency = False
                     price = m.product_id.standard_price
-                    if (pick.type == 'in') and 'purchase_id' in pick._columns.keys():
-                        if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
-                            price = m.purchase_line_id.price_unit
-                        if hasattr(pick, 'purchase_id') and pick.purchase_id:
-                            currency = pick.purchase_id.pricelist_id.currency_id.id
-                    if (pick.type == 'out') and 'sale_id' in pick._columns.keys():
-                        if hasattr(m, 'sale_line_id') and m.sale_line_id:
-                            price = m.sale_line_id.price_unit
-                        if hasattr(pick, 'sale_id') and pick.sale_id:
-                            currency = pick.sale_id.pricelist_id.currency_id.id
                     if 'move%s_product_price'%(m.id) in fields:
                         res['move%s_product_price'%(m.id)] = price
                     if 'move%s_product_currency'%(m.id) in fields:

From dd2b1bed63e62bfcadfca8c1760d4ea9ab47afeb Mon Sep 17 00:00:00 2001
From: Niels Huylebroeck <niels@bubbles-it.be>
Date: Wed, 15 Sep 2010 13:58:12 +0200
Subject: [PATCH 040/632] [FIX] Removed all code and XML mentions of
 "finnished", as it's written "finished" (Bug #326160)

bzr revid: niels@bubbles-it.be-20100915115812-j6lec74or0y61psp
---
 addons/mrp/mrp.py                               |  4 ++--
 addons/mrp/mrp_view.xml                         |  4 ++--
 addons/mrp/report/mrp_production_order.py       |  6 +++---
 addons/mrp/report/mrp_production_order_view.xml |  2 +-
 addons/mrp_operations/mrp_operations.py         | 16 ++++++++--------
 addons/mrp_operations/mrp_operations_view.xml   |  4 ++--
 addons/procurement/procurement.py               |  6 +++---
 addons/procurement/procurement_workflow.xml     |  2 +-
 addons/sale/process/sale_process.xml            |  2 +-
 addons/stock/stock.py                           |  2 +-
 addons/stock/stock_workflow.xml                 |  4 ++--
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 8b616c3d7ac..eb5fd5d15e7 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -450,7 +450,7 @@ class mrp_production(osv.osv):
         'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'),
         'date_planned': fields.datetime('Scheduled date', required=True, select=1),
         'date_start': fields.datetime('Start Date'),
-        'date_finnished': fields.datetime('End Date'),
+        'date_finished': fields.datetime('End Date'),
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
         'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
@@ -652,7 +652,7 @@ class mrp_production(osv.osv):
         """
         for production in self.browse(cr, uid, ids):
             self._costs_generate(cr, uid, production)
-        return self.write(cr, uid, ids, {'state': 'done', 'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return self.write(cr, uid, ids, {'state': 'done', 'date_finished': time.strftime('%Y-%m-%d %H:%M:%S')})
 
     def test_production_done(self, cr, uid, ids):
         """ Tests whether production is done or not.
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ba7ebef1973..bd0a52159bf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -530,7 +530,7 @@
             <field name="model">mrp.production</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-                <gantt color="product_id" date_stop="date_finnished" date_start="date_start" string="Productions">
+                <gantt color="product_id" date_stop="date_finished" date_start="date_start" string="Productions">
                     <level object="mrp.routing" link="routing_id" domain="[]">
                         <field name="name"/>
                         <field name="origin"/>
@@ -696,7 +696,7 @@
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
                             <field name="date_start"/>
-                            <field name="date_finnished"/>
+                            <field name="date_finished"/>
                             <field name="picking_id" groups="base.group_extended"/>
                             <field name="move_prod_id" groups="base.group_extended"/>
                         </page>
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index 9aeae1781cd..3ad4184c413 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -51,7 +51,7 @@ class mrp_production_order(osv.osv):
         'date_planned':fields.date('Scheduled Date'),
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True),
         'date_start': fields.datetime('Start Date',readonly=True),
-        'date_finnished': fields.datetime('End Date',readonly=True),
+        'date_finished': fields.datetime('End Date',readonly=True),
         'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True),
         'company_id': fields.many2one('res.company','Company',readonly=True),
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True),
@@ -100,7 +100,7 @@ class mrp_production_order(osv.osv):
                      s.routing_id,
                      s.picking_id,
                      s.date_start,
-                     s.date_finnished,
+                     s.date_finished,
                      to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_planned,
                      s.origin,
                      s.priority,
@@ -128,7 +128,7 @@ class mrp_production_order(osv.osv):
                      to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      s.origin,
                      s.date_start,
-                     s.date_finnished,
+                     s.date_finished,
                      s.company_id
             )""")
 mrp_production_order()
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 7617c8f55e4..31a8b36a59d 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -97,7 +97,7 @@
                       <newline/>
 	                    <field name="date_start"/>
                       <field name="date_planned"/>
-                      <field name="date_finnished"/>
+                      <field name="date_finished"/>
 	                </group>
                   </search>
             </field>
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index ab936e78daf..2d6ef47b81e 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -85,7 +85,7 @@ class mrp_production_workcenter_line(osv.osv):
        'date_planned': fields.datetime('Scheduled Date'),
        'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
        'date_start': fields.datetime('Start Date'),
-       'date_finnished': fields.datetime('End Date'),
+       'date_finished': fields.datetime('End Date'),
        'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this workcenter",readonly=True),
        'production_state':fields.related('production_id','state',
             type='selection',
@@ -171,7 +171,7 @@ class mrp_production_workcenter_line(osv.osv):
         delay += (date_finished-date_start).days * 24
         delay += (date_finished-date_start).seconds / float(60*60)
         
-        self.write(cr, uid, ids, {'state':'done', 'date_finnished': date_now,'delay':delay})
+        self.write(cr, uid, ids, {'state':'done', 'date_finished': date_now,'delay':delay})
         self.modify_production_order_state(cr,uid,ids,'done')
         return True
 
@@ -280,7 +280,7 @@ class mrp_production(osv.osv):
                     dt_end = DateTime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
                 old = wc.sequence or 0
             super(mrp_production, self).write(cr, uid, [po.id], {
-                'date_finnished': dt_end
+                'date_finished': dt_end
             })
         return dt_end
 
@@ -298,7 +298,7 @@ class mrp_production(osv.osv):
                 if l.state in ('done','cancel','draft'):
                     continue
                 todo += l.move_dest_id_lines
-                if l.production_id and (l.production_id.date_finnished > dt):
+                if l.production_id and (l.production_id.date_finished > dt):
                     if l.production_id.state not in ('done','cancel'):
                         for wc in l.production_id.workcenter_lines:
                             i = self.pool.get('resource.calendar').interval_min_get(
@@ -327,8 +327,8 @@ class mrp_production(osv.osv):
                         break
                     if l.production_id.state in ('done','cancel'):
                         break
-                    if l.production_id and (l.production_id.date_start < po.date_finnished):
-                        self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finnished})
+                    if l.production_id and (l.production_id.date_start < po.date_finished):
+                        self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finished})
                         break
 
 
@@ -503,7 +503,7 @@ class mrp_operations_operation(osv.osv):
             if code.start_stop=='done':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
                 wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_done', cr)
-                self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
+                self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
 
             if code.start_stop=='pause':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id)
@@ -524,7 +524,7 @@ class mrp_operations_operation(osv.osv):
         line_vals['delay'] = delay
         if vals.get('date_start',False):
             if code.start_stop == 'done':
-                line_vals['date_finnished'] = vals['date_start']
+                line_vals['date_finished'] = vals['date_start']
             elif code.start_stop == 'start':    
                 line_vals['date_start'] = vals['date_start']
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 4af63c52b77..37a02956ce0 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -101,7 +101,7 @@
                     <group colspan="2" col="2">
                         <separator string="Real" colspan="2"/>
                         <field name="date_start" readonly="1"/>
-                        <field name="date_finnished" readonly="1"/>
+                        <field name="date_finished" readonly="1"/>
                         <field name="delay" widget="float_time"/>
                     </group>
                     <group colspan="2" col="2">
@@ -170,7 +170,7 @@
         <field name="model">mrp.production.workcenter.line</field>
         <field name="type">calendar</field>
         <field name="arch" type="xml">
-            <calendar color="product" date_stop="date_finnished" date_start="date_start" string="Operations">
+            <calendar color="product" date_stop="date_finished" date_start="date_start" string="Operations">
                 <field name="workcenter_id"/>
                 <field name="production_id"/>
             </calendar>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 5c6caf1e9db..72dc73f025b 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -440,7 +440,7 @@ class procurement_order(osv.osv):
             wf_service.trg_trigger(uid, 'procurement.order', id, cr)
         return True
 
-    def action_check_finnished(self, cr, uid, ids):
+    def action_check_finished(self, cr, uid, ids):
         return self.check_move_done(cr, uid, ids)
 
     def action_check(self, cr, uid, ids):
@@ -493,9 +493,9 @@ procurement_order()
 class StockPicking(osv.osv):
     _inherit = 'stock.picking'
 
-    def test_finnished(self, cursor, user, ids):
+    def test_finished(self, cursor, user, ids):
         wf_service = netsvc.LocalService("workflow")
-        res = super(StockPicking, self).test_finnished(cursor, user, ids)
+        res = super(StockPicking, self).test_finished(cursor, user, ids)
         for picking in self.browse(cursor, user, ids):
             for move in picking.move_lines:
                 if move.state == 'done' and move.procurements:
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index ff4325e248f..b4bcd1e1f04 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -187,7 +187,7 @@
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
-            <field name="condition">action_check_finnished()</field>
+            <field name="condition">action_check_finished()</field>
 			<field name="trigger_model">stock.move</field>
             <field name="trigger_expr_id">[move_id.id]</field>            
         </record>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index b4a54d5afa5..55bb3d6a2c3 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -261,7 +261,7 @@
         </record>
 
         <record id="process_transition_action_validate0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;test_finnished&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;test_finished&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Validate&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_deliver0"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5ecbd5f40ba..6e50587d014 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -786,7 +786,7 @@ class stock_picking(osv.osv):
         self.log_picking(cr, uid, ids, context=context)
         return True
 
-    def test_finnished(self, cr, uid, ids):
+    def test_finished(self, cr, uid, ids):
         """ Tests whether the move is in done or cancel state or not.
         @return: True or False
         """
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 3254f7b6984..2a682833a1c 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -86,12 +86,12 @@
         <record id="trans_move_done" model="workflow.transition">
             <field name="act_from" ref="act_move"/>
             <field name="act_to" ref="act_done"/>
-            <field name="condition">test_finnished()</field>
+            <field name="condition">test_finished()</field>
         </record>
         <record id="trans_move_confirmed" model="workflow.transition">
             <field name="act_from" ref="act_move"/>
             <field name="act_to" ref="act_confirmed"/>
-            <field name="condition">not test_finnished()</field>
+            <field name="condition">not test_finished()</field>
         </record>
         <record id="trans_assigned_cancel" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>

From 5b300999868eaab303fb66e47c80a5eb931b454e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 18:11:17 +0530
Subject: [PATCH 041/632] [Fix] stock : Move the stock_partial_move sale and
 purchase realated code into there module

bzr revid: sbh@tinyerp.com-20100915124117-1ja17fd3m3arwn3g
---
 addons/purchase/stock.py                  | 33 ++++++++++++++++++-----
 addons/sale/stock.py                      | 24 ++++++++++++++++-
 addons/stock/wizard/stock_partial_move.py | 24 ++---------------
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index a269f66d525..75cb99c0325 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -119,12 +119,33 @@ class stock_partial_picking(osv.osv_memory):
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             for m in pick.move_lines:
                 if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'in' and pick.purchase_id:
-                        if m.sale_line_id:
-                            res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
-                        if  pick.sale_id:
-                            res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
+                    if pick.type == 'in' and m.purchase_line_id:
+                        res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
+                    if  pick.purchase_id:
+                        res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
         return res      
-stock_partial_picking()     
+stock_partial_picking()   
+  
+class stock_partial_move(osv.osv_memory):
+    _inherit = "stock.partial.move"     
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+        move_obj = self.pool.get('stock.move')  
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+            if (m.product_id.cost_method == 'average'):
+                if m.picking_id.type == 'out' and  m.purchase_line_id:
+                    res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit           
+                if m.picking_id.purchase_id:
+                    res['move%s_product_currency'%(m.id)] =  m.picking_id.purchase_id.pricelist_id.currency_id.id
+        return res     
+stock_partial_move()     
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 1d53b8b8754..ed9a6098386 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -232,5 +232,27 @@ class stock_partial_picking(osv.osv_memory):
                         if  pick.sale_id:
                             res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id  
         return res      
-stock_partial_picking()                                    
+stock_partial_picking() 
+
+class stock_partial_move(osv.osv_memory):
+    _inherit = "stock.partial.move"   
+    def default_get(self, cr, uid, fields, context=None):
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
+        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
+        move_obj = self.pool.get('stock.move')  
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+            if (m.product_id.cost_method == 'average'):
+                if m.picking_id.type == 'in' and  m.sale_id:
+                    res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit           
+                if  m.picking_id.sale_id:
+                    res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id or False
+        return res     
+stock_partial_move()                                                                                                  
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 17515f86252..d0cb04cba08 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -164,29 +164,9 @@ class stock_partial_move(osv.osv_memory):
                 res['move%s_product_qty'%(m.id)] = m.product_qty
             if 'move%s_product_uom'%(m.id) in fields:
                 res['move%s_product_uom'%(m.id)] = m.product_uom.id
-            if (m.picking_id.type == 'out') and (m.product_id.cost_method == 'average') and 'sale_id' in m.picking_id._columns.keys():
-                price = 0
-                if hasattr(m, 'sale_line_id') and m.sale_line_id:
-                    price = m.sale_line_id.price_unit
-
+            if  m.product_id.cost_method == 'average' :
+                price = m.product_id.standard_price
                 currency = False
-                if hasattr(m.picking_id, 'sale_id') and m.picking_id.sale_id:
-                    currency = m.picking_id.sale_id.pricelist_id.currency_id.id
-
-                if 'move%s_product_price'%(m.id) in fields:
-                    res['move%s_product_price'%(m.id)] = price
-                if 'move%s_product_currency'%(m.id) in fields:
-                    res['move%s_product_currency'%(m.id)] = currency
-
-            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average') and 'purchase_id' in m.picking_id._columns.keys():
-                price = 0
-                if hasattr(m, 'purchase_line_id') and m.purchase_line_id:
-                    price = m.purchase_line_id.price_unit
-
-                currency = False
-                if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
-                    currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
-
                 if 'move%s_product_price'%(m.id) in fields:
                     res['move%s_product_price'%(m.id)] = price
                 if 'move%s_product_currency'%(m.id) in fields:

From 81909b9e7204488680e1706d958d1955320a5095 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 15 Sep 2010 18:52:55 +0530
Subject: [PATCH 042/632] [Fix] stock: fix the name of type

bzr revid: sbh@tinyerp.com-20100915132255-mdgwqf5xr2j0xie7
---
 addons/purchase/stock.py | 2 +-
 addons/sale/stock.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 75cb99c0325..9e477909840 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -141,7 +141,7 @@ class stock_partial_move(osv.osv_memory):
         move_obj = self.pool.get('stock.move')  
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'out' and  m.purchase_line_id:
+                if m.picking_id.type == 'in' and  m.purchase_line_id:
                     res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit           
                 if m.picking_id.purchase_id:
                     res['move%s_product_currency'%(m.id)] =  m.picking_id.purchase_id.pricelist_id.currency_id.id
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index ed9a6098386..f8745b4b44a 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -249,7 +249,7 @@ class stock_partial_move(osv.osv_memory):
         move_obj = self.pool.get('stock.move')  
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'in' and  m.sale_id:
+                if m.picking_id.type == 'out' and  m.sale_line_id:
                     res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit           
                 if  m.picking_id.sale_id:
                     res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id or False

From ef7ecffa29991eda19fc6e9c6fa5d4509ecfbf09 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 15 Sep 2010 20:01:00 +0200
Subject: [PATCH 043/632] [FIX/REF] stock,purchase,sale: refactored stock
 valuation handling + fixed multicompany/multicurrency issues

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

bzr revid: odo@openerp.com-20100915180100-qbjxdj0n63teg7pg
---
 addons/purchase/stock.py |  43 ++++---
 addons/sale/stock.py     |  48 ++++---
 addons/stock/stock.py    | 270 ++++++++++++++++++++++++---------------
 3 files changed, 226 insertions(+), 135 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 9e477909840..f25a03adda2 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -31,6 +31,21 @@ class stock_move(osv.osv):
     _defaults = {
         'purchase_line_id': False
     }
+
+    def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
+        """
+        Overrides the default stock valuation to take into account the currency that was specified
+        on the purchase order in case the valuation data was not directly specified during picking
+        confirmation.
+        """
+        reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context)
+        if move.product_id.cost_method != 'average' or not move.price_unit:
+            # no average price costing or cost not specified during picking validation, we will 
+            # plug the purchase line values if they are found.
+            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
+                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+        return reference_amount, reference_currency_id
+
 stock_move()
 
 #
@@ -104,7 +119,7 @@ stock_picking()
 
 class stock_partial_picking(osv.osv_memory):
     _inherit = 'stock.partial.picking'
-      
+
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -119,15 +134,14 @@ class stock_partial_picking(osv.osv_memory):
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             for m in pick.move_lines:
                 if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'in' and m.purchase_line_id:
+                    if pick.type == 'in' and pick.purchase_id and m.purchase_line_id:
                         res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
-                    if  pick.purchase_id:
-                        res['move%s_product_currency'%(m.id)] =  pick.purchase_line_id.pricelist_id.currency_id.id  
-        return res      
-stock_partial_picking()   
-  
+                        res['move%s_product_currency'%(m.id)] =  pick.purchase_id.pricelist_id.currency_id.id
+        return res
+stock_partial_picking()
+
 class stock_partial_move(osv.osv_memory):
-    _inherit = "stock.partial.move"     
+    _inherit = "stock.partial.move"
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -138,14 +152,13 @@ class stock_partial_move(osv.osv_memory):
         @return: A dictionary which of fields with values.
         """
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')  
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+        move_obj = self.pool.get('stock.move')
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'in' and  m.purchase_line_id:
-                    res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit           
-                if m.picking_id.purchase_id:
+                if m.picking_id.type == 'in' and m.purchase_line_id and m.picking_id.purchase_id:
+                    res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit
                     res['move%s_product_currency'%(m.id)] =  m.picking_id.purchase_id.pricelist_id.currency_id.id
-        return res     
-stock_partial_move()     
+        return res
+stock_partial_move()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index f8745b4b44a..13d9e0f4052 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -29,7 +29,20 @@ class stock_move(osv.osv):
     _defaults = {
         'sale_line_id': False
     }
-    
+
+    def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
+        """
+        Overrides the default stock valuation to take into account the currency that was specified
+        on the sale order in case the valuation data was not directly specified during picking
+        confirmation.
+        """
+        reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context)
+        if move.product_id.cost_method != 'average' or not move.price_unit:
+            # no average price costing or cost not specified during picking validation, we will 
+            # plug the sale line values if they are found.
+            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
+                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+        return reference_amount, reference_currency_id
 stock_move()
 
 class stock_picking(osv.osv):
@@ -211,7 +224,7 @@ stock_picking()
 
 class stock_partial_picking(osv.osv_memory):
     _inherit = 'stock.partial.picking'
-      
+
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -226,16 +239,14 @@ class stock_partial_picking(osv.osv_memory):
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
             for m in pick.move_lines:
                 if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'out' and pick.sale_id:
-                        if m.sale_line_id:
-                            res['move%s_product_price'%(m.id)] =  m.sale_line_id.price_unit
-                        if  pick.sale_id:
-                            res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id  
-        return res      
-stock_partial_picking() 
+                    if pick.type == 'out' and pick.sale_id and m.sale_line_id:
+                        res['move%s_product_price'%(m.id)] =  m.sale_line_id.price_unit
+                        res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id
+        return res
+stock_partial_picking()
 
 class stock_partial_move(osv.osv_memory):
-    _inherit = "stock.partial.move"   
+    _inherit = "stock.partial.move"
     def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
@@ -246,13 +257,12 @@ class stock_partial_move(osv.osv_memory):
         @return: A dictionary which of fields with values.
         """
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')  
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])): 
+        move_obj = self.pool.get('stock.move')
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'out' and  m.sale_line_id:
-                    res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit           
-                if  m.picking_id.sale_id:
-                    res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id or False
-        return res     
-stock_partial_move()                                                                                                  
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+                if m.picking_id.type == 'out' and  m.sale_line_id and m.picking_id.sale_id:
+                    res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit
+                    res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id
+        return res
+stock_partial_move()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fa68c3c776b..49a6d4db542 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1110,6 +1110,7 @@ class stock_picking(osv.osv):
 
         return super(stock_picking, self).unlink(cr, uid, ids, context=context)
 
+    # FIXME: needs refactoring, this code is partially duplicated in stock_move.do_partial()!
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         """ Makes partial picking and moves done.
         @param partial_datas : Dictionary containing details of partial picking
@@ -1117,6 +1118,10 @@ class stock_picking(osv.osv):
                           delivery moves with product_id, product_qty, uom
         @return: Dictionary of values
         """
+        if context is None:
+            context = {}
+        else:
+            context = dict(context)
         res = {}
         move_obj = self.pool.get('stock.move')
         product_obj = self.pool.get('product.product')
@@ -1152,17 +1157,21 @@ class stock_picking(osv.osv):
                     too_many.append(move)
 
                 # Average price computation
+                # FIXME: we should not use the company of the user to determine the currency of the 
+                # product valuation field, we should use the company to which the destination location
+                # belongs! 
                 if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
                     product = product_obj.browse(cr, uid, move.product_id.id)
                     user = users_obj.browse(cr, uid, uid)
-                    context['currency_id'] = move.company_id.currency_id.id
+                    move_currency_id = move.company_id.currency_id.id
+                    context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
                     pricetype = False
                     if user.company_id.property_valuation_price_type:
                         pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
                     if pricetype and qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
-                                user.company_id.currency_id.id, product_price)
+                                move_currency_id, product_price)
                         new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
                                 product.uom_id.id)
                         if product.qty_available <= 0:
@@ -1174,9 +1183,13 @@ class stock_picking(osv.osv):
                                 + (new_price * qty))/(product.qty_available + qty)
 
                         # Write the field according to price type field
-                        product_obj.write(cr, uid, [product.id],
-                                {pricetype.field: new_std_price})
-                        move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
+                        product_obj.write(cr, uid, [product.id], {pricetype.field: new_std_price})
+
+                        # Record the values that were chosen in the wizard, so they can be
+                        # used for inventory valuation if real-time valuation is enabled.
+                        move_obj.write(cr, uid, [move.id], 
+                                {'price_unit': product_price,
+                                 'price_currency_id': product_currency})
 
 
             for move in too_few:
@@ -1475,8 +1488,8 @@ class stock_move(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
-        'price_unit': fields.float('Unit Price',
-            digits_compute= dp.get_precision('Account')),
+        'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
+        'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner", store=True, select=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order", select=True),
@@ -1853,48 +1866,107 @@ class stock_move(osv.osv):
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
         return True
 
-    def _get_accounting_values(self, cr, uid, move, context=None):
+    def _get_accounting_data_for_valuation(self, cr, uid, move, context=None):
+        """
+        Return the accounts and journal to use to post Journal Entries for the real-time
+        valuation of the move.
+        
+        :param context: context dictionary that can explicitly mention the company to consider via the 'force_company' key
+        :raise: osv.except_osv() is any mandatory account or journal is not defined.
+        """
         product_obj=self.pool.get('product.product')
-        product_uom_obj = self.pool.get('product.uom')
-        price_type_obj = self.pool.get('product.price.type')
-        accounts = product_obj.get_product_accounts(cr,uid,move.product_id.id,context)
+        accounts = product_obj.get_product_accounts(cr, uid, move.product_id.id, context)
         acc_src = accounts['stock_account_input']
         acc_dest = accounts['stock_account_output']
         acc_variation = accounts.get('property_stock_variation', False)
         journal_id = accounts['stock_journal']
 
-        if context is None:
-            context = {}
-
         if not acc_src:
-            raise osv.except_osv(_('Error!'),  _('There is no stock input account defined ' \
-                                    'for this product: "%s" (id: %d)') % \
+            raise osv.except_osv(_('Error!'),  _('There is no stock input account defined for this product or its category: "%s" (id: %d)') % \
                                     (move.product_id.name, move.product_id.id,))
         if not acc_dest:
-            raise osv.except_osv(_('Error!'),  _('There is no stock output account defined ' \
-                                    'for this product: "%s" (id: %d)') % \
+            raise osv.except_osv(_('Error!'),  _('There is no stock output account defined for this product or its category: "%s" (id: %d)') % \
                                     (move.product_id.name, move.product_id.id,))
         if not journal_id:
-            raise osv.except_osv(_('Error!'), _('There is no journal defined '\
-                                    'on the product category: "%s" (id: %d)') % \
+            raise osv.except_osv(_('Error!'), _('There is no journal defined on the product category: "%s" (id: %d)') % \
                                     (move.product_id.categ_id.name, move.product_id.categ_id.id,))
         if not acc_variation:
-            raise osv.except_osv(_('Error!'), _('There is no variation  account defined '\
-                                    'on the product category: "%s" (id: %d)') % \
+            raise osv.except_osv(_('Error!'), _('There is no inventory variation account defined on the product category: "%s" (id: %d)') % \
                                     (move.product_id.categ_id.name, move.product_id.categ_id.id,))
-        if acc_src != acc_dest:
-            default_uom = move.product_id.uom_id.id
-            q = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
-            if move.product_id.cost_method == 'average' and move.price_unit:
-                amount = q * move.price_unit
-            # Base computation on valuation price type
-            else:
-                company_id = move.company_id.id
-                context['currency_id'] = move.company_id.currency_id.id
-                pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
-                amount_unit = move.product_id.price_get(pricetype.field, context)[move.product_id.id]
-                amount = amount_unit * q or 1.0
-        return journal_id, acc_src, acc_dest, acc_variation, amount
+
+        return journal_id, acc_src, acc_dest, acc_variation
+
+    def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
+        """
+        Return the reference amount and reference currency representing the inventory valuation for this move.
+        These reference values should possibly be converted before being posted in Journals to adapt to the primary
+        and secondary currencies of the relevant accounts.
+        """
+        product_obj=self.pool.get('product.product')
+        product_uom_obj = self.pool.get('product.uom')
+        price_type_obj = self.pool.get('product.price.type')
+
+        # by default the reference currency is that of the move's company
+        reference_currency_id = move.company_id.currency_id.id
+
+        default_uom = move.product_id.uom_id.id
+        qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
+
+        # if product is set to average price and a specific value was entered in the picking wizard, 
+        # we use it
+        if move.product_id.cost_method == 'average' and move.price_unit:
+            reference_amount = qty * move.price_unit
+            reference_currency_id = move.price_currency_id.id or reference_currency_id
+
+        # Otherwise we default to the company's valuation price type, considering that the values of the 
+        # valuation field are expressed in the default currency of the move's company.
+        else:
+            if context is None:
+                context = {}
+            currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
+            pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
+            amount_unit = move.product_id.price_get(pricetype.field, currency_ctx)[move.product_id.id]
+            reference_amount = amount_unit * qty or 1.0
+
+        return reference_amount, reference_currency_id
+
+
+    def _create_product_valuation_moves(self, cr, uid, move, context=None):
+        """
+        Generate the appropriate accounting moves if the product being moves is subject
+        to real_time valuation tracking, and the source or destination location is
+        a transit location or is outside of the company.
+        """
+        if move.product_id.valuation == 'real_time': # FIXME: product valuation should perhaps be a property?
+            if context is None:
+                context = {}
+            src_company_ctx = dict(context,force_company=move.location_id.company_id.id)
+            dest_company_ctx = dict(context,force_company=move.location_dest_id.company_id.id)
+            account_moves = []
+            # Outgoing moves (or cross-company output part)
+            if move.location_id.company_id \
+                and (move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal'\
+                     or move.location_id.company_id != move.location_dest_id.company_id):
+                journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
+                reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
+                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_variation, acc_dest, reference_amount, reference_currency_id, context))]
+
+            # Incoming moves (or cross-company input part)
+            if move.location_dest_id.company_id \
+                and (move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal'\
+                     or move.location_id.company_id != move.location_dest_id.company_id):
+                journal_id, acc_src, acc_dest, acc_variation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
+                reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
+                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_variation, reference_amount, reference_currency_id, context))]
+
+            move_obj = self.pool.get('account.move')
+            for j_id, move_lines in account_moves:
+                move_obj.create(cr, uid, 
+                        {'name': move.name,
+                         'journal_id': j_id,
+                         'line_id': move_lines,
+                         'ref': move.picking_id and move.picking_id.name})
+
 
     def action_done(self, cr, uid, ids, context=None):
         """ Makes the move done and if all moves are done, it will finish the picking.
@@ -1905,7 +1977,6 @@ class stock_move(osv.osv):
         product_uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         product_obj = self.pool.get('product.product')
-        move_obj = self.pool.get('account.move')
         if context is None:
             context = {}
         for move in self.browse(cr, uid, ids):
@@ -1923,42 +1994,7 @@ class stock_move(osv.osv):
                     if move.move_dest_id.auto_validate:
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
-            #
-            # Accounting Entries
-            #
-            acc_src = None
-            acc_dest = None
-            if move.product_id.valuation == 'real_time':
-                lines = []
-                if ((move.location_id.usage == 'internal' and move.location_dest_id.usage == 'customer') or (move.location_id.usage == 'internal' and move.location_dest_id.usage == 'transit')):
-                    if move.location_id.company_id:
-                        context.update({'force_company': move.location_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    lines = [(journal_id, self.create_account_move(cr, uid, move, acc_dest, acc_variation, amount, context))]
-
-                elif ((move.location_id.usage == 'supplier' and move.location_dest_id.usage == 'internal') or (move.location_id.usage == 'transit' and move.location_dest_id.usage == 'internal')):
-                    if move.location_dest_id.company_id:
-                        context.update({'force_company': move.location_dest_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    lines = [(journal_id, self.create_account_move(cr, uid, move, acc_variation, acc_src, amount, context))]
-                elif (move.location_id.usage == 'internal' and move.location_dest_id.usage == 'internal' and move.location_id.company_id != move.location_dest_id.company_id):
-                    if move.location_id.company_id:
-                        context.update({'force_company': move.location_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    line1 = [(journal_id, self.create_account_move(cr, uid, move, acc_dest, acc_variation, amount, context))]
-                    if move.location_dest_id.company_id:
-                        context.update({'force_company': move.location_dest_id.company_id.id})
-                    journal_id, acc_src, acc_dest, acc_variation, amount = self._get_accounting_values(cr, uid, move, context)
-                    line2 = [(journal_id, self.create_account_move(cr, uid, move, acc_variation, acc_src, amount, context))]
-                    lines = line1 + line2
-                for j_id, line in lines:
-                    move_obj.create(cr, uid, {
-                        'name': move.name,
-                        'journal_id': j_id,
-                        'type':'cont_voucher',
-                        'line_id': line,
-                        'ref': move.picking_id and move.picking_id.name,
-                    })
+            self._create_product_valuation_moves(cr, uid, move, context=context)
 
         self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
@@ -1973,31 +2009,55 @@ class stock_move(osv.osv):
         picking_obj.log_picking(cr, uid, picking_ids, context=context)
         return True
 
-    def create_account_move(self, cr, uid, move,account_id, account_variation, amount, context=None):
-        if context is None:
-            context = {}
-        partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
-        lines=[(0, 0, {
-                'name': move.name,
-                'quantity': move.product_qty,
-                'product_id': move.product_id and move.product_id.id or False,
-                'credit': amount,
-                'account_id': account_id,
-                'ref': move.picking_id and move.picking_id.name or False,
-                'date': time.strftime('%Y-%m-%d')   ,
-                'partner_id': partner_id,
-                }),
-            (0, 0, {
-                'name': move.name,
-                'product_id': move.product_id and move.product_id.id or False,
-                'quantity': move.product_qty,
-                'debit': amount,
-                'account_id': account_variation,
-                'ref': move.picking_id and move.picking_id.name or False,
-                'date': time.strftime('%Y-%m-%d')   ,
-                'partner_id': partner_id,
-        })]
-        return lines
+    def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
+        """
+        Generate the account.move.line values to post to track the stock valuation difference due to the 
+        processing of the given stock move.
+        """
+        # prepare default values considering that the destination accounts have the reference_currency_id as their main currency 
+        partner_id = (move.picking_id.address_id and move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id) or False
+        debit_line_vals = {
+                    'name': move.name,
+                    'product_id': move.product_id and move.product_id.id or False,
+                    'quantity': move.product_qty,
+                    'ref': move.picking_id and move.picking_id.name or False,
+                    'date': time.strftime('%Y-%m-%d')   ,
+                    'partner_id': partner_id,
+                    'debit': reference_amount,
+                    'account_id': dest_account_id,
+        }
+        credit_line_vals = {
+                    'name': move.name,
+                    'product_id': move.product_id and move.product_id.id or False,
+                    'quantity': move.product_qty,
+                    'ref': move.picking_id and move.picking_id.name or False,
+                    'date': time.strftime('%Y-%m-%d')   ,
+                    'partner_id': partner_id,
+                    'credit': reference_amount,
+                    'account_id': src_account_id,
+        }
+
+        # if we are posting to accounts in a different currency, provide correct values in both currencies correctly
+        # when compatible with the optional secondary currency on the account. 
+        # Financial Accounts only accept amounts in secondary currencies if there's no secondary currency on the account
+        # or if it's the same as that of the secondary amount being posted.
+        account_obj = self.pool.get('account.account')
+        src_acct, dest_acct = account_obj.browse(cr, uid, [src_account_id, dest_account_id], context=context)
+        src_main_currency_id = src_acct.company_id.currency_id.id
+        dest_main_currency_id = dest_acct.company_id.currency_id.id
+        cur_obj = self.pool.get('res.currency')
+        if reference_currency_id != src_main_currency_id:
+            # fix credit line:
+            credit_line_vals['credit'] = cur_obj.compute(cr, uid, reference_currency_id, src_main_currency_id, reference_amount, context=context)
+            if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
+                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+        if reference_currency_id != dest_main_currency_id:
+            # fix debit line:
+            debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)
+            if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
+                debit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+
+        return [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]
 
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
@@ -2186,6 +2246,7 @@ class stock_move(osv.osv):
 
         return res
 
+    # FIXME: needs refactoring, this code is partially duplicated in stock_picking.do_partial()!
     def do_partial(self, cr, uid, ids, partial_datas, context=None):
         """ Makes partial pickings and moves done.
         @param partial_datas: Dictionary containing details of partial picking
@@ -2229,6 +2290,9 @@ class stock_move(osv.osv):
                 too_many.append(move)
 
             # Average price computation
+            # FIXME: we should not use the company of the user to determine the currency of the 
+            # product valuation field, we should use the company to which the destination location
+            # belongs! 
             if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
                 product = product_obj.browse(cr, uid, move.product_id.id)
                 user = users_obj.browse(cr, uid, uid)
@@ -2250,10 +2314,14 @@ class stock_move(osv.osv):
                         new_std_price = ((amount_unit * product.qty_available)\
                             + (new_price * qty))/(product.qty_available + qty)
 
-                    # Write the field according to price type field
-                    product_obj.write(cr, uid, [product.id],
-                            {pricetype.field: new_std_price})
-                    self.write(cr, uid, [move.id], {'price_unit': new_price})
+                    product_obj.write(cr, uid, [product.id],{pricetype.field: new_std_price})
+
+                    # Record the values that were chosen in the wizard, so they can be
+                    # used for inventory valuation if real-time valuation is enabled.
+                    self.write(cr, uid, [move.id], 
+                                {'price_unit': product_price,
+                                 'price_currency_id': product_currency,
+                                })
 
         for move in too_few:
             product_qty = move_product_qty[move.id]

From 495318ea48b9a0dcebd4ca2e515cc337810438b3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 11:20:17 +0530
Subject: [PATCH 044/632] [Fix] sale: remove the purchase_line_id from sale

bzr revid: sbh@tinyerp.com-20100916055017-x9gf8agtna3y4i91
---
 addons/sale/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 13d9e0f4052..7ce8c806cfb 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -40,8 +40,8 @@ class stock_move(osv.osv):
         if move.product_id.cost_method != 'average' or not move.price_unit:
             # no average price costing or cost not specified during picking validation, we will 
             # plug the sale line values if they are found.
-            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
-                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+            if move.sale_line_id and move.picking_id.pricelist_id.currency_id:
+                reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 stock_move()
 

From 08c1ed1f642562ff4d3e3a39f96806339b4d1c6c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 11:38:16 +0530
Subject: [PATCH 045/632] [Fix] sale,purchase: Fix the name

bzr revid: sbh@tinyerp.com-20100916060816-vi4wxobnktcv2nyy
---
 addons/purchase/stock.py | 4 ++--
 addons/sale/stock.py     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index f25a03adda2..fb3d8f0b078 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -42,8 +42,8 @@ class stock_move(osv.osv):
         if move.product_id.cost_method != 'average' or not move.price_unit:
             # no average price costing or cost not specified during picking validation, we will 
             # plug the purchase line values if they are found.
-            if move.purchase_line_id and move.picking_id.pricelist_id.currency_id:
-                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+            if move.purchase_line_id and move.picking_id.purchase_id.pricelist_id:
+                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.purchase_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 
 stock_move()
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 7ce8c806cfb..ce75d1a99ff 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -40,8 +40,8 @@ class stock_move(osv.osv):
         if move.product_id.cost_method != 'average' or not move.price_unit:
             # no average price costing or cost not specified during picking validation, we will 
             # plug the sale line values if they are found.
-            if move.sale_line_id and move.picking_id.pricelist_id.currency_id:
-                reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.pricelist_id.currency_id.id
+            if move.sale_line_id and move.picking_id.sale_id.pricelist_id:
+                reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.sale_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 stock_move()
 

From 98fb031bd0059e37039fde5a04896d24a7b66a13 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 14:37:22 +0530
Subject: [PATCH 046/632] [IMP] stock,sale: Move the code into sale

bzr revid: sbh@tinyerp.com-20100916090722-fkwvzhn03gmo937r
---
 addons/sale/stock.py  |  5 +++++
 addons/stock/stock.py | 33 ++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index ce75d1a99ff..02b2817d3b4 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -43,6 +43,11 @@ class stock_move(osv.osv):
             if move.sale_line_id and move.picking_id.sale_id.pricelist_id:
                 reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.sale_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
+    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,todo, context=None):
+        res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,todo, context=context)
+        if picking.sale_id:
+            picking_obj = self.pool.get('stock.picking').write(cr,uid,[res],{'sale_id':picking.sale_id.id})
+        return res    
 stock_move()
 
 class stock_picking(osv.osv):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 49a6d4db542..3e19738c2e7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1682,7 +1682,23 @@ class stock_move(osv.osv):
                     result.setdefault(m.picking_id, [])
                     result[m.picking_id].append( (m, dest) )
         return result
-
+    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
+        res_obj = self.pool.get('res.company')
+        picking_obj = self.pool.get('stock.picking')
+        pick_id= picking_obj.create(cr, uid, {
+                                'name': pick_name,
+                                'origin': str(picking.origin or ''),
+                                'type': ptype,
+                                'note': picking.note,
+                                'move_type': picking.move_type,
+                                'auto_picking': move[0][1][1] == 'auto',
+                                'stock_journal_id': move[0][1][3],
+                                'company_id': move[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context=context),
+                                'address_id': picking.address_id.id,
+                                'invoice_state': 'none',
+                                'date': picking.date,
+                            })
+        return pick_id
     def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms stock move.
         @return: List of ids.
@@ -1708,20 +1724,7 @@ class stock_move(osv.osv):
                     pickid = check_picking_ids[0]
                 else:
                     if picking:
-                        pickid = picking_obj.create(cr, uid, {
-                            'name': pick_name,
-                            'origin': str(picking.origin or ''),
-                            'type': ptype,
-                            'note': picking.note,
-                            'move_type': picking.move_type,
-                            'auto_picking': todo[0][1][1] == 'auto',
-                            'stock_journal_id': todo[0][1][3],
-                            'company_id': todo[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context=context),
-                            'address_id': picking.address_id.id,
-                            'invoice_state': 'none',
-                            'date': picking.date,
-                            'sale_id':' sale_id' in picking._columns.keys() and  picking.sale_id.id or False
-                        })
+                        pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
                     else:
                         pickid = False
                 for move, (loc, auto, delay, journal, company_id, ptype) in todo:

From eaf5e50adcb3f78fa227bcc2f69ba76f29eef381 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 14:38:29 +0530
Subject: [PATCH 047/632] [IMP] stock: change the name of argument

bzr revid: sbh@tinyerp.com-20100916090829-xoavbubn94wqwizm
---
 addons/sale/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 02b2817d3b4..0bb47110213 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -43,8 +43,8 @@ class stock_move(osv.osv):
             if move.sale_line_id and move.picking_id.sale_id.pricelist_id:
                 reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.sale_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
-    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,todo, context=None):
-        res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,todo, context=context)
+    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
+        res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,move, context=context)
         if picking.sale_id:
             picking_obj = self.pool.get('stock.picking').write(cr,uid,[res],{'sale_id':picking.sale_id.id})
         return res    

From b792ea494ec867ed773e55d56ef347472410ca71 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 18:14:12 +0530
Subject: [PATCH 048/632] [FIX]: stock :picking cancels done moves

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

bzr revid: sbh@tinyerp.com-20100916124412-fjwhh0ms6935f30i
---
 addons/stock/stock.py           | 11 +++++++++--
 addons/stock/stock_workflow.xml |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3e19738c2e7..80be285cd25 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -60,7 +60,6 @@ class stock_journal(osv.osv):
     }
 
 stock_journal()
-
 #----------------------------------------------------------
 # Stock Location
 #----------------------------------------------------------
@@ -1090,7 +1089,15 @@ class stock_picking(osv.osv):
                 if move.state not in ('cancel',):
                     return False
         return True
-
+   
+    def allow_cancel(self, cr, uid, ids, context={}):
+        for pick in self.browse(cr, uid, ids, context=context):
+            if not pick.move_lines:
+                return True
+            for move in pick.move_lines:
+                if move.state == 'done':
+                    return False
+        return True
     def unlink(self, cr, uid, ids, context=None):
         move_obj = self.pool.get('stock.move')
         if context is None:
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 3254f7b6984..9d4d41260ed 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -96,11 +96,13 @@
         <record id="trans_assigned_cancel" model="workflow.transition">
             <field name="act_from" ref="act_assigned"/>
             <field name="act_to" ref="act_cancel"/>
+			 <field name="condition">allow_cancel()</field>
             <field name="signal">button_cancel</field>
         </record>
         <record id="trans_confirmed_cancel" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_cancel"/>
+            <field name="condition">allow_cancel()</field>
             <field name="signal">button_cancel</field>
         </record>
         <record id="trans_draft_cancel" model="workflow.transition">

From d0e25ef9642ba10e16be8a5f2365edd3f7c89ba5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 18:39:40 +0530
Subject: [PATCH 049/632] [IMP] stock: raise an exception when picking cancels
 done moves

bzr revid: sbh@tinyerp.com-20100916130940-l3jnsgqhjjavrq4t
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 80be285cd25..19f66ceb61e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1096,7 +1096,7 @@ class stock_picking(osv.osv):
                 return True
             for move in pick.move_lines:
                 if move.state == 'done':
-                    return False
+                    raise osv.except_osv(_('Error'), _('You cannot cancel picking because stock move is in done state !'))                    
         return True
     def unlink(self, cr, uid, ids, context=None):
         move_obj = self.pool.get('stock.move')

From 05f36597af8125fc562f95ab12a5a61d871ebda0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 11:44:48 +0530
Subject: [PATCH 050/632] [IMP] stock:remove the widget=selection in Move_lines

bzr revid: sbh@tinyerp.com-20100917061448-bi1hsyeca6oj1x9c
---
 addons/stock/stock_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f975637b3c0..b1cd4f20baf 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -705,8 +705,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','=','internal')]" />
+                                        <field name="location_dest_id" domain="[('usage','=','internal')]" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -890,8 +890,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','=','internal')]" />
+                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -1106,8 +1106,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','=','internal')]" />
+                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" />
                                     </group>
 
                                     <group colspan="2" col="2">
@@ -1317,8 +1317,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]" widget="selection"/>
-                                        <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+                                        <field name="location_id" domain="[('usage','&lt;&gt;','view')]" />
+                                        <field name="location_dest_id" domain="[('usage','=','internal')]" />
                                     </group>
 
                                     <group colspan="2" col="2">

From 3a01a11b8bd281e6d0a0c9626bc5ea1df625b9b9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 15:38:47 +0530
Subject: [PATCH 051/632] [REF] stock: refactored stock_return_picking

bzr revid: sbh@tinyerp.com-20100917100847-oa1zadom07xrtg8y
---
 addons/stock/wizard/stock_return_picking.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 30403e3b1d0..190f57968f0 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -65,18 +65,15 @@ class stock_return_picking(osv.osv_memory):
          @return: New arch of view with new columns.
         """
         res = super(stock_return_picking, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False) or False
+        record_id = context and context.get('active_id', False) 
         if record_id:
             pick_obj = self.pool.get('stock.picking')
-            try:
-                pick = pick_obj.browse(cr, uid, record_id)
-                for m in [line for line in pick.move_lines]:
-                    if 'return%s'%(m.id) not in self._columns:
-                        self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
-                    if 'invoice_state' not in self._columns:
-                        self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)    
-            except Exception, e:
-                return res
+            pick = pick_obj.browse(cr, uid, record_id)
+            for m in [line for line in pick.move_lines]:
+                if 'return%s'%(m.id) not in self._columns:
+                    self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                if 'invoice_state' not in self._columns:
+                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)    
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', 

From f46520efa91c5062e7e30ef989d79fdd83047d0f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 17 Sep 2010 16:55:14 +0530
Subject: [PATCH 052/632] [IMP/REF] stock: Improve the code and remove the
 warning message on return picking wizard

bzr revid: sbh@tinyerp.com-20100917112514-jn9k6d4ngvjs8xba
---
 addons/stock/wizard/stock_return_picking.py | 49 ++++++++-------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 190f57968f0..4542fff47cf 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -73,7 +73,10 @@ class stock_return_picking(osv.osv_memory):
                 if 'return%s'%(m.id) not in self._columns:
                     self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
                 if 'invoice_state' not in self._columns:
-                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)    
+                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+                for rec in m.move_history_ids2:
+                    if rec.product_qty==m.product_qty:
+                        raise osv.except_osv(_('Warning !'), _("There is no product to return!"))
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
@@ -110,8 +113,8 @@ class stock_return_picking(osv.osv_memory):
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
                     res.setdefault('returns', []).append(m.id)
-                if not res.get('returns',False):
-                    raise osv.except_osv(_('Warning!'),_('There is no product to return!'))
+#            if not res.get('returns',False): Todo : It may be used 
+#                raise osv.except_osv(_('Warning!'),_('There is no product to return!'))
         
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
             if pick.invoice_state=='invoiced':
@@ -121,13 +124,13 @@ class stock_return_picking(osv.osv_memory):
             res['fields']['invoice_state']={'string':_('Invoice state'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To Be Invoiced')), ('none', _('None'))]}
             arch_lst.append('<group col="2" colspan="4">')
             arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
-            arch_lst.append('<button name="action_open_window" string="Return" colspan="1" type="object" icon="gtk-apply" />')
+            arch_lst.append('<button name="create_returns" string="Return" colspan="1" type="object" icon="gtk-apply" />')
             arch_lst.append('</group>')
             arch_lst.append('</form>')
             res['arch'] = '\n'.join(arch_lst)
         return res
 
-    def _create_returns(self, cr, uid, ids, context):
+    def create_returns(self, cr, uid, ids, context):
         """ 
          Creates return picking.
          @param self: The object pointer.
@@ -183,35 +186,21 @@ class stock_return_picking(osv.osv_memory):
     
         if set_invoice_state_to_none:
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
-    
         if new_picking:
             if new_picking:
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
             pick_obj.force_assign(cr, uid, [new_picking], context)
-        return new_picking
-    
-    def action_open_window(self, cr, uid, ids, context):
-        """ 
-         Opens return picking list.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param ids: List of ids selected 
-         @param context: A standard dictionary 
-         @return: A dictionary which of fields with values. 
-        """ 
-        res = self._create_returns(cr, uid, ids, context)
-        if not res:
-            return {}
-        return {
-            'domain': "[('id', 'in', ["+str(res)+"])]",
-            'name': 'Picking List',
-            'view_type':'form',
-            'view_mode':'tree,form',
-            'res_model':'stock.picking',
-            'view_id':False,
-            'type':'ir.actions.act_window',
-        }
+            return {
+                'domain': "[('id', 'in', ["+str(new_picking)+"])]",
+                'name': 'Picking List',
+                'view_type':'form',
+                'view_mode':'tree,form',
+                'res_model':'stock.picking',
+                'view_id':False,
+                'type':'ir.actions.act_window',
+                'context':context,
+            }            
+        return {}
     
 stock_return_picking()
 

From fc1a40a1eeeab3e7e352cc62423fc91f2add2df1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 16 Sep 2010 17:27:53 +0200
Subject: [PATCH 053/632] [FIX] stock: use correct accounts when testing for
 multi-currency Journal Entries

bzr revid: odo@openerp.com-20100916152753-2y93oewqqd3zkmhu
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 19f66ceb61e..49a7d57e417 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2064,7 +2064,7 @@ class stock_move(osv.osv):
         if reference_currency_id != dest_main_currency_id:
             # fix debit line:
             debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)
-            if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
+            if (not dest_acct.currency_id) or dest_acct.currency_id.id == reference_currency_id:
                 debit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
 
         return [(0, 0, debit_line_vals), (0, 0, credit_line_vals)]

From b9beb3076e7d838960abf20dcf904586a533e6c5 Mon Sep 17 00:00:00 2001
From: "RGA (OpenERP)" <rga@tinyerp.com>
Date: Mon, 20 Sep 2010 14:40:37 +0530
Subject: [PATCH 054/632] [IMP]when create new filter it should be modified if
 same name filter already exist otherwise create new one

bzr revid: rga@tinyerp.com-20100920091037-tyheqqfx72b3cbm2
---
 bin/addons/base/ir/ir_filters.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 2821d0c94b7..272d1c718c1 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -36,6 +36,20 @@ class ir_filters(osv.osv):
         act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
         return my_acts
+    
+    def create_or_replace(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        is_filter_exist = False
+        for filter in self.get_filters(cr, uid, vals['model_id']):
+            if filter['name'].lower() == vals['name'].lower():
+                is_filter_exist = filter['id']
+                break
+        if is_filter_exist:
+             return super(ir_filters, self).write(cr, uid, is_filter_exist, vals, context)
+        else:
+             return super(ir_filters, self).create(cr, uid, vals, context)
+
 
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True, required=True),

From 1521b235409982842b63b423c6ff7ac4ed4ca1db Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 11:28:33 +0530
Subject: [PATCH 055/632] [IMP] stock: Improve the get_product_available method
 contains SQL injection

bzr revid: sbh@tinyerp.com-20100921055833-u1j2mk8pah2a9oi4
---
 addons/stock/product.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 0feb2a9456c..ca3d19f6878 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -228,16 +228,23 @@ class product_product(osv.osv):
         results = []
         results2 = []
 
-        from_date=context.get('from_date',False)
-        to_date=context.get('to_date',False)
-        date_str=False
+        from_date = context.get('from_date',False)
+        to_date = context.get('to_date',False)
+        date_str = False
+        date_values = False
         if from_date and to_date:
-            date_str="date_planned>='%s' and date_planned<='%s'"%(from_date,to_date)
+            date_str = "date_planned>=%s and date_planned<=%s"
+            date_values = [from_date, to_date]
         elif from_date:
-            date_str="date_planned>='%s'"%(from_date)
+            date_str = "date_planned>=%s"
+            date_values = [from_date] 
         elif to_date:
-            date_str="date_planned<='%s'"%(to_date)
+            date_str = "date_planned<=%s"
+            date_values = [to_date]
 
+        where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
+        if date_values:
+            where.append(tuple(date_values))
         if 'in' in what:
             # all moves from a location out of the set to a location in the set
             cr.execute(
@@ -247,8 +254,7 @@ class product_product(osv.osv):
                 'and location_dest_id IN %s'\
                 'and product_id IN %s'\
                 'and state IN %s' + (date_str and 'and '+date_str+' ' or '') +''\
-                'group by product_id,product_uom',(tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states),)
-            )
+                'group by product_id,product_uom',tuple(where))
             results = cr.fetchall()
         if 'out' in what:
             # all moves from a location in the set to a location out of the set
@@ -259,8 +265,7 @@ class product_product(osv.osv):
                 'and location_dest_id NOT IN %s '\
                 'and product_id  IN %s'\
                 'and state in %s' + (date_str and 'and '+date_str+' ' or '') + ''\
-                'group by product_id,product_uom',(tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states),)
-            )
+                'group by product_id,product_uom',tuple(where))
             results2 = cr.fetchall()
         uom_obj = self.pool.get('product.uom')
         uoms = map(lambda x: x[2], results) + map(lambda x: x[2], results2)
@@ -442,4 +447,4 @@ class product_category(osv.osv):
 
 product_category()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From be9b937035bb6c6a9c9d13eb5ea05c4662d62e29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 15:51:42 +0530
Subject: [PATCH 056/632] [REM] product: Remove property_valuation_price_type
 field from view and code, [IMP]account,hr_expense,product,stock:
 property_valuation_price_type remove the field and use standard_price

bzr revid: sbh@tinyerp.com-20100921102142-nlngoezrxz5m72jb
---
 addons/account/account_analytic_line.py |  3 +-
 addons/hr_expense/hr_expense.py         |  4 +--
 addons/product/__init__.py              |  1 -
 addons/product/__openerp__.py           |  1 -
 addons/product/company.py               | 43 -------------------------
 addons/product/company_view.xml         | 18 -----------
 addons/product/product_data.xml         |  6 ----
 addons/stock/stock.py                   | 30 ++++++-----------
 8 files changed, 12 insertions(+), 94 deletions(-)
 delete mode 100644 addons/product/company.py
 delete mode 100644 addons/product/company_view.xml

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index be1e5ec65e6..5faec1c63a0 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -95,7 +95,8 @@ class account_analytic_line(osv.osv):
                 company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
             flag = False
             # Compute based on pricetype
-            pricetype=product_price_type_obj.browse(cr, uid, company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context)
+            pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
             if journal_id:
                 journal = analytic_journal_obj.browse(cr, uid, journal_id)
                 if journal.type == 'sale':
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c5818536f8c..96fdcb5250a 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -246,10 +246,8 @@ class hr_expense_line(osv.osv):
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v['name'] = product.name
             # Compute based on pricetype of employee company
-            pricetype_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.property_valuation_price_type.id
             context['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
-            pricetype = self.pool.get('product.price.type').browse(cr, uid, pricetype_id, context=context)
-            amount_unit = product.price_get(pricetype.field, context)[product.id]
+            amount_unit = product.price_get('standard_price', context)[product.id]
             v['unit_amount'] = amount_unit
             if not uom_id:
                 v['uom_id'] = product.uom_id.id
diff --git a/addons/product/__init__.py b/addons/product/__init__.py
index 3052a02d212..4247b49d41b 100644
--- a/addons/product/__init__.py
+++ b/addons/product/__init__.py
@@ -23,6 +23,5 @@ import pricelist
 import report
 import partner
 import wizard
-import company
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 5d099489859..851031e0424 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -55,7 +55,6 @@
         'product_view.xml',
         'pricelist_view.xml',
         'partner_view.xml',
-        'company_view.xml',
         'process/product_process.xml'
     ],
     'test':['test/product_report.yml'],
diff --git a/addons/product/company.py b/addons/product/company.py
deleted file mode 100644
index 0f248dba309..00000000000
--- a/addons/product/company.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class res_company(osv.osv):
-    _inherit = 'res.company'
-    _columns = {
-        'property_valuation_price_type': fields.property(
-            'product.price.type',
-            type='many2one', 
-            relation='product.price.type', 
-            domain=[],
-            string="Valuation Price Type", 
-            method=True,
-            view_load=True,
-            help="The price type field in the selected price type will be used, instead of the default one, \
-                  for valuation of product in the current company"),
-    }
-
-res_company()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/product/company_view.xml b/addons/product/company_view.xml
deleted file mode 100644
index eb0294e2daa..00000000000
--- a/addons/product/company_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<openerp>
-    <data>
-
-    
-        <record id="view_company_property_form" model="ir.ui.view">
-            <field name="name">res.company.product.property.form.inherit</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                    <field name="property_valuation_price_type"/>
-                </field>
-            </field>
-            </record>
-
-    </data>
-</openerp>
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 05a57126402..e7cd7623f96 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -140,12 +140,6 @@ parameter) will see those record just disappear.
             <field eval="'product.pricelist,'+str(ref('list0'))" name="value"/>
         </record>
 
-        <record forcecreate="True" id="property_valuation_price_type" model="ir.property">
-            <field name="name">property_valuation_price_type</field>
-            <field name="fields_id" search="[('model','=','res.company'),('name','=','property_valuation_price_type')]"/>
-            <field eval="'product.price.type,'+str(ref('standard_price'))" name="value"/>
-        </record>
-
         <record forcecreate="True" id="decimal_sale" model="decimal.precision">
             <field name="name">Sale Price</field>
             <field name="digits">2</field>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 49a7d57e417..4e6d6c81f18 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -139,15 +139,13 @@ class stock_location(osv.osv):
         if result:
             # Choose the right filed standard_price to read
             # Take the user company
-            price_type_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.property_valuation_price_type.id
-            pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id, context=context)
             for r in result:
                 c = (context or {}).copy()
                 c['location'] = id
                 product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read], context=c)
                 # Compute the amount_unit in right currency
                 context['currency_id'] = self.pool.get('res.users').browse(cr,uid,uid).company_id.currency_id.id
-                amount_unit = self.pool.get('product.product').browse(cr,uid,r['product_id']).price_get(pricetype.field, context)[r['product_id']]
+                amount_unit = self.pool.get('product.product').browse(cr,uid,r['product_id']).price_get('standard_price', context)[r['product_id']]
                 final_value += (product[field_to_read] * amount_unit)
         return final_value
 
@@ -280,8 +278,6 @@ class stock_location(osv.osv):
             context = {}
         product_obj = self.pool.get('product.product')
         # Take the user company and pricetype
-        price_type_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.property_valuation_price_type.id
-        pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id)
         context['currency_id'] = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
 
         # To be able to offer recursive or non-recursive reports we need to prevent recursive quantities by default
@@ -320,7 +316,7 @@ class stock_location(osv.osv):
 
                     # Compute based on pricetype
                     # Choose the right filed standard_price to read
-                    amount_unit = product.price_get(pricetype.field, context)[product.id]
+                    amount_unit = product.price_get('standard_price', context)[product.id]
                     price = qty[product_id] * amount_unit
 
                     total_price += price
@@ -887,11 +883,8 @@ class stock_picking(osv.osv):
 
         if type in ('in_invoice', 'in_refund'):
             # Take the user company and pricetype
-            price_type_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.property_valuation_price_type.id
-            pricetype = self.pool.get('product.price.type').browse(cr, uid, price_type_id)
             context['currency_id'] = move_line.company_id.currency_id.id
-
-            amount_unit = move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id]
+            amount_unit = move_line.product_id.price_get('standard_price', context)[move_line.product_id.id]
             return amount_unit
         else:
             return move_line.product_id.list_price
@@ -1173,9 +1166,7 @@ class stock_picking(osv.osv):
                     move_currency_id = move.company_id.currency_id.id
                     context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                    pricetype = False
-                    if user.company_id.property_valuation_price_type:
-                        pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                    pricetype ='standard_price'
                     if pricetype and qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
                                 move_currency_id, product_price)
@@ -1185,7 +1176,7 @@ class stock_picking(osv.osv):
                             new_std_price = new_price
                         else:
                             # Get the standard price
-                            amount_unit = product.price_get(pricetype.field, context)[product.id]
+                            amount_unit = product.price_get(pricetype, context)[product.id]
                             new_std_price = ((amount_unit * product.qty_available)\
                                 + (new_price * qty))/(product.qty_available + qty)
 
@@ -1934,8 +1925,7 @@ class stock_move(osv.osv):
             if context is None:
                 context = {}
             currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
-            pricetype = price_type_obj.browse(cr,uid,move.company_id.property_valuation_price_type.id)
-            amount_unit = move.product_id.price_get(pricetype.field, currency_ctx)[move.product_id.id]
+            amount_unit = move.product_id.price_get('standard_price', currency_ctx)[move.product_id.id]
             reference_amount = amount_unit * qty or 1.0
 
         return reference_amount, reference_currency_id
@@ -2308,9 +2298,7 @@ class stock_move(osv.osv):
                 user = users_obj.browse(cr, uid, uid)
                 context['currency_id'] = move.company_id.currency_id.id
                 qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                pricetype = False
-                if user.company_id.property_valuation_price_type:
-                    pricetype = price_type_obj.browse(cr, uid, user.company_id.property_valuation_price_type.id)
+                pricetype = 'standard_price'
                 if pricetype and qty > 0:
                     new_price = currency_obj.compute(cr, uid, product_currency,
                             user.company_id.currency_id.id, product_price)
@@ -2320,11 +2308,11 @@ class stock_move(osv.osv):
                         new_std_price = new_price
                     else:
                         # Get the standard price
-                        amount_unit = product.price_get(pricetype.field, context)[product.id]
+                        amount_unit = product.price_get(pricetype, context)[product.id]
                         new_std_price = ((amount_unit * product.qty_available)\
                             + (new_price * qty))/(product.qty_available + qty)
 
-                    product_obj.write(cr, uid, [product.id],{pricetype.field: new_std_price})
+                    product_obj.write(cr, uid, [product.id],{pricetype: new_std_price})
 
                     # Record the values that were chosen in the wizard, so they can be
                     # used for inventory valuation if real-time valuation is enabled.

From 4897b891bce0b6aefca88ca771b7947f5296fff3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 17:38:55 +0530
Subject: [PATCH 057/632] [IMP] stock: remove one of the date field on stock
 move and use current_date rename the current date_planned to date

bzr revid: sbh@tinyerp.com-20100921120855-9jmg0dctpytlhnlq
---
 addons/stock/product.py                       |  6 +--
 addons/stock/report/product_stock.py          |  8 +--
 addons/stock/report/report_stock_move.py      | 28 +++++-----
 .../stock/report/report_stock_move_view.xml   | 14 ++---
 addons/stock/stock.py                         | 50 +++++++++--------
 addons/stock/stock_view.xml                   | 54 +++++++++----------
 addons/stock/test/stock_test.yml              |  2 +-
 addons/stock/wizard/stock_return_picking.py   |  2 +-
 8 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index ca3d19f6878..c6b5500c38c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -233,13 +233,13 @@ class product_product(osv.osv):
         date_str = False
         date_values = False
         if from_date and to_date:
-            date_str = "date_planned>=%s and date_planned<=%s"
+            date_str = "date>=%s and date<=%s"
             date_values = [from_date, to_date]
         elif from_date:
-            date_str = "date_planned>=%s"
+            date_str = "date>=%s"
             date_values = [from_date] 
         elif to_date:
-            date_str = "date_planned<=%s"
+            date_str = "date<=%s"
             date_values = [to_date]
 
         where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index e55405381b4..b7dd254234c 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -69,12 +69,12 @@ class report_stock(report_int):
         if not loc_ids or not product_ids:
             return (False, 'pdf')
 
-        cr.execute("select sum(r.product_qty * u.factor), r.date_planned, r.product_id "
+        cr.execute("select sum(r.product_qty * u.factor), r.date, r.product_id "
                    "from stock_move r left join product_uom u on (r.product_uom=u.id) "
                    "where state IN %s"
                    "and location_id IN %s"
                    "and product_id IN %s"
-                   "group by date_planned,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
+                   "group by date,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
                 dt= (datetime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')
@@ -83,12 +83,12 @@ class report_stock(report_int):
             products.setdefault(prod_id, [])
             products[prod_id].append((dt,-qty))
 
-        cr.execute("select sum(r.product_qty * u.factor), r.date_planned, r.product_id "
+        cr.execute("select sum(r.product_qty * u.factor), r.date, r.product_id "
                    "from stock_move r left join product_uom u on (r.product_uom=u.id) "
                    "where state IN %s"
                    "and location_dest_id IN %s"
                    "and product_id IN %s"
-                   "group by date_planned,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
+                   "group by date,product_id",(('confirmed','assigned','waiting'),tuple(loc_ids) ,tuple(product_ids),))
 
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 460e7a6d0ab..3e005c3a51a 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -28,7 +28,7 @@ class report_stock_move(osv.osv):
     _description = "Moves Statistics"
     _auto = False
     _columns = {
-        'date_planned': fields.date('Date', readonly=True),
+        'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
@@ -57,7 +57,7 @@ class report_stock_move(osv.osv):
                 select
                         min(sm_id) as id,
                         sum(value) as value,
-                        al.dp as date_planned,
+                        al.dp as date,
                         al.curr_year as year,
                         al.curr_month as month,
                         al.curr_day as day,
@@ -82,13 +82,13 @@ class report_stock_move(osv.osv):
                         CASE WHEN sp.type in ('in') THEN
                             sum(sm.product_qty)  END AS in_qty,
                         min(sm.id) as sm_id,
-                        sm.date_planned as dp,
-                        to_char(date_trunc('day',sm.date_planned), 'YYYY') as curr_year,
-                        to_char(date_trunc('day',sm.date_planned), 'MM') as curr_month,
-                        to_char(date_trunc('day',sm.date_planned), 'YYYY-MM-DD') as curr_day,
-                        avg(date(sm.date_planned)-date(sm.create_date)) as curr_day_diff,
+                        sm.date as dp,
+                        to_char(date_trunc('day',sm.date), 'YYYY') as curr_year,
+                        to_char(date_trunc('day',sm.date), 'MM') as curr_month,
+                        to_char(date_trunc('day',sm.date), 'YYYY-MM-DD') as curr_day,
+                        avg(date(sm.date)-date(sm.create_date)) as curr_day_diff,
                         avg(date(sm.date_expected)-date(sm.create_date)) as curr_day_diff1,
-                        avg(date(sm.date_planned)-date(sm.date_expected)) as curr_day_diff2,
+                        avg(date(sm.date)-date(sm.date_expected)) as curr_day_diff2,
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
                         pt.standard_price * sum(sm.product_qty) as value,
@@ -107,7 +107,7 @@ class report_stock_move(osv.osv):
                         left join stock_location sl on (sm.location_id = sl.id)
 
                     group by
-                        sm.id,sp.type, sm.date_planned,sm.address_id,
+                        sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id,
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id)
@@ -129,7 +129,7 @@ class report_stock_inventory(osv.osv):
     _description = "Stock Statistics"
     _auto = False
     _columns = {
-        'date_planned': fields.datetime('Date', readonly=True),
+        'date': fields.datetime('Date', readonly=True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
@@ -147,7 +147,7 @@ class report_stock_inventory(osv.osv):
         cr.execute("""
 create or replace view report_stock_inventory as (
     (select
-        min(m.id) as id, m.date_planned as date_planned,
+        min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
@@ -163,10 +163,10 @@ create or replace view report_stock_inventory as (
                 left join stock_location l on (m.location_id=l.id)
     group by
         m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
-        m.date_planned, m.state, l.usage, m.company_id
+        m.date, m.state, l.usage, m.company_id
 ) union all (
     select
-        -m.id as id, m.date_planned as date_planned,
+        -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
@@ -182,7 +182,7 @@ create or replace view report_stock_inventory as (
                 left join stock_location l on (m.location_dest_id=l.id)
     group by
         m.id, m.product_id, m.address_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date_planned, m.state, l.usage, m.company_id
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
 );
         """)
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 2c8c1ad80e9..2ee9809f86d 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -13,7 +13,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Moves Analysis">
-                <field name="date_planned" invisible="1"/>
+                <field name="date" invisible="1"/>
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -62,7 +62,7 @@
                 <filter icon="terp-go-today"
                     string="Today"
                     separator="1"
-                    domain="[('date_planned','=', time.strftime('%%Y-%%m-%%d'))]"
+                    domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
                     help="Stock Moves of today"/>
                 <separator orientation="vertical"/>
 
@@ -99,7 +99,7 @@
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
@@ -109,7 +109,7 @@
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                 </group>
 
             </search>
@@ -134,7 +134,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Inventory Analysis">
-                <field name="date_planned" invisible="1"/>
+                <field name="date" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="location_type" invisible="1"/>
                 <field name="location_id" invisible="1"/>
@@ -182,7 +182,7 @@
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                     <separator orientation="vertical"/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                     <field name="product_id"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
@@ -197,7 +197,7 @@
                     <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
                     <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date_planned'}"/>
+                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
                 <newline/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4e6d6c81f18..6e23e89506d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -554,12 +554,12 @@ class stock_picking(osv.osv):
             ids = [ids]
         for pick in self.browse(cr, uid, ids, context):
             sql_str = """update stock_move set
-                    date_planned='%s'
+                    date='%s'
                 where
                     picking_id=%d """ % (value, pick.id)
 
             if pick.max_date:
-                sql_str += " and (date_planned='" + pick.max_date + "' or date_planned>'" + value + "')"
+                sql_str += " and (date='" + pick.max_date + "' or date>'" + value + "')"
             cr.execute(sql_str)
         return True
 
@@ -576,11 +576,11 @@ class stock_picking(osv.osv):
             ids = [ids]
         for pick in self.browse(cr, uid, ids, context=context):
             sql_str = """update stock_move set
-                    date_planned='%s'
+                    date='%s'
                 where
                     picking_id=%s """ % (value, pick.id)
             if pick.min_date:
-                sql_str += " and (date_planned='" + pick.min_date + "' or date_planned<'" + value + "')"
+                sql_str += " and (date='" + pick.min_date + "' or date<'" + value + "')"
             cr.execute(sql_str)
         return True
 
@@ -595,8 +595,8 @@ class stock_picking(osv.osv):
             return res
         cr.execute("""select
                 picking_id,
-                min(date_planned),
-                max(date_planned)
+                min(date),
+                max(date)
             from
                 stock_move
             where
@@ -1457,9 +1457,8 @@ class stock_move(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
-
-        'date': fields.datetime('Creation Date', select=True),
-        'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'date': fields.datetime('Date Planned', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
@@ -1540,7 +1539,6 @@ class stock_move(osv.osv):
         'priority': '1',
         'product_qty': 1.0,
         'scrapped' :  False,
-        'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'),
         'date': time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.move', context=c),
         'date_expected': time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -1673,7 +1671,7 @@ class stock_move(osv.osv):
             if dest:
                 if dest[1] == 'transparent':
                     self.write(cr, uid, [m.id], {
-                        'date_planned': (datetime.strptime(m.date_planned, '%Y-%m-%d %H:%M:%S') + \
+                        'date': (datetime.strptime(m.date, '%Y-%m-%d %H:%M:%S') + \
                             relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d'),
                         'location_dest_id': dest[0].id})
                 else:
@@ -1734,7 +1732,7 @@ class stock_move(osv.osv):
                         'state': 'waiting',
                         'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
                         'move_history_ids': [],
-                        'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
+                        'date': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
                         'move_history_ids2': []}
                     )
                     move_obj.write(cr, uid, [move.id], {
@@ -1996,7 +1994,7 @@ class stock_move(osv.osv):
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
 
-        self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
@@ -2426,7 +2424,7 @@ class stock_inventory(osv.osv):
                         'product_uom': line.product_uom.id,
                         'prodlot_id': lot_id,
                         'date': inv.date,
-                        'date_planned': inv.date,
+                        'date': inv.date,
                         'state': 'done'
                     }
                     if change > 0:
@@ -2591,21 +2589,21 @@ class report_products_to_received_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
         cr.execute("""
             create or replace view report_products_to_received_planned as (
-               select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+               select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.date
+                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+                    group by stock.create_date
 
                     union
 
-               select stock.date_planned, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date_planned
+                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+        group by stock.date
                 )
         """)
 
@@ -2626,21 +2624,21 @@ class report_delivery_products_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
         cr.execute("""
             create or replace view report_delivery_products_planned as (
-                select stock.date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+                select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.date
+                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+                    group by stock.create_date
 
                     union
 
-               select stock.date_planned, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.date_planned between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date_planned
+                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
+        group by stock.date
 
 
                 )
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b1cd4f20baf..d8bebd97fce 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -390,8 +390,8 @@
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="date"/>
-                    <field name="date_planned" string="Date"/>
+                    <field name="create_date"/>
+                    <field name="date" string="Date"/>
                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
@@ -415,8 +415,8 @@
                     <field name="picking_id"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="date" />
-                    <field name="date_planned" string="Date"/>
+                    <field name="create_date" />
+                    <field name="date" string="Date"/>
                      <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
                 </tree>
@@ -683,7 +683,7 @@
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="date_planned"/>
+                                    <field name="date"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
@@ -711,8 +711,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -868,7 +868,7 @@
                                         groups="base.group_extended"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="date_planned"/>
+                                    <field name="date"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
@@ -896,8 +896,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -1083,7 +1083,7 @@
                                         groups="base.group_extended"
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
-                                    <field name="date_planned"/>
+                                    <field name="date"/>
                                     <field name="state"/>
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
                                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
@@ -1112,8 +1112,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -1323,8 +1323,8 @@
 
                                     <group colspan="2" col="2">
                                         <separator string="Dates" colspan="2" />
-                                        <field name="date" invisible="1"/>
-                                        <field name="date_planned"/>
+                                        <field name="create_date" invisible="1"/>
+                                        <field name="date"/>
                                         <field name="date_expected"/>
                                     </group>
 
@@ -1497,10 +1497,10 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date_planned > current_date" string="Moves" editable="top">
+                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
-                    <field name="date" invisible="1"/>
+                    <field name="create_date" invisible="1"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1528,7 +1528,7 @@
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                     <field name="date_expected"/>
                     <field name="state"/>
                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
@@ -1570,8 +1570,8 @@
 
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
+                        <field name="create_date"/>
                         <field name="date"/>
-                        <field name="date_planned"/>
                         <field name="date_expected"/>
                         <field name="priority"/>
                     </group>
@@ -1613,7 +1613,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="14" colspan="4">
-                        <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
@@ -1622,7 +1622,7 @@
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="address_id" string="Partner" context="{'contact_display':'partner'}" filter_domain="[('picking_id.address_id','ilike',self)]"/>
-                        <field name="date_planned"/>
+                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
@@ -1636,8 +1636,8 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock_effects-object-colorize" string="State" domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Creation" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Expected" name="groupby_date_planned" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Creation" name="groupby_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+                        <filter string="Expected" name="groupby_date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." colspan="4" col="8">
@@ -1699,7 +1699,7 @@
                         groups="base.group_extended"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                     <field name="state"/>
                     <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
@@ -1740,8 +1740,8 @@
 
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
+                        <field name="create_date"/>
                         <field name="date"/>
-                        <field name="date_planned"/>
                         <field name="date_expected"/>
                         <field name="priority"/>
                     </group>
@@ -1783,7 +1783,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
+                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
                         <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
@@ -1800,7 +1800,7 @@
                         <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}" />
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 442cc8735b9..77b398a94bb 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -294,7 +294,7 @@
     invoice_state: none
     move_lines:
       - company_id: base.main_company
-        date_planned: '2010-05-11 15:18:57'
+        date: '2010-05-11 15:18:57'
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index fc49abb62a1..662772faf96 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -177,7 +177,7 @@ class stock_return_picking(osv.osv_memory):
                     new_qty, move.product_uos.id),
                 'picking_id':new_picking, 'state':'draft',
                 'location_id':new_location, 'location_dest_id':move.location_id.id,
-                'date':date_cur, 'date_planned':date_cur,})
+                'date':date_cur, 'date':date_cur,})
             move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
     
         if set_invoice_state_to_none:

From 1397b4df2141e495f8e9c169c72229a51b0d3e6a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 17:54:21 +0530
Subject: [PATCH 058/632] [IMP] point_of_sale: Rename the date_planned to date
 in stock_move

bzr revid: sbh@tinyerp.com-20100921122421-8q36feddjkzrxwwf
---
 addons/point_of_sale/wizard/pos_return.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index cbfe4c5365a..3620ed0f451 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -206,8 +206,7 @@ class pos_return(osv.osv_memory):
                             'product_id': line.product_id.id,
                             'location_dest_id': stock_dest_id,
                             'name': '%s (return)' %order_id.name,
-                            'date': date_cur,
-                            'date_planned': date_cur
+                            'date': date_cur
                         })
                         line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
                 order_obj.write(cr,uid, [active_id,new_order], {'state': 'done'})
@@ -288,8 +287,7 @@ class add_product(osv.osv_memory):
                                 'product_id':prod_id.id,
                                 'location_dest_id':stock_dest_id,
                                 'name':'%s (return)' %order_id.name,
-                                'date':date_cur,
-                                'date_planned':date_cur
+                                'date':date_cur
                             })
 
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
@@ -356,7 +354,6 @@ class add_product(osv.osv_memory):
                         'location_dest_id':stock_dest_id,
                         'name':'%s (return)' %order_id.name,
                         'date':date_cur,
-                        'date_planned':date_cur
                     })
                     lines_obj.write(cr,uid,[line.id], {
                                 'qty_rfd':(line.qty or 0.0) + data['return%s' %line.id],

From f3dd4e659de9e1bef9a5052e932b5a9e01a6afb5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 18:04:53 +0530
Subject: [PATCH 059/632] [IMP] sale,mrp,purchase: Rename the date_planned to
 date in stock_move

bzr revid: sbh@tinyerp.com-20100921123453-186dl4tyq1mwzo2x
---
 addons/mrp/mrp.py               | 6 +++---
 addons/mrp/report/mrp_report.py | 4 ++--
 addons/mrp/stock.py             | 2 +-
 addons/purchase/purchase.py     | 2 +-
 addons/sale/sale.py             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5ad90bf25d6..8cb3b62689d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -857,7 +857,7 @@ class mrp_production(osv.osv):
             source = production.product_id.product_tmpl_id.property_stock_production.id
             data = {
                 'name':'PROD:' + production.name,
-                'date_planned': production.date_planned,
+                'date': production.date_planned,
                 'product_id': production.product_id.id,
                 'product_qty': production.product_qty,
                 'product_uom': production.product_uom.id,
@@ -879,7 +879,7 @@ class mrp_production(osv.osv):
                 if line.product_id.type in ('product', 'consu'):
                     res_dest_id = move_obj.create(cr, uid, {
                         'name':'PROD:' + production.name,
-                        'date_planned': production.date_planned,
+                        'date': production.date_planned,
                         'product_id': line.product_id.id,
                         'product_qty': line.product_qty,
                         'product_uom': line.product_uom.id,
@@ -900,7 +900,7 @@ class mrp_production(osv.osv):
                         'product_uom': line.product_uom.id,
                         'product_uos_qty': line.product_uos and line.product_uos_qty or False,
                         'product_uos': line.product_uos and line.product_uos.id or False,
-                        'date_planned': newdate,
+                        'date': newdate,
                         'move_dest_id': res_dest_id,
                         'location_id': production.location_src_id.id,
                         'location_dest_id': routing_loc or production.location_src_id.id,
diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py
index 6ae1b2e63e5..d677184586e 100644
--- a/addons/mrp/report/mrp_report.py
+++ b/addons/mrp/report/mrp_report.py
@@ -71,7 +71,7 @@ class report_mrp_inout(osv.osv):
             create or replace view report_mrp_inout as (
                 select
                     min(sm.id) as id,
-                    to_char(sm.date_planned,'YYYY:IW') as date,
+                    to_char(sm.date,'YYYY:IW') as date,
                     sum(case when (sl.usage='internal') then
                         pt.standard_price * sm.product_qty
                     else
@@ -94,7 +94,7 @@ class report_mrp_inout(osv.osv):
                 where
                     sm.state in ('waiting','confirmed','assigned')
                 group by
-                    to_char(sm.date_planned,'YYYY:IW')
+                    to_char(sm.date,'YYYY:IW')
             )""")
 
 report_mrp_inout()
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 248e39989d8..9f149dda6bd 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -79,7 +79,7 @@ class StockMove(osv.osv):
                     proc_id = procurement_obj.create(cr, uid, {
                         'name': (move.picking_id.origin or ''),
                         'origin': (move.picking_id.origin or ''),
-                        'date_planned': move.date_planned,
+                        'date_planned': move.date,
                         'product_id': line['product_id'],
                         'product_qty': line['product_qty'],
                         'product_uom': line['product_uom'],
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 51e294200cb..29320cf28c0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -451,7 +451,7 @@ class purchase_order(osv.osv):
                         'product_uos_qty': order_line.product_qty,
                         'product_uom': order_line.product_uom.id,
                         'product_uos': order_line.product_uom.id,
-                        'date_planned': order_line.date_planned,
+                        'date': order_line.date_planned,
                         'date_expected': order_line.date_planned,
                         'location_id': loc_id,
                         'location_dest_id': dest,
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b2df12965d3..924c17d0da3 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -654,7 +654,7 @@ class sale_order(osv.osv):
                         'name': line.name[:64],
                         'picking_id': picking_id,
                         'product_id': line.product_id.id,
-                        'date_planned': date_planned,
+                        'date': date_planned,
                         'date_expected': date_planned,
                         'product_qty': line.product_uom_qty,
                         'product_uom': line.product_uom.id,

From a94078f37ffab309684f8f0c27c2d6ded5d59114 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 18:20:29 +0530
Subject: [PATCH 060/632] [IMP] mrp_repair,stock_location,stock_planning:
 Rename the date_planned to date in stock_move

bzr revid: sbh@tinyerp.com-20100921125029-2jm2exk7b66k8rvb
---
 addons/mrp_repair/mrp_repair.py            | 2 +-
 addons/mrp_repair/test/test_mrp_repair.yml | 2 +-
 addons/stock_location/mrp_pull.py          | 2 +-
 addons/stock_planning/stock_planning.py    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index ddcd2ccb501..85c26593501 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -192,7 +192,7 @@ class mrp_repair(osv.osv):
         if move_id:
             move =  self.pool.get('stock.move').browse(cr, uid, move_id)
             product = self.pool.get('product.product').browse(cr, uid, prod_id)
-            date = move.date_planned
+            date = move.date
             limit = mx.DateTime.strptime(date, '%Y-%m-%d %H:%M:%S') + RelativeDateTime(months=product.warranty)
             data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
             data['value']['location_id'] = move.location_dest_id.id
diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
index 7d38ab8a94d..3e58a837f38 100644
--- a/addons/mrp_repair/test/test_mrp_repair.yml
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -8,7 +8,7 @@
     company_id: base.main_company
     date: '2010-06-24 20:10:28'
     date_expected: '2010-06-24 20:10:55'
-    date_planned: '2010-06-24 20:10:28'
+    date: '2010-06-24 20:10:28'
     location_dest_id: stock.stock_location_stock
     location_id: stock.stock_location_stock
     name: '[PC1] Basic PC'
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index b4a68ca1b74..231a814e671 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -80,7 +80,7 @@ class procurement_order(osv.osv):
                 'picking_id': picking_id,
                 'company_id':  line.company_id and line.company_id.id or False,
                 'product_id': proc.product_id.id,
-                'date_planned': proc.date_planned,
+                'date': proc.date_planned,
                 'product_qty': proc.product_qty,
                 'product_uom': proc.product_uom.id,
                 'product_uos_qty': (proc.product_uos and proc.product_uos_qty)\
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index f6668130415..3bd9e6d6af9 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -690,7 +690,7 @@ class stock_planning(osv.osv):
                         'name': _('MPS(') + str(user.login) +') '+ obj.period_id.name,
                         'picking_id': picking_id,
                         'product_id': obj.product_id.id,
-                        'date_planned': obj.period_id.date_start,
+                        'date': obj.period_id.date_start,
                         'product_qty': uom_qty,
                         'product_uom': uom,
                         'product_uos_qty': uos_qty,

From 9b6c4820ebaec8ab0482f494ecf77014b89cef09 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 21 Sep 2010 18:44:39 +0530
Subject: [PATCH 061/632] [IMP] mrp_subproduct: Rename the date_planned to date
 in stock_move

bzr revid: sbh@tinyerp.com-20100921131439-ovr5igac3gjwg9zi
---
 addons/mrp_repair/test/test_mrp_repair.yml  | 1 -
 addons/mrp_subproduct/mrp_subproduct.py     | 2 +-
 addons/stock/wizard/stock_return_picking.py | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
index 3e58a837f38..1cf82635825 100644
--- a/addons/mrp_repair/test/test_mrp_repair.yml
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -8,7 +8,6 @@
     company_id: base.main_company
     date: '2010-06-24 20:10:28'
     date_expected: '2010-06-24 20:10:55'
-    date: '2010-06-24 20:10:28'
     location_dest_id: stock.stock_location_stock
     location_id: stock.stock_location_stock
     name: '[PC1] Basic PC'
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 0478b0d1779..5519bba3a5c 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -83,7 +83,7 @@ class mrp_production(osv.osv):
                         qty2 *= production.product_uos_qty / (production.bom_id.product_uos_qty or 1.0)
                 data = {
                     'name': 'PROD:'+production.name,
-                    'date_planned': production.date_planned,
+                    'date': production.date_planned,
                     'product_id': sub_product.product_id.id,
                     'product_qty': qty1,
                     'product_uom': sub_product.product_uom.id,
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 662772faf96..6cb7c144901 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -177,7 +177,7 @@ class stock_return_picking(osv.osv_memory):
                     new_qty, move.product_uos.id),
                 'picking_id':new_picking, 'state':'draft',
                 'location_id':new_location, 'location_dest_id':move.location_id.id,
-                'date':date_cur, 'date':date_cur,})
+                'date':date_cur,})
             move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
     
         if set_invoice_state_to_none:

From a55d740cb55847e2df34ba461bfd23506ae63bbb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 20 Sep 2010 16:20:27 +0200
Subject: [PATCH 062/632] [IMP] stock: products inventory valuation properties
 layout

bzr revid: odo@openerp.com-20100920142027-1g02p8kmsdvn9uf8
---
 addons/stock/product_view.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index c1fc739eda2..561bb9f2206 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -75,16 +75,21 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
-     		      <xpath expr="/form/notebook/page/group[@name='properties']" position="before"> 
-     				<group  groups="base.group_extended">
-	                	<separator string="Stock Input/Output Account" colspan="2"/>
-	                	 <newline/>
-	                	<field name="valuation"/>
-	                    <field name="property_stock_account_output"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-	                    <field name="property_stock_account_input"  attrs="{'readonly':[('valuation', '!=', 'real_time')]}"  domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                <xpath expr="/form/notebook/page/group[@name='properties']" position="before">
+                    <group groups="base.group_extended">
+                        <separator string="Inventory Valuation" colspan="4"/>
+                        <group colspan="2" col="2">
+                            <field name="valuation"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <field name="property_stock_account_input" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                                domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                            <field name="property_stock_account_output" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                                domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                        </group>
                     </group>
                     <newline/>
-                    </xpath>
+                </xpath>
             </field>
         </record>
 

From 8af368159be801f5ee24d8be8fdcad7025688cae Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 16:04:57 +0200
Subject: [PATCH 063/632] [IMP] addons.init: avoid spurious warnings during
 validation of -i / -u server parameters Includes revert of revision 2111.5.24
 rvo@tinyerp.co.in-20100503134414-ma87k4htpifi00tz

bzr revid: odo@openerp.com-20100921140457-cwhl843wz86nfmm8
---
 bin/addons/__init__.py | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index cc3bdc2ce7b..3e062563dd5 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -757,16 +757,19 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
 
     return has_updates
 
+def _check_module_names(cr, module_names):
+    mod_names = set(module_names)
+    if 'base' in mod_names:
+        # ignore dummy 'all' module
+        mod_names.remove('all')
+    cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
+    if cr.dictfetchone()['count'] != len(mod_names):
+        # find out what module name(s) are incorrect:
+        cr.execute("SELECT name FROM ir_module_module")
+        incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
+        logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
+
 def load_modules(db, force_demo=False, status=None, update_module=False):
-
-    def check_module_name(cr, mods, state):
-        for mod in mods:
-            id = modobj.search(cr, 1, ['&', ('state', '=', state), ('name', '=', mod)])
-            if id:
-                getattr(modobj, states[state])(cr, 1, id)
-            elif mod != 'all':
-                logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: invalid module name!' % (mod))
-
     if not status:
         status = {}
     cr = db.cursor()
@@ -795,16 +798,23 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
 
         if update_module:
             modobj = pool.get('ir.module.module')
-            states = {'installed': 'button_upgrade', 'uninstalled': 'button_install'}
             logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list')
             if ('base' in tools.config['init']) or ('base' in tools.config['update']):
                 modobj.update_list(cr, 1)
 
+            _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys()))
+
             mods = [k for k in tools.config['init'] if tools.config['init'][k]]
-            check_module_name(cr, mods, 'uninstalled')
+            if mods:
+                ids = modobj.search(cr, 1, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_install(cr, 1, ids)
 
             mods = [k for k in tools.config['update'] if tools.config['update'][k]]
-            check_module_name(cr, mods, 'installed')
+            if mods:
+                ids = modobj.search(cr, 1, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
+                if ids:
+                    modobj.button_upgrade(cr, 1, ids)
 
             cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
 

From 0b314fd3dd6da4ca55993293d350825d55bd9b86 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 16:25:25 +0200
Subject: [PATCH 064/632] [IMP] addons.init: handle properly empty update/init
 module spec

bzr revid: odo@openerp.com-20100921142525-2vjy7njophpl77bf
---
 bin/addons/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 3e062563dd5..297cf73c6f4 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -762,12 +762,13 @@ def _check_module_names(cr, module_names):
     if 'base' in mod_names:
         # ignore dummy 'all' module
         mod_names.remove('all')
-    cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
-    if cr.dictfetchone()['count'] != len(mod_names):
-        # find out what module name(s) are incorrect:
-        cr.execute("SELECT name FROM ir_module_module")
-        incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
-        logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
+    if mod_names:
+        cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
+        if cr.dictfetchone()['count'] != len(mod_names):
+            # find out what module name(s) are incorrect:
+            cr.execute("SELECT name FROM ir_module_module")
+            incorrect_names = mod_names.difference([x['name'] for x in cr.dictfetchall()])
+            logging.getLogger('init').warning('invalid module names, ignored: %s', ", ".join(incorrect_names))
 
 def load_modules(db, force_demo=False, status=None, update_module=False):
     if not status:

From bbc9eba7a0824dafb05832518a4fa3a9117b8b1f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 17:34:23 +0200
Subject: [PATCH 065/632] [IMP] netsvc.Agent: Agent.runner thread should be
 marked daemon to be terminated at server exit (harmlessly) Also set a thread
 name for the runner thread.

bzr revid: odo@openerp.com-20100921153423-053knurknw34qj1r
---
 bin/netsvc.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index d29aebd92b5..ce9b35d2a5b 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -352,7 +352,12 @@ class Agent(object):
                 time.sleep(1)
             time.sleep(60)
 
-threading.Thread(target=Agent.runner).start()
+agent_runner = threading.Thread(target=Agent.runner, name="netsvc.Agent.runner")
+# the agent runner is a typical daemon thread, that will never quit and must be
+# terminated when the main process exits - with no consequence (the processing
+# threads it spawns are not marked daemon)
+agent_runner.daemon = True
+agent_runner.start()
 
 
 import traceback

From 5fc0c4695709a2a7350b43a111186664eefcd7fe Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 21 Sep 2010 19:19:34 +0200
Subject: [PATCH 066/632] [FIX] stock.partial.picking: production lot should
 not be readonly

bzr revid: odo@openerp.com-20100921171934-i65x2tg51pqbqlrw
---
 addons/stock/wizard/stock_partial_picking.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index bbc9021d87c..2d4422986d5 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -97,7 +97,6 @@ class stock_partial_picking(osv.osv_memory):
                             'string': _('Production Lot'),
                             'type': 'many2one',
                             'relation': 'stock.production.lot',
-                            'readonly': True,
                         }
                     })
 

From 1e9167f9a9cf88cef7bcc898c49ce267764d4d3b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 11:09:37 +0530
Subject: [PATCH 067/632] [IMP] hr_* : Usability improvements

bzr revid: vir@tinyerp.com-20100922053937-5gah2r12uvewy210
---
 addons/hr/hr_department_view.xml                   |  4 ++--
 addons/hr/hr_view.xml                              |  4 ++--
 addons/hr_expense/hr_expense.py                    |  2 +-
 addons/hr_expense/hr_expense_view.xml              |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml            | 14 +++++++-------
 addons/hr_holidays/security/ir.model.access.csv    |  1 +
 addons/hr_recruitment/hr_recruitment.py            |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml      |  4 ++--
 addons/hr_timesheet/hr_timesheet_view.xml          | 11 ++++++-----
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  4 ++--
 10 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index ccbd506b7e6..d4f13458f1c 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -14,9 +14,9 @@
             <field name="arch" type="xml">
                 <form string="department">
                     <group col="6" colspan="4">
-                        <field colspan="4" name="name" select="1"/>
+                        <field name="name" select="1"/>
                         <field name="parent_id"/>
-                        <field colspan="4" name="manager_id" select="1"/>
+                        <field name="manager_id" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4" >
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e0efa92056b..83b5b266e5e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -99,7 +99,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
+                    <filter icon="terp-personal+" domain="[('active','=',True)]" string="Active" groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection">
@@ -114,7 +114,7 @@
                     <separator orientation="vertical" />
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Company" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'company_id'}"/>
+                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 6c2f44dfb8c..4003cded168 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -81,7 +81,7 @@ class hr_expense_expense(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
             ('draft', 'Draft'),
-            ('confirm', 'Waiting Approved'),
+            ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 4fc5b0412f8..79c0d5513f0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -77,7 +77,7 @@
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Expense Sheet">
+                        <page string="Description">
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
@@ -99,7 +99,7 @@
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
                                 <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>                                                                
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-ok"/>
+                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
                                 <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
                             </group>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index aaa0628bc11..b73604bba7c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -12,12 +12,13 @@
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/> 
                         <separator orientation="vertical"/>                    
-                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
-                        <filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Approve"/>
+                        <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
+                        <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
                        <filter string="This Month" icon="terp-go-month" name="This Month"
                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <field name="user_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]" />
@@ -228,14 +229,14 @@
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')">
                     <field name="employee_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
+                    <field name="holiday_status_id"/>
+                    <field name="name"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="name"/>
-                    <field name="holiday_status_id"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="type"/>
+                    <!--field name="type"/-->
                     <field name="state"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
@@ -259,7 +260,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="domain">[('type','=','remove')]</field>
-            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
         </record>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index a7022f1c1ea..c9d1d8afc6d 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -11,3 +11,4 @@
 "access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
+"access_resource_calendar_leaves_employee","resource_calendar_leaves_employee","resource.model_resource_calendar_leaves","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c98b6c485f6..b9241477409 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -437,7 +437,7 @@ class hr_applicant(crm.crm_case, osv.osv):
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
             expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp,'state': 'old'})
 
         return res
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5ecb50a828c..57141b34212 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -78,7 +78,7 @@
                         <field name="partner_name"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
                         <button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
-                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
+                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="gtk-index"/>
                     <newline/>
                     <field name="department_id" widget="selection"/>
                     <group colspan="2" col="4">
@@ -100,7 +100,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
                             <button string="Create Partner"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="terp-personal" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
+                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
                             <newline/>
                             <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
                             <field name="email_from" colspan="3"/>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index f8e8fd2ab7e..4165f71d73f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -16,8 +16,8 @@
                     <field name="date" on_change="on_change_date(date)"/>
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
                     <field name="name"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                     <field name="amount" sum="Total cost"/>
                     <field name="general_account_id"/>
@@ -77,10 +77,11 @@
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Anlytic account" icon="terp-personal+" domain="[]" context="{'group_by':'account_id'}"/>
-                        <separator orientation="vertical"/>                        
-                        <filter string="Product" icon="terp-personal" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Date" icon="terp-personal+" domain="[]" context="{'group_by':'date'}"/>                        
+                        <separator orientation="vertical"/>
+                        <filter string="Anlytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>                        
                     </group>                     
                 </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d9b666cfbf1..657ec40288d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -148,10 +148,10 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
-                        <button name="done" states="confirm" string="Approve" type="workflow" icon="gtk-jump-to"/>
+                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                     </group>
                 </form>
             </field>

From 2d2e0b25a3b43e000c4a16589aec799b7d5db979 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 22 Sep 2010 11:22:05 +0530
Subject: [PATCH 068/632] [FIX]:The records that has groupby field value =
 False or '' should also be returned to the client to show as 'Undefined'

bzr revid: nch@tinyerp.com-20100922055205-k9cu34iuzfhlvbg1
---
 bin/osv/orm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 25a987dac61..64b118f3e15 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2275,6 +2275,9 @@ class orm(orm_template):
             del r['id']
         if groupby and fget[groupby]['type'] == 'many2one':
             data_ids = self.search(cr, uid, [('id', 'in', alldata.keys())], order=groupby, context=context)
+            # the IDS of the records that has groupby field value = False or ''
+            # should be added too
+            data_ids += filter(lambda x:x not in data_ids, alldata.keys())
             data = self.read(cr, uid, data_ids, groupby and [groupby] or ['id'], context=context)
             # restore order of the search as read() uses the default _order (this is only for groups, so the size of data_read shoud be small):
             data.sort(lambda x,y: cmp(data_ids.index(x['id']), data_ids.index(y['id'])))

From 4fc298f756aa40cf83d3b1a8c47dd2dcb4de0d53 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 11:46:55 +0530
Subject: [PATCH 069/632] [IMP] hr_holidays : Improvements in view

bzr revid: vir@tinyerp.com-20100922061655-m0dvhpzlhqdv39is
---
 addons/hr_holidays/hr_holidays_view.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b73604bba7c..e6cb46ab03d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -25,6 +25,11 @@
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
+                    <newline/>
+                    <group expand="0" string="Extended options...">
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
                     <newline />
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
@@ -216,6 +221,11 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                    <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -320,7 +330,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_user_id':uid,'allocation_type':'company', 'report':True}</field>
+            <field name="context">{'allocation_type':'company', 'report':True}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 

From a640ecc89e0bc7c27795c6beb21dec0603a3f1b6 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 22 Sep 2010 11:53:31 +0530
Subject: [PATCH 070/632] [IMP]hr_holidays : Usability improvement in grops

bzr revid: amp@tinyerp.com-20100922062331-gchm37fo6oq60wgz
---
 addons/hr_holidays/hr_holidays_view.xml       | 24 +++++++++----------
 .../hr_holidays/security/ir.model.access.csv  |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index e6cb46ab03d..12d347cd876 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -90,12 +90,12 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                             </group>
                         </page>
                     </notebook>
@@ -133,12 +133,12 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2">
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
+                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                         </group>
                     </page>
                 </notebook>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index c9d1d8afc6d..0e7b122a943 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -11,4 +11,4 @@
 "access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
-"access_resource_calendar_leaves_employee","resource_calendar_leaves_employee","resource.model_resource_calendar_leaves","base.group_hr_user",1,1,1,1
+"access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1

From cec285803f60dbc6936e9033a2466184277695a0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:01:30 +0530
Subject: [PATCH 071/632] [Fix] stock: partial_picking wizard set production
 lot on the moves

bzr revid: sbh@tinyerp.com-20100922063130-p26mwhoc9s33p6db
---
 addons/stock/stock.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2aa3c3765ed..33914b5c435 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1149,6 +1149,9 @@ class stock_picking(osv.osv):
                 product_uom = partial_data.get('product_uom',False)
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
+                prodlot_id = partial_data.get('prodlot_id',False)
+                if prodlot_id:
+                  move_obj.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
                 if move.product_qty == product_qty:
                     complete.append(move)
                 elif move.product_qty > product_qty:
@@ -1458,7 +1461,7 @@ class stock_move(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True),
-        'date': fields.datetime('Date Planned', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
+        'date': fields.datetime('Date ', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 

From e32b992d2bffda023a7a6a2ca3eb28ee1d4aba29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:08:55 +0530
Subject: [PATCH 072/632] [ADD] stock: Add the production_lot field in Stock
 partial move wizard

bzr revid: sbh@tinyerp.com-20100922063855-zuj4ww3uzr69z9rl
---
 addons/stock/stock.py                     |  3 +++
 addons/stock/wizard/stock_partial_move.py | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 33914b5c435..c5784541f68 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2283,6 +2283,9 @@ class stock_move(osv.osv):
             product_uom = partial_data.get('product_uom',False)
             product_price = partial_data.get('product_price',0.0)
             product_currency = partial_data.get('product_currency',False)
+            prodlot_id = partial_data.get('prodlot_id',False)
+            if prodlot_id:
+                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                      
             if move.product_qty == product_qty:
                 complete.append(move)
             elif move.product_qty > product_qty:
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 1fee7c66d0b..a6e515cd0c4 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -47,7 +47,9 @@ class stock_partial_move(osv.osv_memory):
                 self._columns['move%s_product_qty'%(m.id)] = fields.float("Quantity")
             if 'move%s_product_uom'%(m.id) not in self._columns:
                 self._columns['move%s_product_uom'%(m.id)] = fields.many2one('product.uom',string="Product UOM")
-
+            if 'move%s_prodlot_id'%(m.id) not in self._columns:
+                self._columns['move%s_prodlot_id'%(m.id)] = fields.many2one('stock.production.lot', string="Lot")
+                
             if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                 if 'move%s_product_price'%(m.id) not in self._columns:
                     self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
@@ -89,7 +91,12 @@ class stock_partial_move(osv.osv_memory):
                         'relation': 'product.uom',
                         'required' : True,
                         'readonly' : True,
-                    }
+                    },
+                    'move%s_prodlot_id'%(m.id): {
+                            'string': _('Production Lot'),
+                            'type': 'many2one',
+                            'relation': 'stock.production.lot',
+                        }                    
                 })
 
                 _moves_arch_lst += """
@@ -97,7 +104,8 @@ class stock_partial_move(osv.osv_memory):
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
-                """%(m.id, m.id, m.id)
+                    <field name="move%s_prodlot_id" />                    
+                """%(m.id, m.id, m.id,m.id)
                 if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
@@ -162,6 +170,8 @@ class stock_partial_move(osv.osv_memory):
                 res['move%s_product_qty'%(m.id)] = m.product_qty
             if 'move%s_product_uom'%(m.id) in fields:
                 res['move%s_product_uom'%(m.id)] = m.product_uom.id
+            if 'move%s_prodlot_id'%(m.id) in fields:
+                    res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id                
             if  m.product_id.cost_method == 'average' :
                 price = m.product_id.standard_price
                 currency = False
@@ -193,7 +203,8 @@ class stock_partial_move(osv.osv_memory):
             partial_datas['move%s'%(m.id)] = {
                 'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
                 'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
-                'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
+                'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id,
+                'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id                
             }
 
             if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):

From c4712a8dd49e3a64349d07bef15cecfe409fb764 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:15:27 +0530
Subject: [PATCH 073/632] [IMP]stock :production lot info should be hidden if
 user does not have extended view

bzr revid: sbh@tinyerp.com-20100922064527-3ddi9ul6gcngodsa
---
 addons/stock/wizard/stock_partial_move.py    | 2 +-
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index a6e515cd0c4..dafb50cefe1 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -104,7 +104,7 @@ class stock_partial_move(osv.osv_memory):
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
-                    <field name="move%s_prodlot_id" />                    
+                    <field name="move%s_prodlot_id" groups="base.group_extended" />                    
                 """%(m.id, m.id, m.id,m.id)
                 if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 2d4422986d5..3bfe075eb0b 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -105,7 +105,7 @@ class stock_partial_picking(osv.osv_memory):
                         <field name="move%s_product_id" nolabel="1"/>
                         <field name="move%s_product_qty" string="Qty" />
                         <field name="move%s_product_uom" nolabel="1" />
-                        <field name="move%s_prodlot_id" />
+                        <field name="move%s_prodlot_id" groups="base.group_extended" />
                     """%(m.id, m.id, m.id, m.id)
                     if (m.product_id.cost_method == 'average'):
                         _moves_fields.update({

From cf53d5cd724d4ea7f051e9ea11fee10dad402ccd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:24:59 +0530
Subject: [PATCH 074/632] [Fix] stock:  stock_move_do_partial to properly set
 the production lot

bzr revid: sbh@tinyerp.com-20100922065459-dzp65m06jiomu4rp
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c5784541f68..209492c8bb9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2284,8 +2284,6 @@ class stock_move(osv.osv):
             product_price = partial_data.get('product_price',0.0)
             product_currency = partial_data.get('product_currency',False)
             prodlot_id = partial_data.get('prodlot_id',False)
-            if prodlot_id:
-                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                      
             if move.product_qty == product_qty:
                 complete.append(move)
             elif move.product_qty > product_qty:
@@ -2354,6 +2352,8 @@ class stock_move(osv.osv):
             complete.append(move)
 
         for move in complete:
+            if prodlot_id:
+                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
             self.action_done(cr, uid, [move.id], context=context)
             if  move.picking_id.id :
                 # TOCHECK : Done picking if all moves are done

From 50e75a080e9ba5612f376b070ec2fa7776cfaead Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 12:35:07 +0530
Subject: [PATCH 075/632] [IMP] hr_evaluation : Usability Improvements

bzr revid: vir@tinyerp.com-20100922070507-w2j7bjl80s4gz6fx
---
 addons/hr_evaluation/hr_evaluation.py       |  4 ++--
 addons/hr_evaluation/hr_evaluation_view.xml | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index a3db4b08f93..263b34322b9 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -161,13 +161,13 @@ class hr_evaluation(osv.osv):
             ('2','Meet expectations'),
             ('3','Exceeds expectations'),
             ('4','Significantly exceeds expectations'),
-        ], "Overall Rating", help="This is the overall rating on that summarize the evaluation"),
+        ], "Appreciation", help="This is the appreciation on that summarize the evaluation"),
         'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
             ('draft','Draft'),
             ('wait','Plan In Progress'),
-            ('progress','Waiting Validation'),
+            ('progress','Waiting Appreciation'),
             ('done','Done'),
             ('cancel','Cancelled'),
         ], 'State', required=True, readonly=True),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cafffe2646e..9ec02b4ad0b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -231,14 +231,12 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','in',('wait', 'progress'))]"/>                                       
-                    <separator orientation="vertical"/> 
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-dialog-close" string="Waiting Final Validation" domain="[('state','=','progress')]"/>                                        
-                    <filter icon="terp-check" string="In progress" domain="[('state','=','wait')]"/>
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>                                       
+                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
+                    <separator orientation="vertical"/> 
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed Deadline"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
@@ -321,7 +319,7 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                        <filter icon="terp-document-new" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
@@ -332,7 +330,7 @@
                     <group expand="0" string="Group By...">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Survey" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'survey_id'}"/>
+                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>

From d672ae367f522aaa216aee2ee41d022ec54065f3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 12:49:38 +0530
Subject: [PATCH 076/632] [Fix] stock:Partial picking wizard  set
 production_lot set only on moves that are Done

bzr revid: sbh@tinyerp.com-20100922071938-il1ap830qp62sx7e
---
 addons/stock/stock.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 209492c8bb9..5c1343c8d5e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1150,8 +1150,6 @@ class stock_picking(osv.osv):
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
                 prodlot_id = partial_data.get('prodlot_id',False)
-                if prodlot_id:
-                  move_obj.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
                 if move.product_qty == product_qty:
                     complete.append(move)
                 elif move.product_qty > product_qty:
@@ -1978,6 +1976,9 @@ class stock_move(osv.osv):
         product_uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         product_obj = self.pool.get('product.product')
+        partial_obj=self.pool.get('stock.partial.picking')
+        partial_id=partial_obj.search(cr,uid,[])
+        partial_datas=partial_obj.read(cr,uid,partial_id)[0]
         if context is None:
             context = {}
         for move in self.browse(cr, uid, ids):
@@ -1996,8 +1997,10 @@ class stock_move(osv.osv):
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
-
-        self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+            prodlot_id = partial_datas.get('move%s_prodlot_id'%(move.id), False)
+            if prodlot_id:
+                self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id})
+            self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)

From bbd126478ca0c1bcc01fe9ddc8adb884af5fb4f5 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 16:32:14 +0530
Subject: [PATCH 077/632] [IMP] hr_recruitment : Improvement in Recruitment
 analysis report

bzr revid: vir@tinyerp.com-20100922110214-8krfx2lbhzh8ffl0
---
 .../report/hr_recruitment_report.py           |  4 +-
 .../report/hr_recruitment_report_view.xml     | 81 ++++++++++---------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 4e2b160f3ea..2a2ab8fce2b 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -69,10 +69,11 @@ class hr_recruitment_report(osv.osv):
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('object_id.model', '=', 'hr.applicant')]"),
+        'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed"),
+        'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg"),
         'salary_exp' : fields.float("Salary Expected"),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
@@ -107,6 +108,7 @@ class hr_recruitment_report(osv.osv):
                      s.priority,
                      s.stage_id,
                      sum(salary_proposed) as salary_prop,
+                     (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
                      extract('epoch' from (s.date_open-s.create_date))/(3600*24) as  delay_open,
                      extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index edb00d1f727..d527120c801 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -21,11 +21,12 @@
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="nbr" sum="# Cases"/>
-                <field name="salary_prop" sum="Salary Proposed" />
-                <field name="salary_exp" sum="Salary Expected"/>
-                <field name="delay_open" avg='Avg Opening Delay'/>
-                <field name="delay_close" avg='Avg Closing Delay'/>
                 <field name="available" sum="Available"/>
+                <field name="salary_exp" sum="Expected Salary"/>
+                <field name="salary_prop" sum="Proposed Salary" />
+                <field name="salary_prop_avg" sum="Avg Proposed Salary" />
+                <field name="delay_open" avg='Avg Delay to Open'/>
+                <field name="delay_close" avg='Avg Delay to Close'/>
             </tree>
         </field>
     </record>
@@ -49,18 +50,18 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
             	<group>
-            	    <filter icon="terp-go-year" string="365 Days"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment performed in last 356 days"/>
-	                <filter icon="terp-go-month" string="30 Days"
+            	    <filter icon="terp-go-year" string="Year"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+	                    help="Recruitment performed in current year"/>
+	                <filter icon="terp-go-month" string="Month"
 	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment performed in this month"/>
-		            <filter icon="terp-go-week"
-	                    string="    7 Days    "
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+	                    help="Recruitment performed in current month"/>
+		            <filter icon="terp-go-month"
+	                    string="    Month-1    "
 	                    separator="1"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Recruitment during last 7 days"/>
+	                    domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+	                    help="Recruitment during last month"/>
 	                <separator orientation="vertical"/>
 	                <filter string="New"
                     	icon="terp-document-new"
@@ -74,50 +75,52 @@
                    		icon="terp-gtk-media-pause"
                    		domain="[('state','=','pending')]"
                    		help = "Pending recruitment"/>
+                    <filter string="Hired"
+                   		icon="terp-camera_test"
+                   		domain="[('state','=','done')]"
+                   		help = "Hired employees"/>
   					<separator orientation="vertical"/>
   					<field name="job_id"/>
 					<field name="department_id" widget="selection"/>
-                    <field name="user_id">
-                        <filter icon="terp-hr"
+                    <field name="user_id" string="Responsible">
+                        <filter icon="terp-personal"
                             string="My Recruitment"
                             help="My Recruitment"
                             domain="[('user_id','=',uid)]"/>
                     </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By ...">
-                   <filter string="User" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="job_id" widget="selection"/>
+                    <field name="type_id" widget="selection"/>
+                    <field name="priority"/>
+                    <field name="stage_id" widget="selection"/>
+                    <field name="state"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_closed"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By ...">
+                   <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                    <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
+                    <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                   <separator orientation="vertical"/>
+                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
+            	   <separator orientation="vertical"/>
                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-            	   <separator orientation="vertical"/>
             	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
             	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
                 </group>
 
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="state"/>
-                    <separator orientation="vertical"/>
-                    <field name="date"/>
-                    <separator orientation="vertical"/>
-                    <field name="stage_id" widget="selection"/>
-                    <field name="type_id" widget="selection"/>
-                    <newline/>
-                    <field name="priority"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_closed"/>
-                    <separator orientation="vertical"/>
-                  	<field name="job_id" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
+                
                 </search>
         </field>
     </record>
@@ -127,7 +130,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager"/>

From c7fedc09fdeac8142731e88e3f9ded518b441886 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:32:56 +0200
Subject: [PATCH 078/632] [IMP] openerp-server.py: cleanup + double CTRL-C can
 now be used to force immediate shutdown of server

bzr revid: odo@openerp.com-20100922113256-z3rmztczeivddk9q
---
 bin/openerp-server.py | 94 +++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 39 deletions(-)

diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index f03c64d3400..9061b0ae3c8 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -16,7 +16,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,16 +27,19 @@ OpenERP is an ERP+CRM program for small and medium businesses.
 The whole source code is distributed under the terms of the
 GNU Public Licence.
 
-(c) 2003-TODAY, Fabien Pinckaers - Tiny sprl
+(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
 """
 
 #----------------------------------------------------------
 # python imports
 #----------------------------------------------------------
-import sys
+import logging
 import os
-import signal
 import pwd
+import signal
+import sys
+import threading
+import traceback
 
 import release
 __author__ = release.author
@@ -52,23 +55,22 @@ if pwd.getpwuid(os.getuid())[0] == 'root' :
 # get logger
 #----------------------------------------------------------
 import netsvc
-logger = netsvc.Logger()
+logger = logging.getLogger('server')
 
 #-----------------------------------------------------------------------
 # import the tools module so that the commandline parameters are parsed
 #-----------------------------------------------------------------------
 import tools
-
-logger.notifyChannel("server", netsvc.LOG_INFO, "version - %s" % release.version )
+logger.info("OpenERP version - %s", release.version)
 for name, value in [('addons_path', tools.config['addons_path']),
                     ('database hostname', tools.config['db_host'] or 'localhost'),
                     ('database port', tools.config['db_port'] or '5432'),
                     ('database user', tools.config['db_user'])]:
-    logger.notifyChannel("server", netsvc.LOG_INFO, "%s - %s" % ( name, value ))
+    logger.info("%s - %s", name, value)
 
 # Don't allow if the connection to PostgreSQL done by postgres user
 if tools.config['db_user'] == 'postgres':
-    logger.notifyChannel("server", netsvc.LOG_ERROR, "%s" % ("Attempted to connect database with postgres user. This is a security flaws, aborting."))
+    logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.")
     sys.exit(1)
 
 import time
@@ -76,7 +78,7 @@ import time
 #----------------------------------------------------------
 # init net service
 #----------------------------------------------------------
-logger.notifyChannel("objects", netsvc.LOG_INFO, 'initialising distributed objects services')
+logger.info('initialising distributed objects services')
 
 #---------------------------------------------------------------
 # connect to the database and initialize it with base if needed
@@ -117,8 +119,7 @@ if tools.config['db_name']:
     for dbname in tools.config['db_name'].split(','):
         db,pool = pooler.get_db_and_pool(dbname, update_module=tools.config['init'] or tools.config['update'], pooljobs=False)
         if tools.config["test_file"]:
-            logger.notifyChannel("init", netsvc.LOG_INFO, 
-                 'loading test file %s' % (tools.config["test_file"],))
+            logger.info('loading test file %s', tools.config["test_file"])
             cr = db.cursor()
             tools.convert_yaml_import(cr, 'base', file(tools.config["test_file"]), {}, 'test', True)
             cr.rollback()
@@ -134,16 +135,14 @@ if tools.config["translate_out"]:
         msg = "language %s" % (tools.config["language"],)
     else:
         msg = "new language"
-    logger.notifyChannel("init", netsvc.LOG_INFO, 
-                         'writing translation file for %s to %s' % (msg, 
-                                                                    tools.config["translate_out"]))
+    logger.info('writing translation file for %s to %s', msg, tools.config["translate_out"])
 
     fileformat = os.path.splitext(tools.config["translate_out"])[-1][1:].lower()
     buf = file(tools.config["translate_out"], "w")
     tools.trans_export(tools.config["language"], tools.config["translate_modules"], buf, fileformat)
     buf.close()
 
-    logger.notifyChannel("init", netsvc.LOG_INFO, 'translation file written successfully')
+    logger.info('translation file written successfully')
     sys.exit(0)
 
 if tools.config["translate_in"]:
@@ -169,27 +168,19 @@ SIGNALS = dict(
     [(getattr(signal, sign), sign) for sign in LST_SIGNALS]
 )
 
-def handler(signum, _):
+netsvc.quit_signals_received = 0
+
+def handler(signum, frame):
     """
     :param signum: the signal number
-    :param _: 
+    :param frame: the interrupted stack frame or None
     """
-    netsvc.Agent.quit()
-    netsvc.Server.quitAll()
-    if tools.config['pidfile']:
-        os.unlink(tools.config['pidfile'])
-    logger.notifyChannel('shutdown', netsvc.LOG_INFO, 
-                         "Shutdown Server! - %s" % ( SIGNALS[signum], ))
-    logger.shutdown()
-    sys.exit(0)
+    netsvc.quit_signals_received += 1
+    if netsvc.quit_signals_received > 1:
+        sys.stderr.write("Forced shutdown.\n")
+        os._exit(0)
 
-for signum in SIGNALS:
-    signal.signal(signum, handler)
-
-
-import threading
-import traceback
-def dumpstacks(signum, _):
+def dumpstacks(signum, frame):
     # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
 
     id2name = dict([(th.ident, th.name) for th in threading.enumerate()])
@@ -201,24 +192,49 @@ def dumpstacks(signum, _):
             if line:
                 code.append("  %s" % (line.strip()))
 
-    logger.notifyChannel("dumpstacks", netsvc.LOG_INFO, "\n".join(code))
+    logging.getLogger('dumpstacks').info("\n".join(code))
+
+for signum in SIGNALS:
+    signal.signal(signum, handler)
 
 if os.name == 'posix':
     signal.signal(signal.SIGQUIT, dumpstacks)
 
+def quit():
+    netsvc.Agent.quit()
+    netsvc.Server.quitAll()
+    if tools.config['pidfile']:
+        os.unlink(tools.config['pidfile'])
+    logger = logging.getLogger('shutdown')
+    logger.info("Initiating OpenERP Server shutdown")
+    logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...")
+    logging.shutdown()
+
+    # manually join() all threads before calling sys.exit() to allow a second signal
+    # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
+    # threading.Thread.join() should not mask signals (at least in python 2.5)
+    for thread in threading.enumerate():
+        if thread != threading.currentThread() and not thread.daemon:
+            while thread.isAlive():
+                # need a busyloop here as thread.join() masks signals
+                # and would present the forced shutdown
+                thread.join(0.05)
+                time.sleep(0.05)
+    sys.exit(0)
+
 if tools.config['pidfile']:
     fd = open(tools.config['pidfile'], 'w')
     pidtext = "%d" % (os.getpid())
     fd.write(pidtext)
     fd.close()
 
-
 netsvc.Server.startAll()
 
-logger.notifyChannel("web-services", netsvc.LOG_INFO, 
-                     'the server is running, waiting for connections...')
+logger.info('OpenERP server is running, waiting for connections...')
 
-while True:
+while netsvc.quit_signals_received == 0:
     time.sleep(60)
 
+quit()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c6d238654cd923856d516212690acf83865ed499 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:45:25 +0200
Subject: [PATCH 079/632] [IMP] netsvc.Agent: spawned task threads should not
 be marked as daemon

bzr revid: odo@openerp.com-20100922114525-sxl26m5ilum0uscj
---
 bin/netsvc.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index ce9b35d2a5b..ca81372a8fe 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -348,7 +348,10 @@ class Agent(object):
                 current_thread.dbname = dbname   # hack hack
                 cls._logger.notifyChannel('timers', LOG_DEBUG, "Run %s.%s(*%r, **%r)" % (function.im_class.__name__, function.func_name, args, kwargs))
                 delattr(current_thread, 'dbname')
-                threading.Thread(target=function, args=args, kwargs=kwargs).start()
+                task_thread = threading.Thread(target=function, name='netsvc.Agent.task', args=args, kwargs=kwargs)
+                # force non-daemon task threads (the runner thread must be daemon, and this property is inherited by default)
+                task_thread.daemon = False
+                task_thread.start()
                 time.sleep(1)
             time.sleep(60)
 

From 68d0f64128b3592bf1ed8e0665f12b00529f4f8c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 13:46:31 +0200
Subject: [PATCH 080/632] [IMP] netrpc/http servers: consistently name server
 threads

bzr revid: odo@openerp.com-20100922114631-umxz97owiuvlcf0r
---
 bin/service/http_server.py   | 2 +-
 bin/service/netrpc_server.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/service/http_server.py b/bin/service/http_server.py
index 7b62dda6c05..86e5943f170 100644
--- a/bin/service/http_server.py
+++ b/bin/service/http_server.py
@@ -137,7 +137,7 @@ class BaseHttpDaemon(threading.Thread, netsvc.Server):
     _RealProto = '??'
 
     def __init__(self, interface, port, handler):
-        threading.Thread.__init__(self)
+        threading.Thread.__init__(self, name='%sDaemon-%d'%(self._RealProto, port))
         netsvc.Server.__init__(self)
         self.__port = port
         self.__interface = interface
diff --git a/bin/service/netrpc_server.py b/bin/service/netrpc_server.py
index 80cb968c8e9..9d25c98083a 100644
--- a/bin/service/netrpc_server.py
+++ b/bin/service/netrpc_server.py
@@ -102,7 +102,7 @@ class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
 
 class TinySocketServerThread(threading.Thread,netsvc.Server):
     def __init__(self, interface, port, secure=False):
-        threading.Thread.__init__(self, name="Net-RPC socket")
+        threading.Thread.__init__(self, name="NetRPCDaemon-%d"%port)
         netsvc.Server.__init__(self)
         self.__port = port
         self.__interface = interface

From 6acee33b4ea931747895c373cd0b3c352d95f372 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 11:23:49 +0200
Subject: [PATCH 081/632] [FIX] osv.fields: fromkeys second argument is only
 evaluated once

bzr revid: olt@tinyerp.com-20100922092349-ab36ynbdzqvexryb
---
 bin/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 3ab140e4088..64432ba15d7 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -777,7 +777,7 @@ class related(function):
         if not ids: return {}
         relation = obj._name
         if self._type in ('one2many', 'many2many'):
-            res = {}.fromkeys(ids, [])
+            res = dict([(i, []) for i in ids])
         else:
             res = {}.fromkeys(ids, False)
 

From 6e479c58ad9aaf73486635cc4e0302dc9854185f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 15:22:43 +0530
Subject: [PATCH 082/632] [IMP] stock: Improve the Return picking wizard take
 the move line which is done state

bzr revid: sbh@tinyerp.com-20100922095243-nslm43jyhvldbpo7
---
 addons/stock/stock.py                       |  6 ++++--
 addons/stock/wizard/stock_return_picking.py | 17 +++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5c1343c8d5e..cb9259f08cc 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1972,13 +1972,15 @@ class stock_move(osv.osv):
         @return:
         """
         track_flag = False
+        partial_datas=''
         picking_ids = []
         product_uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         product_obj = self.pool.get('product.product')
         partial_obj=self.pool.get('stock.partial.picking')
         partial_id=partial_obj.search(cr,uid,[])
-        partial_datas=partial_obj.read(cr,uid,partial_id)[0]
+        if partial_id:
+            partial_datas=partial_obj.read(cr,uid,partial_id)[0]
         if context is None:
             context = {}
         for move in self.browse(cr, uid, ids):
@@ -1997,7 +1999,7 @@ class stock_move(osv.osv):
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
-            prodlot_id = partial_datas.get('move%s_prodlot_id'%(move.id), False)
+            prodlot_id =partial_datas and  partial_datas.get('move%s_prodlot_id'%(move.id), False)
             if prodlot_id:
                 self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id})
             self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 6cb7c144901..504563c230d 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -70,10 +70,11 @@ class stock_return_picking(osv.osv_memory):
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
             for m in [line for line in pick.move_lines]:
-                if 'return%s'%(m.id) not in self._columns:
-                    self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
-                if 'invoice_state' not in self._columns:
-                    self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+                if m.state=='done':
+                    if 'return%s'%(m.id) not in self._columns:
+                        self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                    if 'invoice_state' not in self._columns:
+                        self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
                 for rec in m.move_history_ids2:
                     if rec.product_qty==m.product_qty:
                         raise osv.except_osv(_('Warning !'), _("There is no product to return!"))
@@ -97,9 +98,8 @@ class stock_return_picking(osv.osv_memory):
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
-            if pick.state != 'done':
+            if pick.state not in['done','confirmed']:
                 raise osv.except_osv(_('Warning !'), _("The Picking is not completed yet!\nYou cannot return picking which is not in 'Done' state!"))
-        
             return_history = {}
             for m_line in pick.move_lines:
                 return_history[m_line.id] = 0
@@ -109,13 +109,10 @@ class stock_return_picking(osv.osv_memory):
             arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
             for m in [line for line in pick.move_lines]:
                 quantity = m.product_qty
-                if quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
+                if m.state=='done' and quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
                     res.setdefault('returns', []).append(m.id)
-#            if not res.get('returns',False): Todo : It may be used 
-#                raise osv.except_osv(_('Warning!'),_('There is no product to return!'))
-        
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
             res['fields']['invoice_state']={'string':_('Invoice state'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To Be Invoiced')), ('none', _('None'))]}
             arch_lst.append('<group col="2" colspan="4">')

From 703708c614004150a441a39313279e64eea9fef6 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 22 Sep 2010 17:53:15 +0530
Subject: [PATCH 083/632] [IMP] hr_expense : Improvement in Expenses analysis
 report

bzr revid: vir@tinyerp.com-20100922122315-wcuibr61gafanqw6
---
 addons/hr_expense/report/hr_expense_report.py |  8 +--
 .../report/hr_expense_report_view.xml         | 66 +++++++++----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index a885dfc55a0..1de708d2beb 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -48,8 +48,8 @@ class hr_expense_report(osv.osv):
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
-        'delay_valid':fields.float('Delay Valid', readonly=True),
-        'delay_confirm':fields.float('Delay Confirm', readonly=True),
+        'delay_valid':fields.float('Delay to Valid', readonly=True),
+        'delay_confirm':fields.float('Delay to Confirm', readonly=True),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
@@ -71,7 +71,7 @@ class hr_expense_report(osv.osv):
             create or replace view hr_expense_report as (
                  select
                      min(l.id) as id,
-                     date_trunc('day',s.create_date) as date,
+                     date_trunc('day',s.date) as date,
                      s.employee_id,
                      s.journal_id,
                      s.currency_id,
@@ -100,7 +100,7 @@ class hr_expense_report(osv.osv):
                  left join hr_expense_expense s on (s.id=l.expense_id)
                  left join product_uom u on (u.id=l.uom_id)
                  group by
-                     date_trunc('day',s.create_date),
+                     date_trunc('day',s.date),
                      to_char(date_trunc('day',s.create_date), 'YYYY'),
                      to_char(date_trunc('day',s.create_date), 'MM'),
                      to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD'),
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0f3f74a1ce5..8458936cd74 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -22,9 +22,9 @@
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="invoiced" sum="Total Invoiced Lines"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
+                <field name="invoiced" sum="Total Invoiced Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay_confirm"/>
@@ -53,46 +53,29 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="  365 Days  "
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last 7 year"/>
-                  <filter icon="terp-go-month" string="   30 Days   "
+                <filter icon="terp-go-year" string="  Year  "
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                      help="Expenses during current year"/>
+                  <filter icon="terp-go-month" string="   Month   "
                       name="month"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                <filter icon="terp-go-week" string="    7 Days    " separator="1"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last 7 days"/>
+                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                      help="Expenses during current month"/>
+                <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                      domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last month"/>
                   <separator orientation="vertical"/>
-                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Expenses"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
                     <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
                       help = "Accepted Expenses"/>
                     <separator orientation="vertical"/>
+                    <filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
+                      help = "Invoiced Expenses"/>
+                    <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
-        </group>
-        <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Extended filters..." groups="base.group_extended">
+            </group>
+            <newline/>
+            <group expand="0" string="Extended filters..." groups="base.group_extended">
                 <field name="product_id"/>
                 <separator orientation="vertical"/>
                 <field name="user_id"/>
@@ -102,7 +85,24 @@
                 <field name="date"/>
                 <field name="date_confirm"/>
                 <field name="date_valid"/>
-                </group>
+            </group>
+            <newline/>
+            <group expand="1" string="Group By...">
+                <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
+                <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                <separator orientation="vertical"/>
+                <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                <separator orientation="vertical"/>
+                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
+                <separator orientation="vertical"/>
+                <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <separator orientation="vertical"/>
+                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Create Date"/>
+                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Create Date"/>
+                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Create Date"/>
+            </group>
             </search>
         </field>
     </record>

From ba4f8ad2233f5657461663e5d5a710a1f8a43f31 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 14:31:35 +0200
Subject: [PATCH 084/632] [FIX] addons: tried to remove a non existing key in
 dict

bzr revid: olt@tinyerp.com-20100922123135-qmh4hpfgr9iexs03
---
 bin/addons/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 297cf73c6f4..0c591f9ca4f 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -761,7 +761,8 @@ def _check_module_names(cr, module_names):
     mod_names = set(module_names)
     if 'base' in mod_names:
         # ignore dummy 'all' module
-        mod_names.remove('all')
+        if 'all' in mod_names:
+            mod_names.remove('all')
     if mod_names:
         cr.execute("SELECT count(id) AS count FROM ir_module_module WHERE name in %s", (tuple(mod_names),))
         if cr.dictfetchone()['count'] != len(mod_names):

From c04e93ee33508e03613afd2d183de4e0494654b9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 22 Sep 2010 18:20:36 +0530
Subject: [PATCH 085/632] [IMP] stock: Improve the Return picking wizard

bzr revid: sbh@tinyerp.com-20100922125036-4rp33dgc27n0tn4t
---
 addons/stock/wizard/stock_return_picking.py | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 504563c230d..9f34bbc5fac 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -158,25 +158,25 @@ class stock_return_picking(osv.osv_memory):
                         'move_lines':[], 'state':'draft', 'type':new_type,
                         'date':date_cur, 'invoice_state':data['invoice_state'],})
             new_location=move.location_dest_id.id
+            if move.state=='done':
+                new_qty = data['return%s' % move.id]
+                returned_qty = move.product_qty
     
-            new_qty = data['return%s' % move.id]
-            returned_qty = move.product_qty
-    
-            for rec in move.move_history_ids2:
-                returned_qty -= rec.product_qty
-    
-            if returned_qty != new_qty:
-                set_invoice_state_to_none = False
-    
-            new_move=move_obj.copy(cr, uid, move.id, {
-                'product_qty': new_qty,
-                'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
-                    new_qty, move.product_uos.id),
-                'picking_id':new_picking, 'state':'draft',
-                'location_id':new_location, 'location_dest_id':move.location_id.id,
-                'date':date_cur,})
-            move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
-    
+                for rec in move.move_history_ids2:
+                    returned_qty -= rec.product_qty
+        
+                if returned_qty != new_qty:
+                    set_invoice_state_to_none = False
+        
+                new_move=move_obj.copy(cr, uid, move.id, {
+                    'product_qty': new_qty,
+                    'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
+                        new_qty, move.product_uos.id),
+                    'picking_id':new_picking, 'state':'draft',
+                    'location_id':new_location, 'location_dest_id':move.location_id.id,
+                    'date':date_cur,})
+                move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
+        
         if set_invoice_state_to_none:
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
         if new_picking:

From 14e03b34b705b9f4b81c28ee33eb1f53f0968c64 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 22 Sep 2010 14:54:03 +0200
Subject: [PATCH 086/632] [IMP] ir.attachment: performance improvement:
 'res_name' -> 'store=True' to avoid unecessary db lookup

bzr revid: olt@tinyerp.com-20100922125403-sw7yfp9rsr7i2g93
---
 bin/addons/base/ir/ir_attachment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index abba9222d25..173632c4411 100644
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -105,8 +105,8 @@ class ir_attachment(osv.osv):
         'datas': fields.binary('Data'),
         'datas_fname': fields.char('Filename',size=256),
         'description': fields.text('Description'),
-        'res_name': fields.function(_name_get_resname, type='char', 
-                string='Resource Name', method=True),
+        'res_name': fields.function(_name_get_resname, type='char', size=128,
+                string='Resource Name', method=True, store=True),
         'res_model': fields.char('Resource Object',size=64, readonly=True,
                 help="The database object this attachment will be attached to"),
         'res_id': fields.integer('Resource ID', readonly=True,

From ce964cd20570569bbfb9da1bec5a6753f594e126 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 16:33:01 +0200
Subject: [PATCH 087/632] [IMP] stock: use more unique names in yml test to
 avoid name conflicts with other demo data

bzr revid: odo@openerp.com-20100922143301-d6dc4ueohuj4gjnx
---
 addons/stock/test/stock_test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 77b398a94bb..33d879cd7e6 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -53,7 +53,7 @@
   I create Receivable Account .
 - 
   !record {model: account.account, id: account_account_receivable0}:
-    code: '40000'
+    code: '40000-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Receivable
@@ -65,7 +65,7 @@
   I create Payable Account.
 - 
   !record {model: account.account, id: account_account_payable0}:
-    code: '440000'
+    code: '440000-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Payable
@@ -111,7 +111,7 @@
   I create Product Sale Account.
 - 
   !record {model: account.account, id: account_account_productsale0}:
-    code: '001'
+    code: '001-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Product Sale
@@ -123,7 +123,7 @@
   I create Product Purchase Account.
 - 
   !record {model: account.account, id: account_account_productpurchase0}:
-    code: '0002'
+    code: '0002-stock-test'
     company_id: base.main_company
     currency_mode: current
     name: Product Purchase
@@ -267,7 +267,7 @@
 - 
   !record {model: stock.move.split, id: stock_move_split_0}:
     line_ids:
-      - name: '00001'
+      - name: '00001-stock-test'
         quantity: 5      
     product_id: stock.product_product_hpcdwriters0
      

From 5a2baadf2e625833039d343bcbc198ddaf43bb79 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 18:52:10 +0200
Subject: [PATCH 088/632] [IMP] stock: added sums on Inventory Analysis tree
 view

bzr revid: odo@openerp.com-20100922165210-7ns713vkhuujxubh
---
 addons/stock/report/report_stock_move_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 2ee9809f86d..fe68dedd8a7 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -127,7 +127,6 @@
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 
     <!-- Inventory Control -->
-
     <record id="view_stock_inventory_tree" model="ir.ui.view">
         <field name="name">report.stock.inventory.tree</field>
         <field name="model">report.stock.inventory</field>
@@ -142,8 +141,8 @@
                 <field name="product_id" invisible="1"/>
                 <field name="prodlot_id" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="product_qty"/>
-                <field name="value"/>
+                <field name="product_qty" sum="Total quantity"/>
+                <field name="value" sum="Total value"/>
            </tree>
         </field>
     </record>
@@ -171,12 +170,12 @@
                         name="real"
                         icon="terp-dialog-close"
                         domain="[('state','=','done')]"
-                        help="Analysis on real stock."/>
+                        help="Analysis on real stock (including only moves already processed)"/>
 
                     <filter string="Future"
                         icon="terp-camera_test"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
-                        help = "Analysis including future operations."/>
+                        help = "Analysis including future operations (similar to virtual stock)"/>
 
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>

From 65dd1ccf79e4d173fd51fb14cedf0dc9e8b7f768 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 18:52:47 +0200
Subject: [PATCH 089/632] [IMP] decimal_precision: better constraint error
 message

bzr revid: odo@openerp.com-20100922165247-zmowte1j492lwfeg
---
 addons/decimal_precision/decimal_precision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index 6a0f8ffa424..9ef8b67ebbc 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -35,7 +35,7 @@ class decimal_precision(osv.osv):
     }
 
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', """The Usage of the decimal precision must be unique!"""),
+        ('name_uniq', 'unique (name)', """Only one value can be defined for each given usage!"""),
     ]
 
     @cache(skiparg=3)

From 209cac5d0d1f817eff616d3acbb10c8881da63d8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 22 Sep 2010 18:53:22 +0200
Subject: [PATCH 090/632] [IMP] product,stock: all float fields related to
 quantities and prices should use the corresponding decimal precision

bzr revid: odo@openerp.com-20100922165322-266p61d5yn0xbbzq
---
 addons/product/product.py                |  6 +++---
 addons/product/product_data.xml          |  5 ++++-
 addons/stock/product.py                  |  9 ++++----
 addons/stock/report/report_stock_move.py |  2 +-
 addons/stock/stock.py                    | 26 +++++++++++++-----------
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index eaa1df9ebf2..035ff1f0faa 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -69,15 +69,15 @@ class product_uom(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
             help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
-        'factor': fields.float('Ratio', digits=(12, 6), required=True,
+        'factor': fields.float('Ratio', digits_compute=dp.get_precision('Product UoM'), required=True,
             help='How many times this UoM is smaller than the reference UoM in this category:\n'\
                     '1 * (reference unit) = ratio * (this unit)'),
-        'factor_inv': fields.function(_factor_inv, digits=(12, 6),
+        'factor_inv': fields.function(_factor_inv, digits_compute=dp.get_precision('Product UoM'),
             fnct_inv=_factor_inv_write,
             method=True, string='Ratio',
             help='How many times this UoM is bigger than the reference UoM in this category:\n'\
                     '1 * (this unit) = ratio * (reference unit)', required=True),
-        'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True,
+        'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product UoM'), required=True,
             help="The computed quantity will be a multiple of this value. "\
                  "Use 1.0 for a UoM that cannot be further split, such as a piece."),
         'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index e7cd7623f96..962f8aca560 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -156,6 +156,9 @@ parameter) will see those record just disappear.
             <field name="name">Stock Weight</field>
             <field name="digits">2</field>
         </record>
-       
+        <record forcecreate="True" id="decimal_product_uom" model="decimal.precision">
+            <field name="name">Product UoM</field>
+            <field name="digits" eval="6"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index c6b5500c38c..bdaec60832e 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -314,10 +315,10 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available'),
-        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
-        'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'),
-        'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'),
+        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
         'track_production': fields.boolean('Track Manufacturing Lots' , help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 3e005c3a51a..f7aab3c1895 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -135,7 +135,7 @@ class report_stock_inventory(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'product_qty':fields.float('Qty', digits=(16,2), readonly=True),
+        'product_qty':fields.float('Quantity', digits=(16,2), readonly=True),
         'value' : fields.float('Total Value', digits=(16,2), required=True),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index cb9259f08cc..31752fcd7f1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -178,8 +178,8 @@ class stock_location(osv.osv):
          # temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
         'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
 
-        'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"),
-        'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock', multi="stock"),
+        'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock", digits_compute=dp.get_precision('Product UoM')),
+        'stock_virtual': fields.function(_product_qty_available, method=True, type='float', string='Virtual Stock', multi="stock", digits_compute=dp.get_precision('Product UoM')),
 
         'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
         'child_ids': fields.one2many('stock.location', 'location_id', 'Contains'),
@@ -216,8 +216,8 @@ class stock_location(osv.osv):
 
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
-        'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
-        'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
+        'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
+        'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
         'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
         'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
     }
@@ -1358,7 +1358,9 @@ class stock_production_lot(osv.osv):
         'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'date': fields.datetime('Creation Date', required=True),
-        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select="2", help="Current quantity of products with this Production Lot Number available in company warehouses"),
+        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select=True, 
+            help="Current quantity of products with this Production Lot Number available in company warehouses",
+            digits_compute=dp.get_precision('Product UoM')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
         'company_id': fields.many2one('res.company', 'Company', select=True),
         'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this production lot', readonly=True),
@@ -1463,9 +1465,9 @@ class stock_move(osv.osv):
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 
-        'product_qty': fields.float('Quantity', required=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
-        'product_uos_qty': fields.float('Quantity (UOS)'),
+        'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM')),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
 
@@ -2489,7 +2491,7 @@ class stock_inventory_line(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'product_qty': fields.float('Quantity'),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
         'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True),
         'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
         'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
@@ -2592,8 +2594,8 @@ class report_products_to_received_planned(osv.osv):
     _auto = False
     _columns = {
         'date':fields.date('Date'),
-        'qty': fields.integer('Actual Qty'),
-        'planned_qty': fields.integer('Planned Qty'),
+        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
+        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
 
     }
     def init(self, cr):
@@ -2626,8 +2628,8 @@ class report_delivery_products_planned(osv.osv):
     _auto = False
     _columns = {
         'date':fields.date('Date'),
-        'qty': fields.integer('Actual Qty'),
-        'planned_qty': fields.integer('Planned Qty'),
+        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
+        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
 
     }
 

From c3508d6f841c12903a68d5e42f023e4271ec1dea Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 11:38:29 +0530
Subject: [PATCH 091/632] [Fix] product: fix the factor digits

bzr revid: sbh@tinyerp.com-20100923060829-2c47ygg5iwyntjng
---
 addons/product/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 035ff1f0faa..0672f6f392d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -69,7 +69,7 @@ class product_uom(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
             help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
-        'factor': fields.float('Ratio', digits_compute=dp.get_precision('Product UoM'), required=True,
+        'factor': fields.float('Ratio', required=True,digits=(12, 6),
             help='How many times this UoM is smaller than the reference UoM in this category:\n'\
                     '1 * (reference unit) = ratio * (this unit)'),
         'factor_inv': fields.function(_factor_inv, digits_compute=dp.get_precision('Product UoM'),

From 71bc1eaa196cef336a58f595133662bebe18f8b2 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 12:07:18 +0530
Subject: [PATCH 092/632] [IMP] stock: float used use the correct decimal
 precision

bzr revid: sbh@tinyerp.com-20100923063718-s8dj60xcaplwwmry
---
 addons/stock/report/report_stock_move.py           | 11 ++++++-----
 addons/stock/report/report_stock_picking.py        |  5 +++--
 addons/stock/wizard/stock_change_standard_price.py |  3 ++-
 addons/stock/wizard/stock_splitinto.py             |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index f7aab3c1895..80ed559cb05 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -21,6 +21,7 @@
 
 import tools
 from osv import fields,osv
+import decimal_precision as dp
 
 
 class report_stock_move(osv.osv):
@@ -45,9 +46,9 @@ class report_stock_move(osv.osv):
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
-        'day_diff2':fields.float('Delay (Days)',readonly=True, digits=(16,2), group_operator="avg"),
-        'day_diff1':fields.float('Planned (Days)',readonly=True, digits=(16,2), group_operator="avg"),
-        'day_diff':fields.float('Real (Days)',readonly=True, digits=(16,2), group_operator="avg"),
+        'day_diff2':fields.float('Delay (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
+        'day_diff1':fields.float('Planned (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
+        'day_diff':fields.float('Real (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
     }
 
     def init(self, cr):
@@ -135,8 +136,8 @@ class report_stock_inventory(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'product_qty':fields.float('Quantity', digits=(16,2), readonly=True),
-        'value' : fields.float('Total Value', digits=(16,2), required=True),
+        'product_qty':fields.float('Quantity',  digits_compute=dp.get_precision('Product UoM'), readonly=True),
+        'value' : fields.float('Total Value',  digits_compute=dp.get_precision('Account'), required=True),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
               help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
index 81f20ed8906..82232c49f14 100644
--- a/addons/stock/report/report_stock_picking.py
+++ b/addons/stock/report/report_stock_picking.py
@@ -20,6 +20,7 @@
 ##############################################################################
 from osv import fields,osv
 import tools
+import decimal_precision as dp
 
 class report_stock_picking(osv.osv):
     _name = "report.stock.picking"
@@ -37,8 +38,8 @@ class report_stock_picking(osv.osv):
         'product_uos_qty': fields.float('# of Products', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'date': fields.date('Date', readonly=True),
-        'avg_days_late': fields.float('Avg Due Days', digits=(16,2), readonly=True, group_operator="avg"),
-        'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits=(16,2), readonly=True, group_operator="avg",
+        'avg_days_late': fields.float('Avg Due Days',  digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg"),
+        'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg",
                                        help="Number of  Avg Days to deliver"),
         'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
         'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 47fb5387f26..ecbaef57a36 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -21,12 +21,13 @@
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class change_standard_price(osv.osv_memory):
     _name = "stock.change.standard.price"
     _description = "Change Standard Price"
     _columns = {
-        'new_price': fields.float('Price', required=True,
+        'new_price': fields.float('Price', required=True, digits_compute=dp.get_precision('Account'),
                                   help="If cost price is increased, stock variation account will be debited "
                                         "and stock output account will be credited with the value = (difference of amount * quantity available).\n"
                                         "If cost price is decreased, stock variation account will be creadited and stock input account will be debited."),
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 20b1940e1c7..a54e6a485c2 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -21,13 +21,13 @@
 
 from osv import fields, osv
 from tools.translate import _
-
+import decimal_precision as dp
 
 class stock_split_into(osv.osv_memory):
     _name = "stock.split.into"
     _description = "Split into"
     _columns = {
-        'quantity': fields.float('Quantity', digits=(16,2)),
+        'quantity': fields.float('Quantity',digits_compute=dp.get_precision('Product UOM')),
     }
     _defaults = {
         'quantity': lambda *x: 0,

From ed99a00b562e40a13df0d5bb675f492feaa3e8ad Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 12:40:44 +0530
Subject: [PATCH 093/632] [IMP] stock:set  decimal precision on postgres report

bzr revid: sbh@tinyerp.com-20100923071044-qdi1a5xafb74bh69
---
 addons/stock/report/report_stock_move.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 80ed559cb05..1651607a922 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -153,8 +153,8 @@ create or replace view report_stock_inventory as (
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(-m.product_qty*u.factor)::decimal(16,2) as product_qty,
-        sum(-pt.standard_price * m.product_qty * u.factor)::decimal(16,2) as value
+        sum(-m.product_qty*u.factor)::decimal as product_qty,
+        sum(-pt.standard_price * m.product_qty * u.factor)::decimal as value
     from
         stock_move m
             left join stock_picking p on (m.picking_id=p.id)
@@ -172,8 +172,8 @@ create or replace view report_stock_inventory as (
         m.product_id as product_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(m.product_qty*u.factor)::decimal(16,2) as product_qty,
-        sum(pt.standard_price * m.product_qty * u.factor)::decimal(16,2) as value
+        sum(m.product_qty*u.factor)::decimal as product_qty,
+        sum(pt.standard_price * m.product_qty * u.factor)::decimal as value
     from
         stock_move m
             left join stock_picking p on (m.picking_id=p.id)

From 73db799e6aff940df1f2052d912583a917e8a3fa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 12:52:17 +0530
Subject: [PATCH 094/632] [IMP] stock:Improve the tooltips of Inventory
 Analysis report

bzr revid: sbh@tinyerp.com-20100923072217-t2ekkabm2u8lm4jm
---
 addons/stock/report/report_stock_move_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index fe68dedd8a7..57eb5edee8e 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -170,12 +170,12 @@
                         name="real"
                         icon="terp-dialog-close"
                         domain="[('state','=','done')]"
-                        help="Analysis on real stock (including only moves already processed)"/>
+                        help="Analysis of current inventory (only moves that have already been processed)"/>
 
                     <filter string="Future"
                         icon="terp-camera_test"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
-                        help = "Analysis including future operations (similar to virtual stock)"/>
+                        help = "Analysis including future moves (similar to virtual stock)"/>
 
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>

From ce4b6eb27c35121698c235e26758fae5f5a017ad Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 14:25:35 +0530
Subject: [PATCH 095/632] [IMP] stock:  Inventory Analysis report add the
 product_uom,improve  the search view

bzr revid: sbh@tinyerp.com-20100923085535-zl6lffmrnd8g0coy
---
 addons/stock/report/report_stock_move.py       |  9 +++++----
 addons/stock/report/report_stock_move_view.xml | 14 +++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 1651607a922..b623c9c5738 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -133,6 +133,7 @@ class report_stock_inventory(osv.osv):
         'date': fields.datetime('Date', readonly=True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
+        'product_uom':fields.many2one('product.uom', 'Product UOM', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
@@ -150,7 +151,7 @@ create or replace view report_stock_inventory as (
     (select
         min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
-        m.product_id as product_id, l.usage as location_type,
+        m.product_id as product_id,  m.product_uom as product_uom,l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         sum(-m.product_qty*u.factor)::decimal as product_qty,
@@ -164,12 +165,12 @@ create or replace view report_stock_inventory as (
                 left join stock_location l on (m.location_id=l.id)
     group by
         m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
-        m.date, m.state, l.usage, m.company_id
+        m.date, m.state, l.usage, m.company_id,m.product_uom
 ) union all (
     select
         -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
-        m.product_id as product_id, l.usage as location_type,
+        m.product_id as product_id, m.product_uom as product_uom, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         sum(m.product_qty*u.factor)::decimal as product_qty,
@@ -182,7 +183,7 @@ create or replace view report_stock_inventory as (
             left join product_uom u on (m.product_uom=u.id)
                 left join stock_location l on (m.location_dest_id=l.id)
     group by
-        m.id, m.product_id, m.address_id, m.location_id, m.location_dest_id,
+        m.id, m.product_id, m.product_uom , m.address_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
 );
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 57eb5edee8e..0ee08503ea5 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -138,6 +138,7 @@
                 <field name="location_type" invisible="1"/>
                 <field name="location_id" invisible="1"/>
                 <field name="partner_id" invisible="1" context="{'contact_display':'partner'}"/>
+                <field name="product_uom" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="prodlot_id" invisible="1"/>
                 <field name="state" invisible="1"/>
@@ -168,12 +169,12 @@
                 <group col="16">
                     <filter string="Real"
                         name="real"
-                        icon="terp-dialog-close"
+                        icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
 
                     <filter string="Future"
-                        icon="terp-camera_test"
+                        icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
 
@@ -181,20 +182,21 @@
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                     <separator orientation="vertical"/>
-                    <field name="date"/>
                     <field name="product_id"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
 
                 <newline/>
-                <group expand="1" string="Group By..." >
+                <group expand="0" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_product_uom" string="Product UOM" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                     <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
                     <filter name="group_company" string="Company" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
-                    <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
@@ -202,9 +204,11 @@
                 <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="product_uom" />
                     <field name="prodlot_id"/>
                     <field name="state"/>
                     <field name="location_type"/>
+                    <field name="date"/>
                 </group>
             </search>
         </field>

From 0632dff8687168253f22b75027137a6b0c822b66 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 14:53:29 +0530
Subject: [PATCH 096/632] [IMP] stock:remove today and state filter and set
 context for full name of location in Move  Analysis report

bzr revid: sbh@tinyerp.com-20100923092329-vxdmflppf8w3fafz
---
 addons/stock/report/report_stock_move_view.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 0ee08503ea5..f068fc36302 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -59,13 +59,7 @@
                     string="This Month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Stock Moves of this month"/>
-                <filter icon="terp-go-today"
-                    string="Today"
-                    separator="1"
-                    domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                    help="Stock Moves of today"/>
                 <separator orientation="vertical"/>
-
                 <filter string="Done"
                     name="done"
                     icon="terp-dialog-close"
@@ -94,7 +88,6 @@
                     <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}"/>
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
-                    <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
@@ -122,7 +115,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
-        <field name="context">{'contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'full':'1','contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1,}</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 

From 35c6b49aa76582bf4a0ca254b2746bdae418d790 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 15:22:58 +0530
Subject: [PATCH 097/632] [ADD] stock: Add product_qty in Move  Analysis report

bzr revid: sbh@tinyerp.com-20100923095258-kxxkeu9hxm3hqdor
---
 addons/stock/report/report_stock_move.py       | 7 +++++--
 addons/stock/report/report_stock_move_view.xml | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index b623c9c5738..6fd84093bfe 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -43,6 +43,7 @@ class report_stock_move(osv.osv):
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
+        'product_qty':fields.integer('Quantity',readonly=True),        
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
@@ -69,6 +70,7 @@ class report_stock_move(osv.osv):
                         al.picking_id as picking_id,
                         al.company_id as company_id,
                         al.location_dest_id as location_dest_id,
+                        al.product_qty,
                         al.out_qty as product_qty_out,
                         al.in_qty as product_qty_in,
                         al.address_id as partner_id,
@@ -92,6 +94,7 @@ class report_stock_move(osv.osv):
                         avg(date(sm.date)-date(sm.date_expected)) as curr_day_diff2,
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
+                        sum(sm.product_qty) as product_qty ,
                         pt.standard_price * sum(sm.product_qty) as value,
                         sm.address_id as address_id,
                         sm.product_id as product_id,
@@ -110,7 +113,7 @@ class report_stock_move(osv.osv):
                     group by
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
-                        sm.product_id,pt.standard_price, sm.picking_id,
+                        sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id)
                     as al
 
@@ -118,7 +121,7 @@ class report_stock_move(osv.osv):
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
-                        al.picking_id,al.company_id,al.type
+                        al.picking_id,al.company_id,al.type,al.product_qty
                )
         """)
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index f068fc36302..a91e05ea5a9 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -25,6 +25,7 @@
                 <field name="location_dest_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="state" invisible="1"/>
+                <field name="product_qty"/>
                 <field name="product_qty_in"/>
                 <field name="product_qty_out"/>
                 <field name="value"/>

From 85f90718ab639aa6491fd6482c91cc52c96a9831 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 18:56:52 +0530
Subject: [PATCH 098/632] [IMP] stock: Add the product category and set default
 view in Moves Analysis report

bzr revid: sbh@tinyerp.com-20100923132652-5pz6omk70jwh61p5
---
 addons/stock/report/report_stock_move.py       | 12 ++++++++----
 addons/stock/report/report_stock_move_view.xml |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 6fd84093bfe..40090df1210 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -43,7 +43,8 @@ class report_stock_move(osv.osv):
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
-        'product_qty':fields.integer('Quantity',readonly=True),        
+        'product_qty':fields.integer('Quantity',readonly=True),
+        'categ_id': fields.many2one('product.category', 'Product Category', ),                
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
@@ -77,6 +78,7 @@ class report_stock_move(osv.osv):
                         al.product_id as product_id,
                         al.state as state ,
                         al.product_uom as product_uom,
+                        al.categ_id as categ_id,
                         al.type as type
                     FROM (SELECT
 
@@ -95,7 +97,8 @@ class report_stock_move(osv.osv):
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
                         sum(sm.product_qty) as product_qty ,
-                        pt.standard_price * sum(sm.product_qty) as value,
+                        (pt.standard_price *pu.factor* sum(sm.product_qty)) as value,
+                        pt.categ_id as categ_id ,
                         sm.address_id as address_id,
                         sm.product_id as product_id,
                         sm.picking_id as picking_id,
@@ -107,6 +110,7 @@ class report_stock_move(osv.osv):
                         stock_move sm
                         left join stock_picking sp on (sm.picking_id=sp.id)
                         left join product_product pp on (sm.product_id=pp.id)
+                        left join product_uom pu on (sm.product_uom=pu.id)
                         left join product_template pt on (pp.product_tmpl_id=pt.id)
                         left join stock_location sl on (sm.location_id = sl.id)
 
@@ -114,14 +118,14 @@ class report_stock_move(osv.osv):
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
-                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id)
+                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id)
                     as al
 
                     group by
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
-                        al.picking_id,al.company_id,al.type,al.product_qty
+                        al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id
                )
         """)
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a91e05ea5a9..e9972f19f5f 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -24,6 +24,7 @@
                 <field name="location_id" invisible="1"/>
                 <field name="location_dest_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
+                <field name="categ_id" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="product_qty"/>
                 <field name="product_qty_in"/>
@@ -83,6 +84,8 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter name="group_categ_id" string="Product Category" icon="terp-personal" context="{'group_by':'categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     <separator orientation="vertical"/>
@@ -100,6 +103,7 @@
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                     <field name="location_id" widget = "selection"/>
                     <field name="location_dest_id"  widget = "selection"/>
+                    <field name="categ_id"/>
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
@@ -116,7 +120,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
-        <field name="context">{'full':'1','contact_display': 'partner', 'search_default_month':1, 'search_default_group_product':1,'search_default_done':1,'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'search_default_group_categ_id':1,'group_by':[], 'group_by_no_leaf':1,}</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 

From e95c30c25f927b05d406fa34e633027170cf3b84 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 19:15:02 +0530
Subject: [PATCH 099/632] [IMP] stock: Add stock jounral and set icon and field
 in move analysis

bzr revid: sbh@tinyerp.com-20100923134502-zr473jgu0akix25i
---
 addons/stock/report/report_stock_move.py       | 11 +++++++----
 addons/stock/report/report_stock_move_view.xml | 15 +++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 40090df1210..5d16136bfe8 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -51,6 +51,7 @@ class report_stock_move(osv.osv):
         'day_diff2':fields.float('Delay (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
         'day_diff1':fields.float('Planned (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
         'day_diff':fields.float('Real (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
+        'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),        
     }
 
     def init(self, cr):
@@ -79,7 +80,8 @@ class report_stock_move(osv.osv):
                         al.state as state ,
                         al.product_uom as product_uom,
                         al.categ_id as categ_id,
-                        al.type as type
+                        al.type as type,
+                        al.stock_journal as stock_journal
                     FROM (SELECT
 
                         CASE WHEN sp.type in ('out','delivery') THEN
@@ -105,7 +107,8 @@ class report_stock_move(osv.osv):
                             sm.company_id as company_id,
                             sm.state as state,
                             sm.product_uom as product_uom,
-                            sp.type as type
+                            sp.type as type,
+                            sp.stock_journal_id as stock_journal
                     from
                         stock_move sm
                         left join stock_picking sp on (sm.picking_id=sp.id)
@@ -118,14 +121,14 @@ class report_stock_move(osv.osv):
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
-                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id)
+                        sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
                     as al
 
                     group by
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
-                        al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id
+                        al.picking_id,al.company_id,al.type,al.product_qty, al.categ_id, al.stock_journal
                )
         """)
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index e9972f19f5f..b829bccab12 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -25,6 +25,7 @@
                 <field name="location_dest_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
+                <field name="stock_journal" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="product_qty"/>
                 <field name="product_qty_in"/>
@@ -64,11 +65,11 @@
                 <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
-                    icon="terp-dialog-close"
+                    icon="terp-check"
                     domain="[('state','=','done')]"
                     help = "Completed Stock-Moves"/>
                 <filter string="Todo"
-                    icon="terp-camera_test"
+                    icon="terp-stock"
                     domain="[('state','in',('assigned','waiting','confirmed'))]"
                     help = "Future Stock-Moves"/>
 
@@ -85,11 +86,12 @@
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="group_categ_id" string="Product Category" icon="terp-personal" context="{'group_by':'categ_id'}"/>
+                    <filter name="group_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter name="group_picking" string="Packing" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Type" name="group_type" icon="terp-gtk-jump-to-rtl" context="{'group_by':'type'}"/>
+					<filter string="Stock journal" name="group_stock_journal" icon="terp-folder-orange" context="{'group_by':'stock_journal'}"/>                    
                     <filter string="Source Location" name="src_location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_id'}"/>
                     <filter string="Dest. Location" name="dest_location" icon="terp-gtk-jump-to-ltr"  context="{'group_by':'location_dest_id'}"/>
                     <separator orientation="vertical"/>
@@ -101,11 +103,12 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="location_id" widget = "selection"/>
-                    <field name="location_dest_id"  widget = "selection"/>
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
                     <field name="categ_id"/>
+                    <field name="stock_journal"/>
                     <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget = "selection"/>
                     <newline/>
                     <field name="date"/>
                 </group>

From 4ca6d1b3d946870c4785e656d8ad734a719c902b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 23 Sep 2010 19:21:43 +0530
Subject: [PATCH 100/632] [IMP] stock: sum in move Analysis report

bzr revid: sbh@tinyerp.com-20100923135143-bygzuzeprxaeh2at
---
 addons/stock/report/report_stock_move_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index b829bccab12..253833b2757 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -27,10 +27,10 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="stock_journal" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="product_qty"/>
-                <field name="product_qty_in"/>
-                <field name="product_qty_out"/>
-                <field name="value"/>
+                <field name="product_qty" sum="Total quantity"/>
+                <field name="product_qty_in" sum="Total incoming quantity" />
+                <field name="product_qty_out" sum="Total outgoing quantity"/>
+                <field name="value"  sum="Total value"/>
                 <field name="day_diff"/>
                 <field name="day_diff1"/>
                 <field name="day_diff2"/>

From a1863560b1dca132ed861241a2f45a5174f71d04 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 24 Sep 2010 13:41:53 +0530
Subject: [PATCH 101/632] [ADD] stock: Add the filter on last month in Moves
 Analysis report

bzr revid: sbh@tinyerp.com-20100924081153-eahxyf9hpsptclsb
---
 addons/stock/report/report_stock_move_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 253833b2757..4871515fbe4 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -57,6 +57,11 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
+			<filter icon="terp-go-month"
+                 string="Last Month"
+                 separator="1"
+                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 help="Last month"/>                        
                 <filter icon="terp-go-month"
                     name="month"
                     string="This Month"

From 2b835bccc61d4b91f6892f6dd1d71cbd7bb1d170 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 24 Sep 2010 16:35:56 +0530
Subject: [PATCH 102/632] [REM] stock : Remove the stock_picking report

bzr revid: sbh@tinyerp.com-20100924110556-bgnci35flqhd6t57
---
 addons/stock/__openerp__.py                   |   1 -
 addons/stock/report/__init__.py               |   1 -
 addons/stock/report/report_stock_picking.py   | 114 --------------
 .../report/report_stock_picking_view.xml      | 139 ------------------
 4 files changed, 255 deletions(-)
 delete mode 100644 addons/stock/report/report_stock_picking.py
 delete mode 100644 addons/stock/report/report_stock_picking_view.xml

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index ba9019eafb6..7a20abe2fb0 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -67,7 +67,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "product_view.xml",
         "partner_view.xml",
         "report/report_stock_move_view.xml",
-        "report/report_stock_picking_view.xml",
         "report/report_stock_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 63d02ca2717..f41665342d0 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -25,7 +25,6 @@ import ups
 import picking
 import lot_overview_all
 import report_stock
-import report_stock_picking
 import report_stock_move
 import stock_inventory_move_report
 import lot_overview
diff --git a/addons/stock/report/report_stock_picking.py b/addons/stock/report/report_stock_picking.py
deleted file mode 100644
index 82232c49f14..00000000000
--- a/addons/stock/report/report_stock_picking.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from osv import fields,osv
-import tools
-import decimal_precision as dp
-
-class report_stock_picking(osv.osv):
-    _name = "report.stock.picking"
-    _description = "Stock Picking Report"
-    _auto = False
-    _columns = {
-        'year': fields.char('Year',size=64,required=False, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'nbr': fields.integer('# of Lines', readonly=True),
-        'nbp': fields.integer('# of Picking', readonly=True),
-        'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
-        'product_qty': fields.float('# of Products', readonly=True),
-        'product_uos_qty': fields.float('# of Products', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'date': fields.date('Date', readonly=True),
-        'avg_days_late': fields.float('Avg Due Days',  digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg"),
-        'avg_days_to_deliver': fields.float('Avg Days to Deliver', digits_compute=dp.get_precision('Product UoM'), readonly=True, group_operator="avg",
-                                       help="Number of  Avg Days to deliver"),
-        'state': fields.selection([('draft', 'Draft'),('auto', 'Waiting'),('confirmed', 'Confirmed'),('assigned', 'Available'),('done', 'Done'),('cancel', 'Cancelled')], 'State'),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'invoice_state': fields.selection([
-            ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not from Picking")], "Invoice Status",readonly=True),
-        'min_date': fields.date('Expected Date',help="Expected date for Picking. Default it takes current date"),
-        'order_date': fields.date('Order Date', help="Date of Order"),
-        'date_done': fields.date('Date Done', help="Date of completion"),
-        'location_id': fields.many2one('stock.location', 'Source Location', help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', help="Location where the system will stock the finished products."),
-        'max_date': fields.date('Max.Expected Date'),
-        'product_uos': fields.many2one('product.uom', 'Product UOS'),
-        'product_uom': fields.many2one('product.uom', 'Product UOM'),
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_stock_picking')
-        cr.execute("""
-            create or replace view report_stock_picking as (
-                select
-                    min(sm.id) as id,
-                    date_trunc('day',sp.min_date) as min_date,
-                    date_trunc('day',sp.date) as order_date,
-                    date_trunc('day',sp.date_done) as date_done,
-                    date_trunc('day',sp.max_date) as max_date,
-                    to_char(sp.create_date, 'YYYY') as year,
-                    to_char(sp.create_date, 'MM') as month,
-                    to_char(sp.create_date, 'YYYY-MM-DD') as day,
-                    sp.address_id as partner_id,
-                    to_date(to_char(sp.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY') as date,
-                    count(sm.id) as nbr,
-                    count(sp.id) as nbp,
-                    sum(sm.product_qty*u.factor) as product_qty,
-                    sum(sm.product_uos_qty) as product_uos_qty,
-                    sm.product_id as product_id,
-                    sm.location_dest_id as location_dest_id,
-                    sm.location_id as location_id,
-                    sp.type,
-                    sm.product_uos,
-                    sm.product_uom,
-                    sp.invoice_state,
-                    sp.company_id as company_id,
-                    avg(extract('epoch' from (sp.date_done-sp.create_date)))/(3600*24) as  avg_days_to_deliver,
-                    avg(extract('epoch' from (sp.date_done-sp.min_date)))/(3600*24) as  avg_days_late,
-                    sp.state
-                from stock_picking as sp
-                Inner join stock_move as sm ON (sm.picking_id=sp.id)
-                Inner join product_uom u on (u.id=sm.product_uom)
-                group by sp.type,
-                         sp.create_date,
-                         sp.address_id,
-                         sm.product_id,
-                         to_char(sp.create_date, 'YYYY'),
-                         sm.location_dest_id,
-                         sm.location_id,
-                         to_char(sp.create_date, 'MM'),
-                         to_char(sp.create_date, 'YYYY-MM-DD'),
-                         sm.product_uos,
-                         sm.product_uom,
-                         date_trunc('day',sp.min_date),
-                         date_trunc('day',sp.date),
-                         date_trunc('day',sp.date_done),
-                         date_trunc('day',sp.max_date),
-                         sp.invoice_state,
-                         sp.company_id,
-                         sp.state
-
-            )""")
-report_stock_picking()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
deleted file mode 100644
index 13cdd624cf2..00000000000
--- a/addons/stock/report/report_stock_picking_view.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-	<!--
-	Stock Picking Report
-	-->
-
-        <record id="view_report_report_stock_picking_tree" model="ir.ui.view">
-            <field name="name">report.stock.picking.tree</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-               <tree string="Picking">
-               		<field name="year" invisible="1"/>
-               		<field name="month" invisible="1"/>
-               		<field name="day" invisible="1"/>
-               		<field name="date" invisible="1"/>
-					<field name="company_id" invisible="1"/>
-					<field name="partner_id" invisible="1"/>
-					<field name="product_id" invisible="1"/>
-					<field name="min_date" invisible="1"/>
-					<field name="order_date" invisible="1"/>
-					<field name="date_done" invisible="1"/>
-					<field name="max_date" invisible="1"/>
-					<field name="type" invisible="1"/>
-					<field name="invoice_state" invisible="1"/>
-					<field name="state" invisible="1"/>
-					<field name="nbr" sum="# of Lines" />
-					<field name="product_qty" sum="# of Products" />
-          <field name="avg_days_to_deliver" avg='Avg Days to Deliver'/>
-          <field name="avg_days_late" avg='Avg Due Days'/>
-				</tree>
-            </field>
-        </record>
-
-        <record id="view_report_report_stock_picking_graph" model="ir.ui.view">
-            <field name="name">report.stock.picking.graph</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Picking" type="bar">
-                    <field name="partner_id"/>
-                    <field name="nbr" operator="+"/>
-                    <field name="product_qty" operator="+"/>
-                    <field name="nbp" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-		<record id="view_report_report_stock_picking_filter" model="ir.ui.view">
-            <field name="name">report.stock.picking.select</field>
-            <field name="model">report.stock.picking</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search">
-                  <group col="16" colspan="6">
-                   		<filter icon="terp-go-year" string="  365 Days  "
-	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Picking in last 365 days"/>
-	                	<filter icon="terp-go-month" string="   30 Days   "
-	                			name="month"
-	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                			help="Picking in last 30 days"/>
-	                	<filter icon="terp-go-week"
-                                string="    7 Days    "
-                                separator="1"
-                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                                help="Picking during last 7 days"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Todo" icon="terp-gtk-go-back-rtl" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
-                        <filter string="Done" icon="terp-dialog-close" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                   </group>
-                   <newline/>
-                   <group expand="1" string="Group By...">
-                        <filter string="Partner" name="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Shipping Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Invoice Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'invoice_state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
-                    </group>
-                    <newline/>
-                	<group expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="product_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="type"/>
-	                    <field name="invoice_state"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                    <newline/>
-	                    <field name="order_date"/>
-	                    <field name="date_done"/>
-                      <field name="min_date"/>
-                      <field name="max_date"/>
-                	</group>
-
-               </search>
-            </field>
-        </record>
-        <record id="action_report_report_stock_picking" model="ir.actions.act_window">
-            <field name="name">Picking</field>
-            <field name="res_model">report.stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-            <field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
-            <field name="context">{'search_default_Partner':1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
-        </record>
-
-       	<record model="ir.actions.act_window.view" id="action_report_report_stock_picking_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_report_report_stock_picking_tree"/>
-	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
-	    </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_report_stock_picking_graph">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">graph</field>
-	        <field name="view_id" ref="view_report_report_stock_picking_graph"/>
-	        <field name="act_window_id" ref="action_report_report_stock_picking"/>
-	    </record>
-
-        <menuitem name="Picking" action="action_report_report_stock_picking" 
-                id="menu_report_report_stock_pickings_tree" parent="stock.next_id_61" sequence="5"/>
-
-  </data>
-</openerp>
-

From f7ecd09dc975186abfedee3c412e6175e35ed2e1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 24 Sep 2010 17:01:34 +0530
Subject: [PATCH 103/632] [Fix] stock: location report print the complete_name
 of location

bzr revid: sbh@tinyerp.com-20100924113134-791f76xauu0bh6yh
---
 addons/stock/report/lot_overview.py     | 3 ++-
 addons/stock/report/lot_overview_all.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index a96bdf38099..66230e2822c 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -37,7 +37,8 @@ class lot_overview(report_sxw.rml_parse):
     def process(self,location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_report(self.cr,self.uid, [location_id])
-        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
+         
+        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name']
         self.price_total = 0.0
         self.price_total += data['total_price']
         self.grand_total += data['total_price']
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index c523b9775d1..0b4edcaecf4 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.py
@@ -37,7 +37,7 @@ class lot_overview_all(report_sxw.rml_parse):
     def process(self,location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_all_report(self.cr,self.uid, [location_id])
-        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
+        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name']
         self.price_total = 0.0
         self.price_total += data['total_price']
         self.grand_total += data['total_price']

From 984163134f6909bd8c6c986acb66b45e75ff198e Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 24 Sep 2010 18:26:04 +0530
Subject: [PATCH 104/632] [IMP]: Add internal header on printscreen report.

bzr revid: rch_open_erp-20100924125604-48m4q8yz7o9pm3jl
---
 .../report/custom_default_printscreen.xsl     | 22 ++++++++++++++
 bin/addons/base/report/custom_new.xsl         |  4 +--
 .../base/report/custom_rml_printscreen.xsl    | 29 +++++++++++++++++++
 bin/report/printscreen/ps_list.py             |  7 +++++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 bin/addons/base/report/custom_default_printscreen.xsl
 create mode 100644 bin/addons/base/report/custom_rml_printscreen.xsl

diff --git a/bin/addons/base/report/custom_default_printscreen.xsl b/bin/addons/base/report/custom_default_printscreen.xsl
new file mode 100644
index 00000000000..46bcb0b843a
--- /dev/null
+++ b/bin/addons/base/report/custom_default_printscreen.xsl
@@ -0,0 +1,22 @@
+<?xml version = '1.0' encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+	<xsl:template name="first_page_graphics_corporation">
+		<!--logo-->
+		<fill color="black"/>
+        <stroke color="black"/>
+        <setFont name="DejaVu Sans" size="8"/>
+        <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//header-date"/></drawString>
+        <setFont name="DejaVu Sans Bold" size="10"/>
+        <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//company"/></drawString>
+        <setFont name="DejaVu Sans" size="8"/>
+        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
+        <stroke color="#000000"/>
+        <lines size="8">1.3cm 19.3cm 28.5cm 19.3cm</lines>
+	</xsl:template>
+
+   <xsl:template name="first_page_frames">
+			<frame id="col1" x1="2.0cm" y1="2.5cm" width="24.7cm" height="16cm"/>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/bin/addons/base/report/custom_new.xsl b/bin/addons/base/report/custom_new.xsl
index 6680314ca40..3a988a56373 100644
--- a/bin/addons/base/report/custom_new.xsl
+++ b/bin/addons/base/report/custom_new.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../base/report/custom_default.xsl"/>
-	<xsl:import href="../../base/report/custom_rml.xsl"/>
+	<xsl:import href="../../base/report/custom_default_printscreen.xsl"/>
+	<xsl:import href="../../base/report/custom_rml_printscreen.xsl"/>
 	<xsl:template match="/">
 		<xsl:call-template name="rml">
 			<xsl:with-param name="pageSize" select="report/config/PageSize"/>
diff --git a/bin/addons/base/report/custom_rml_printscreen.xsl b/bin/addons/base/report/custom_rml_printscreen.xsl
new file mode 100644
index 00000000000..38e3a207b6f
--- /dev/null
+++ b/bin/addons/base/report/custom_rml_printscreen.xsl
@@ -0,0 +1,29 @@
+<?xml version = '1.0' encoding="utf-8"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<xsl:template name="first_page_graphics_report"/>
+
+	<xsl:template name="rml">
+		<document filename="example.pdf">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Report" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
+				<pageTemplate id="first_page">
+					<pageGraphics>
+						<xsl:call-template name="first_page_graphics_corporation"/>
+					</pageGraphics>
+
+					<xsl:call-template name="first_page_frames"/>
+				</pageTemplate>
+			</template>
+
+			<stylesheet>
+			    <xsl:call-template name="stylesheet"/>
+		    </stylesheet>
+
+			<story>
+				<xsl:call-template name="story"/>
+			</story>
+
+		</document>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index a350f52aa8c..142cb41d447 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -30,12 +30,14 @@ import locale
 import time, os
 from operator import itemgetter
 from datetime import datetime
+from report import report_sxw
 
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
         self.context = {}
         self.groupby = []
+        self.cr=''
 
     def _parse_node(self, root_node):
         result = []
@@ -60,6 +62,7 @@ class report_printscreen_list(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if not context:
             context={}
+        self.cr=cr
         self.context = context
         self.groupby = context.get('group_by',[])
         self.groupby_no_leaf = context.get('group_by_no_leaf',False)
@@ -129,6 +132,10 @@ class report_printscreen_list(report_int):
         _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,))
         _append_node('report-header', title)
 
+        _append_node('company', pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr,uid,uid).company_id.name)
+        rpt_obj = pooler.get_pool(self.cr.dbname).get('res.users')
+        rml_obj=report_sxw.rml_parse(self.cr, uid, rpt_obj._name,context)
+        _append_node('header-date', str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")))
         l = []
         t = 0
         rowcount = 0;

From a6bfefbf820d647a65703069709aaee3aa090cfb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 24 Sep 2010 16:06:23 +0200
Subject: [PATCH 105/632] [IMP] stock: add shipping type "Others" for moves
 with no picking in Stock Analysis

bzr revid: odo@openerp.com-20100924140623-3ylclf95psz0lpga
---
 addons/stock/report/report_stock_move.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 5d16136bfe8..a137b8a380e 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -39,7 +39,7 @@ class report_stock_move(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'picking_id':fields.many2one('stock.picking', 'Packing', readonly=True),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
@@ -80,7 +80,7 @@ class report_stock_move(osv.osv):
                         al.state as state ,
                         al.product_uom as product_uom,
                         al.categ_id as categ_id,
-                        al.type as type,
+                        coalesce(al.type, 'other') as type,
                         al.stock_journal as stock_journal
                     FROM (SELECT
 

From 9c78dc1b91dee9e979b131f600c2b33840f98ee2 Mon Sep 17 00:00:00 2001
From: "RON (OpenERP)" <>
Date: Mon, 27 Sep 2010 12:42:29 +0530
Subject: [PATCH 106/632] [IMP]: Usability improvements on base for
 "Configuration" and "Customization" menus

bzr revid: rpa@tinyerp.com-20100927071229-0sy4e7s2j7cfv54a
---
 bin/addons/base/ir/ir.xml                     | 137 ++++++++++++------
 bin/addons/base/ir/ir_cron.py                 |   2 +-
 bin/addons/base/ir/ir_ui_view.py              |   4 +-
 bin/addons/base/ir/workflow/workflow_view.xml |  44 ++++--
 .../wizard/base_module_configuration_view.xml |   2 +-
 5 files changed, 130 insertions(+), 59 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index e76af79ea01..d6c092bd6f6 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -10,14 +10,22 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Connect Events to Actions">
+                	<group col="6" colspan="4">
                     <field name="name" required="1"/>
                     <field name="model_id" on_change="onchange_object_id(model_id)"/>
                     <field name="action_id" on_change="onchange_action_id(action_id)"/>
                     <field name="key2" required="1"/>
-                    <field name="object" readonly="1"/>
                     <field name="res_id"/>
-                    <field name="value_unpickle"/>
-                    <field name="meta_unpickle"/>
+                    <field name="object" readonly="1"/>
+					</group>
+                	<group col="2" colspan="2">
+                        <separator colspan="2" string="Value"/>
+                    	<field name="value_unpickle" nolabel="1"/>
+                    </group>
+                	<group col="2" colspan="2">
+                        <separator colspan="2" string="Metadata"/>
+	                    <field name="meta_unpickle" nolabel="1"/>
+                    </group>
                     <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </form>
@@ -47,12 +55,17 @@
                     <field name="name"/>
                     <field name="model"/>
                     <field name="key2"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
+                    </group>
                 </search>
             </field>
         </record>
 
         <record id="act_values_form_action" model="ir.actions.act_window">
-            <field name="name">Client Actions</field>
+            <field name="name">Client Events</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
@@ -76,7 +89,9 @@
 	        <field name="act_window_id" ref="act_values_form_action"/>
 	    </record>
 
-        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/>
+        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
+
+        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 
 
         <!-- Values -->
@@ -254,7 +269,7 @@
         </record>
 
         <record id="ir_sequence_type" model="ir.actions.act_window">
-            <field name="name">Sequence Types</field>
+            <field name="name">Sequence Codes</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.sequence.type</field>
             <field name="view_type">form</field>
@@ -310,7 +325,8 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
+
+
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
 
         <!--Filters form view-->
@@ -857,21 +873,25 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views">
-                    <group colspan="2" col="2">
-                        <separator string="General" colspan="2"/>
-                        <field name="name" select="1"/>
-                        <field name="type" select="1"/>
-                        <field name="model" select="1"/>
-                        <field name="priority"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Advanced" colspan="2"/>
-                        <field name="field_parent"/>
-                        <field name="inherit_id" select="1"/>
-                        <field name="xml_id" select="1"/>
-                    </group>
-                    <separator string="View architecture" colspan="4"/>
-                    <field colspan="4" nolabel="1" name="arch"/>
+		            <group colspan="4" col="6">
+		                <field name="name" select="1" colspan="6"/>
+		                <field name="type" select="1"/>
+		                <field name="model" select="1"/>
+		                <field name="priority"/>
+		            </group>
+                    <notebook colspan="4">
+                    	<page string="Architecture">
+	                    	<field colspan="4" nolabel="1" name="arch"/>
+	                	</page>
+                    	<page string="Extra Info">
+	                        <separator string="Advanced" colspan="4"/>
+	                        <newline/>
+	                        <field name="field_parent"/>
+	                        <field name="inherit_id" select="1"/>
+	                        <field name="xml_id" select="1"/>
+	                	</page>
+
+	                </notebook>
                 </form>
             </field>
         </record>
@@ -898,6 +918,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Views">
+                    <filter icon="terp-stock_zoom" string="Search"
+                        domain="[('type', '=', 'search')]" />
+                    <filter icon="gtk-indent" string="Tree"
+                        domain="[('type', '=', 'tree')]" />
+                    <filter icon="gtk-new" string="Form"
+                        domain="[('type', '=','form')]" />
+                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="type"/>
                     <field name="model"/>
@@ -905,7 +932,7 @@
                     <field name="xml_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
@@ -1208,12 +1235,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Model Description">
+                    <filter icon="terp-camera_test" string="In Memory"
+                        domain="[('osv_memory', '=', True)]" />
+                    <separator orientation="vertical" />
+                    <filter icon="terp-stock_symbol-selection"
+                        string="Custom" domain="[('state', '=', 'manual')]" />
+                    <separator orientation="vertical" />
+                    <filter icon="terp-stock_align_left_24" string="Base"
+                        domain="[('state', '=', 'base')]" />
+                    <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="model"/>
-                    <field name="osv_memory"/>
-                    <field name="state"/>
-                    <field name="access_ids"/>
-                    <field name="info"/>
+                    <newline/>
                 </search>
             </field>
         </record>
@@ -1225,12 +1258,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fields">
-                    <group colspan="4" col="4">
-                        <field name="name" select="1"/>
-                        <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
-                        <field name="field_description"/>
-                        <field name="state"/>
-                    </group>
+                	<group colspan="4" col="6">
+		                <field name="name" select="1" />
+		            	<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
+		            	<field name="field_description"/>
+		            	<field name="state"/>
+           	   		</group>
                     <notebook colspan="4">
                         <page string="Properties">
                             <group colspan="2" col="2">
@@ -1280,12 +1313,29 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
+                	<filter icon="terp-camera_test"
+                        string="Required"
+                        domain="[('required', '=', True)]"/>
+                    <separator orientation="vertical"/>
+                	<filter icon="terp-stock_align_left_24"
+                        string="Readonly"
+                        domain="[('readonly', '=', True)]"/>
+                    <separator orientation="vertical"/>
+                	<filter icon="terp-translate"
+                        string="Translate"
+                        domain="[('translate', '=', True)]"/>
+                    <newline/>
                     <field name="name"/>
                     <field name="field_description"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                    </group>
+
                 </search>
             </field>
         </record>
@@ -1328,6 +1378,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Module Data">
+                	<filter icon="terp-stock_effects-object-colorize"
+                        string="Updatable"
+                        domain="[('noupdate', '=', False)]"/>
+                    <separator orientation="vertical"/>
                     <field name="module"/>
                     <field name="name"/>
                     <field name="model"/>
@@ -1335,8 +1389,8 @@
                     <field name="noupdate"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Module" icon="terp-stage" domain="[]" context="{'group_by':'module'}"/>
-                        <filter string="Object" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                     </group>
                 </search>
             </field>
@@ -1568,7 +1622,8 @@
                         <separator string="Action to Trigger" colspan="4"/>
                         <field name="model" groups="base.group_extended"/>
                         <field name="function"/>
-                        <field colspan="4" name="args"/>
+                        <separator string="Arguments" colspan="4"/>
+                        <field colspan="4" name="args" nolabel="1"/>
                     </page>
                     </notebook>
                 </form>
@@ -1587,8 +1642,8 @@
                     <field name="active"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal-" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Next Call" icon="terp-go-month"
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Execution" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'nextcall'}" />
                     </group>
                 </search>
@@ -1888,7 +1943,7 @@
             <field name="search_view_id" ref="view_server_action_search"/>
             <field name="context">{'key':'server_action'}</field>
         </record>
-        <menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
+        <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
 
         <record model="ir.actions.act_window" id="action_model_grid_security">
             <field name="name">Access Controls Grid</field>
@@ -1944,8 +1999,8 @@
                 <search string="Search Actions">
                 	<filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
                 	<separator orientation="vertical"/>
-                    <field name="state"/>
-                    <field name="restart"/>
+                	<field name="state"/>
+					<field name="restart"/>
                 </search>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 33962c557c4..6b96333b5d5 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -52,7 +52,7 @@ class ir_cron(osv.osv, netsvc.Agent):
             ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
         'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),
         'doall' : fields.boolean('Repeat Missed'),
-        'nextcall' : fields.datetime('Next Call Date', required=True),
+        'nextcall' : fields.datetime('Next Execution Date', required=True),
         'model': fields.char('Object', size=64),
         'function': fields.char('Function', size=64),
         'args': fields.text('Arguments'),
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 62e4bd9dd6e..810bfcf108a 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -55,7 +55,7 @@ class view(osv.osv):
     _columns = {
         'name': fields.char('View Name',size=64,  required=True),
         'model': fields.char('Object', size=64, required=True),
-        'priority': fields.integer('Priority', required=True),
+        'priority': fields.integer('Sequence', required=True),
         'type': fields.selection((
             ('tree','Tree'),
             ('form','Form'),
@@ -212,7 +212,7 @@ class view_sc(osv.osv):
     _sql_constraints = [
         ('shortcut_unique', 'unique(res_id, resource, user_id)', 'Shortcut for this menu already exists!'),
     ]
-        
+
 view_sc()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 089d5ee777f..3fb98efb8f9 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -15,9 +15,11 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow">
-          <field name="name"/>
-          <field name="osv"/>
-          <field name="on_create"/>
+        	<group col="6" colspan="4" >
+          		<field name="name"/>
+          		<field name="osv"/>
+          		<field name="on_create"/>
+          	</group>
           <separator colspan="4" string="Activities"/>
           <field colspan="4" name="activities" nolabel="1"/>
         </form>
@@ -92,10 +94,12 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Activity">
-          <field name="name"/>
-          <field name="wkf_id"/>
-          <group colspan="4" col="7">
-            <field name="kind" colspan="4"/>
+        	<group col="6" colspan="4">
+            	<field name="name"/>
+            	<field name="wkf_id"/>
+            	<field name="kind"/>
+            </group>
+          <group  colspan="2">
             <field name="flow_start"/>
             <field name="flow_stop"/>
           </group>
@@ -166,11 +170,20 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Activity">
+          <filter icon="terp-camera_test" string="Flow Start"
+            domain="[('flow_start', '=',True)]" />
+          <filter icon="terp-gtk-stop" string="Flow Stop"
+            domain="[('flow_stop', '=',True)]" />
+          <separator orientation="vertical"/>
           <field name="name"/>
           <field name="wkf_id"/>
           <field name="kind"/>
           <field name="action_id"/>
           <field name="action"/>
+          <newline/>
+	          <group expand="0" string="Group By...">
+        	      <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
+    	      </group>
         </search>
       </field>
     </record>
@@ -197,13 +210,15 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Transition">
-          <field name="act_from"/>
-          <field name="act_to"/>
-          <field colspan="4" name="condition"/>
-          <field name="signal"/>
-          <field name="role_id"/>
-          <field name="trigger_model"/>
-          <field name="trigger_expr_id"/>
+        	<group col="6" colspan ="4">
+            	<field name="act_from"/>
+            	<field name="act_to"/>
+            	<field name="signal"/>
+            	<field name="condition"/>
+            	<field name="trigger_model"/>
+          	    <field name="trigger_expr_id"/>
+            	<field name="role_id"/>
+            </group>
         </form>
       </field>
     </record>
@@ -229,6 +244,7 @@
         <search string="Transition">
           <field name="act_from"/>
           <field name="act_to"/>
+          <field name="signal"/>
           <field name="condition"/>
         </search>
       </field>
diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index 559273be8a9..7f11eced7d4 100644
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -27,7 +27,7 @@
         <menuitem name="Start Configuration"
             action="action_start_configurator"
             id="menu_view_base_module_configuration" parent="next_id_11"
-            type="server" icon="STOCK_EXECUTE" sequence="2" />
+            type="server" icon="STOCK_EXECUTE" sequence="100" />
 
         <record model="ir.values" id="action_todo_config">
             <field name="model_id" ref="model_ir_actions_todo" />

From 18f5d88a8b9a20009339a2414f917650294aadb1 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 27 Sep 2010 15:10:52 +0530
Subject: [PATCH 107/632] [FIX] stock: Removed access rules for deleted object.

bzr revid: uco@tinyerp.com-20100927094052-e47uj31luw669gux
---
 addons/stock/security/ir.model.access.csv | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index a120ce0c571..285eebccde5 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -40,9 +40,6 @@
 "access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
 "access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
 "access_report_stock_inventory_system","report.stock.inventory system","model_report_stock_inventory","base.group_system",1,0,0,0
-"access_report_stock_picking_user","report.stock.picking user","model_report_stock_picking","stock.group_stock_user",1,1,1,1
-"access_report_stock_picking_manager","report.stock.picking manager","model_report_stock_picking","stock.group_stock_manager",1,1,1,1
-"access_report_stock_picking_system","report.stock.picking system","model_report_stock_picking","base.group_system",1,0,0,0
 "access_stock_warehouse_system","stock.warehouse.system","model_stock_warehouse","base.group_system",1,1,1,1
 "access_stock_location_system","stock.location.system","model_stock_location","base.group_system",1,1,1,1
 "access_stock_journal_system","stock.journal.system","model_stock_journal","base.group_system",1,1,1,1

From 83a1255311f65e4596c20f25de8ec3d65464ebf9 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 15:27:48 +0530
Subject: [PATCH 108/632] [IMP]:improved internal header and print pagecount
 without black square on the right of the page number

bzr revid: apa@tinyerp.com-20100927095748-9927u4i2y1rmmo9f
---
 bin/addons/base/res/res_company.py    | 6 +++---
 bin/report/render/rml2pdf/trml2pdf.py | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 1bc0f7372ee..2f0b567666e 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -212,8 +212,8 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1065" y="725"><pageNumber/>/  </drawRightString>
-        <drawString x="1065" y="725"><pageCount/></drawString>
+        <drawRightString x="1073" y="725"><pageNumber/>/  </drawRightString>
+        <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
     </pageGraphics>
@@ -233,7 +233,7 @@ class res_company(osv.osv):
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
         <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
-        <drawString x="19.8cm" y="28.3cm"><pageCount/></drawString>
+        <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
         </pageGraphics>
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index ca47423008b..be8cde09259 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,11 +42,12 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        self.canv.drawString(0, 0, str(self.canv._pageCount))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
+        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -261,7 +262,7 @@ class _rml_canvas(object):
             if n.tag == 'pageNumber':
                 rc += str(self.canvas.getPageNumber())
             rc += utils._process_text(self, n.tail)
-        return rc
+        return rc.replace(' ','').replace('\n','')
 
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])

From bf0124f28c9ea9bbc8866b23f7feb89b7ebf4716 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 15:39:55 +0530
Subject: [PATCH 109/632] [IMP]:improved for internal header

bzr revid: apa@tinyerp.com-20100927100955-m0nh5r0sdp8r4yvt
---
 bin/report/render/rml2pdf/trml2pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index be8cde09259..30df7b6211e 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -262,7 +262,7 @@ class _rml_canvas(object):
             if n.tag == 'pageNumber':
                 rc += str(self.canvas.getPageNumber())
             rc += utils._process_text(self, n.tail)
-        return rc.replace(' ','').replace('\n','')
+        return rc.replace('\n','')
 
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])

From 6860beac3e044ce28e3f9a43e50561de7348b68d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 16:32:15 +0530
Subject: [PATCH 110/632] [IMP]:improved header

bzr revid: apa@tinyerp.com-20100927110215-pua562rflkics8j2
---
 bin/addons/base/res/res_company.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 2f0b567666e..6d78062a0e9 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -212,7 +212,7 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1073" y="725"><pageNumber/>/  </drawRightString>
+        <drawRightString x="1073" y="725"><pageNumber/>/</drawRightString>
         <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
@@ -232,7 +232,7 @@ class res_company(osv.osv):
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
         <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
+        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/>/</drawRightString>
         <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>

From a4f08919b1bb435b3858d385c34facc181e14dc3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 16:58:25 +0530
Subject: [PATCH 111/632] [IMP]:improved internal header for pagereset

bzr revid: apa@tinyerp.com-20100927112825-t8f7vkdut97fnfcv
---
 bin/report/render/rml2pdf/trml2pdf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 30df7b6211e..c7ffc965649 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,12 +42,11 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv._pageCount))
+        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
-        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -811,7 +810,8 @@ class _rml_template(object):
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             # Reset Page Number with new story tag
-            fis.append(PageReset())
+            if self.localcontext.has_key('active_ids') and len(self.localcontext.get('active_ids')) > 1:
+                fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())

From 6dcdbe95b06384ef2ab3c49980acb5bb1a1a060b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 27 Sep 2010 17:20:13 +0530
Subject: [PATCH 112/632] [IMP]: Improvement in domain to launch config wizard
 by wizard

bzr revid: rpa@tinyerp.com-20100927115013-otj04tdu84e72tki
---
 bin/addons/base/module/wizard/base_module_configuration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_configuration.py b/bin/addons/base/module/wizard/base_module_configuration.py
index 909637c1d21..345ed9a9797 100644
--- a/bin/addons/base/module/wizard/base_module_configuration.py
+++ b/bin/addons/base/module/wizard/base_module_configuration.py
@@ -27,7 +27,7 @@ class base_module_configuration(osv.osv_memory):
     _name = "base.module.configuration"
 
     def start(self, cr, uid, ids, context=None):
-        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', ('state', '=', 'open'), ('restart', '=', 'always')])
+        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')])
         if not todo_ids:
             # When there is no wizard todo it will display message
             data_obj = self.pool.get('ir.model.data')

From 0e2eba601dfc16d4145eebb100e00d3a40ea4e3f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 18:22:23 +0530
Subject: [PATCH 113/632] [IMP]:improved internal header for pagereset

bzr revid: apa@tinyerp.com-20100927125223-jkqs7z851d4jer1x
---
 bin/report/render/rml2pdf/trml2pdf.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index c7ffc965649..f0a945eb7f5 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,11 +42,15 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        if '_pageCount' in dir(self.canv):
+            self.canv.drawString(0, 0, str(self.canv._pageCount))
+        else:
+            self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
+        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):
@@ -810,8 +814,7 @@ class _rml_template(object):
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
             # Reset Page Number with new story tag
-            if self.localcontext.has_key('active_ids') and len(self.localcontext.get('active_ids')) > 1:
-                fis.append(PageReset())
+            fis.append(PageReset())
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())

From 422b9f329252b69e26b9f18617346709bfed054f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 27 Sep 2010 18:47:41 +0530
Subject: [PATCH 114/632] [revert]:revert

bzr revid: apa@tinyerp.com-20100927131741-i62g05rrk8hv3wbq
---
 bin/report/render/rml2pdf/trml2pdf.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index f0a945eb7f5..848b0f29215 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -42,15 +42,11 @@ class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
         self.canv.setFont("Helvetica", utils.unit_get(str(8)))
-        if '_pageCount' in dir(self.canv):
-            self.canv.drawString(0, 0, str(self.canv._pageCount))
-        else:
-            self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
+        self.canv.drawString(0, 0, str(self.canv.getPageNumber()))
         self.canv.endForm()
 
 class PageReset(platypus.Flowable):
     def draw(self):
-        self.canv._pageCount = self.canv.getPageNumber()
         self.canv._pageNumber = 0
 
 class _rml_styles(object,):

From 3eac92fc4a15892bced13c48bd16d31f8e479764 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Sep 2010 16:13:44 +0200
Subject: [PATCH 115/632] [REM] web modules

bzr revid: xmo@openerp.com-20100927141344-hgzzsa4liemqnz8n
---
 bin/addons/base/__openerp__.py               |  1 -
 bin/addons/base/module/__init__.py           |  8 +--
 bin/addons/base/module/module.py             | 54 --------------------
 bin/addons/base/module/module_view.xml       |  8 ---
 bin/addons/base/module/module_web.py         | 46 -----------------
 bin/addons/base/module/module_web_view.xml   | 29 -----------
 bin/addons/base/security/ir.model.access.csv |  2 -
 7 files changed, 2 insertions(+), 146 deletions(-)
 delete mode 100644 bin/addons/base/module/module_web.py
 delete mode 100644 bin/addons/base/module/module_web_view.xml

diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 47a36987b48..86a0229358a 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -44,7 +44,6 @@
         'ir/ir.xml',
         'ir/workflow/workflow_view.xml',
         'module/module_view.xml',
-        'module/module_web_view.xml',
         'module/module_data.xml',
         'module/module_report.xml',
         'module/wizard/base_module_import_view.xml',
diff --git a/bin/addons/base/module/__init__.py b/bin/addons/base/module/__init__.py
index 93f0f0a3d1c..1b7abf2e76e 100644
--- a/bin/addons/base/module/__init__.py
+++ b/bin/addons/base/module/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,10 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import module_web
 import module
 import wizard
 import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index f4086f9edc3..7eeb3abf758 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -151,8 +151,6 @@ class module(osv.osv):
         'url': fields.char('URL', size=128, readonly=True),
         'dependencies_id': fields.one2many('ir.module.module.dependency',
             'module_id', 'Dependencies', readonly=True),
-        'web_dependencies_id': fields.one2many('ir.module.web.dependency',
-            'module_id', 'Web Dependencies', readonly=True),
         'state': fields.selection([
             ('uninstallable','Not Installable'),
             ('uninstalled','Not Installed'),
@@ -245,12 +243,6 @@ class module(osv.osv):
                     od = self.browse(cr, uid, ids2)[0]
                     mdemo = od.demo or mdemo
             
-            for web_mod in module.web_dependencies_id:
-                if web_mod.state == 'unknown':
-                    raise orm.except_orm(_('Error'), _("You try to install the module '%s' that depends on the module:'%s'.\nBut this module is not available in your system.") % (module.name, dep.name,))
-                ids2 = self.pool.get('ir.module.web').search(cr, uid, [('module','=',web_mod.name)])
-                self.pool.get('ir.module.web').button_install(cr, uid, ids2)
-                
             terp = self.get_module_info(module.name)
             try:
                 self._check_external_dependencies(terp)
@@ -373,7 +365,6 @@ class module(osv.osv):
                 id = self.create(cr, uid, dict(name=mod_name, state='uninstalled', **values))
                 res[1] += 1
             self._update_dependencies(cr, uid, id, terp.get('depends', []))
-            self._update_web_dependencies(cr, uid, id, terp.get('web_depends', []))
             self._update_category(cr, uid, id, terp.get('category', 'Uncategorized'))
 
         return res
@@ -417,18 +408,6 @@ class module(osv.osv):
         for d in depends:
             cr.execute('INSERT INTO ir_module_module_dependency (module_id, name) values (%s, %s)', (id, d))
 
-    def _update_web_dependencies(self, cr, uid, id, depends=[]):
-        web_module_pool = self.pool.get('ir.module.web')
-        res = False
-        
-        for d in depends:
-            ids = web_module_pool.search(cr, uid, [('module','=',d)])
-            if len(ids) > 0:
-                cr.execute("Select id from ir_module_web_dependency where module_id=%s and web_module_id=%s and name=%s", (id, ids[0], d))
-                res = cr.fetchone()
-                if not res:
-                    cr.execute('INSERT INTO ir_module_web_dependency (module_id, web_module_id, name) values (%s, %s, %s)', (id, ids[0], d))
-
     def _update_category(self, cr, uid, id, category='Uncategorized'):
         categs = category.split('/')
         p_id = None
@@ -493,39 +472,6 @@ class module(osv.osv):
 
 module()
 
-class web_module_dependency(osv.osv):
-    _name = "ir.module.web.dependency"
-    _description = "Web Module dependency"
-    
-    def _state(self, cr, uid, ids, name, args, context={}):
-        result = {}
-        mod_obj = self.pool.get('ir.module.web')
-        for md in self.browse(cr, uid, ids):
-            ids = mod_obj.search(cr, uid, [('module', '=', md.name)])
-            if ids:
-                result[md.id] = mod_obj.read(cr, uid, [ids[0]], ['state'])[0]['state']
-            else:
-                result[md.id] = 'unknown'
-        return result
-
-    
-    _columns = {
-        'name': fields.char('Name',  size=128, select=True),
-        'module_id': fields.many2one('ir.module.module', 'Module', select=True, ondelete='cascade'),
-        'web_module_id': fields.many2one('ir.module.web', 'Web Module', select=True, ondelete='cascade'),
-        'state': fields.function(_state, method=True, type='selection', selection=[
-            ('uninstallable','Uninstallable'),
-            ('uninstalled','Not Installed'),
-            ('installed','Installed'),
-            ('to upgrade','To be upgraded'),
-            ('to remove','To be removed'),
-            ('to install','To be installed'),
-            ('unknown', 'Unknown'),
-            ], string='State', readonly=True, select=True),
-    }
-
-web_module_dependency()
-
 class module_dependency(osv.osv):
     _name = "ir.module.module.dependency"
     _description = "Module dependency"
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index bf5164d8276..7a303b9a9ae 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -129,14 +129,6 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Web Dependencies">
-                            <field colspan="4" name="web_dependencies_id" nolabel="1">
-                                <tree string="Dependencies">
-                                    <field name="name"/>
-                                    <field name="state"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="Features" attrs="{'invisible':[('state','!=','installed')]}">
                             <separator string="Created Menus" colspan="4"/>
                             <field colspan="4" name="menus_by_module" nolabel="1"/>
diff --git a/bin/addons/base/module/module_web.py b/bin/addons/base/module/module_web.py
deleted file mode 100644
index 8f65dc3960d..00000000000
--- a/bin/addons/base/module/module_web.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from osv import fields, osv, orm
-
-class module_web(osv.osv):
-    _name = "ir.module.web"
-    _description = "Web Module"
-    
-    _columns = {
-        'name': fields.char("Name", size=128, readonly=True, required=True),
-        'module': fields.char("Module", size=128, readonly=True, required=True),
-        'description': fields.text("Description", readonly=True, translate=True),
-        'author': fields.char("Author", size=128, readonly=True),
-        'website': fields.char("Website", size=256, readonly=True),
-        'state': fields.selection([
-            ('uninstallable','Uninstallable'),
-            ('uninstalled','Not Installed'),
-            ('installed','Installed')
-            ], string='State', readonly=True)
-    }
-    
-    _defaults = {
-        'state': lambda *a: 'uninstalled',
-    }
-    _order = 'name'
-
-    _sql_constraints = [
-        ('name_uniq', 'unique (name)', 'The name of the module must be unique !'),
-    ]
-    
-    def update_module_list(self, cr, uid, modules, context={}):
-        
-        for module in modules:
-            mod_name = module['name']
-            ids = self.search(cr, uid, [('name','=',mod_name)])
-            if ids:
-                self.write(cr, uid, ids, module)
-            else:
-                self.create(cr, uid, module)
-                
-    def button_install(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state': 'installed'}, context)
-    
-    def button_uninstall(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state': 'uninstalled'}, context)
-                
-module_web()
-
diff --git a/bin/addons/base/module/module_web_view.xml b/bin/addons/base/module/module_web_view.xml
deleted file mode 100644
index 32e927b70e7..00000000000
--- a/bin/addons/base/module/module_web_view.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="module_web_tree" model="ir.ui.view">
-            <field name="name">ir.module.web.tree</field>
-            <field name="model">ir.module.web</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="name"/>
-                    <field name="module"/>
-                    <field name="description"/>
-                    <field name="author"/>
-                    <field name="state"/>
-                    <button name="button_install" string="Install" type="object" states="uninstalled" context="{'reload': 1}"/>
-                    <button name="button_uninstall" string="Uninstall" type="object" states="installed" context="{'reload': 1}"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="open_module_web_list" model="ir.actions.url">
-            <field name="name">web_module_list</field>
-            <field name="url">/openerp/modules</field>
-        </record>
-        <menuitem name="Web Modules" action="open_module_web_list" id="open_module_web_list_url" type="url" parent="base.menu_management"/>
-
-    </data>
-</openerp>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 97b4c2895e0..9168d93078d 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -124,6 +124,4 @@
 "access_ir_filter all","ir_filters all","model_ir_filters",,1,0,0,0
 "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
-"access_ir_module_web","ir.module.web","model_ir_module_web","group_system",1,1,1,1
-"access_ir_module_web_dependency","ir.module.web.dependency","model_ir_module_web_dependency","group_system",1,1,1,1
 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1

From 573ea5722f467031b1b018a3aa7e107c206da1ef Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 27 Sep 2010 23:35:06 +0530
Subject: [PATCH 116/632] [FIX] wizard exception replaced by osv exception

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

bzr revid: jvo@tinyerp.com-20100927180506-w5oq9ia1pjgjdyqd
---
 bin/addons/base/module/wizard/base_module_upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py
index fe85cb0422c..500622489e7 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade.py
+++ b/bin/addons/base/module/wizard/base_module_upgrade.py
@@ -95,7 +95,7 @@ class base_module_upgrade(osv.osv_memory):
                 if dep_mod.state in ('unknown','uninstalled'):
                     unmet_packages.append(dep_mod.name)
         if len(unmet_packages):
-            raise wizard.except_wizard('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
+            raise osv.except_osv('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
         mod_obj.download(cr, uid, ids, context=context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)

From 9bfc761a80605d8f6d544ed134fc60319630ca64 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 28 Sep 2010 13:09:54 +0530
Subject: [PATCH 117/632] [IMP] add separator in user preference view

bzr revid: vir@tinyerp.com-20100928073954-e009nxnz7oncfee2
---
 bin/addons/base/base_update.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 66376ed2acc..361bbfa67a0 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -82,6 +82,7 @@
                                     context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
+                            <separator string="Default Filters" colspan="4"/>
                             <newline/>
                         </page>
                          <page string="Preferences">

From c153c2d46b8a75b823a63981b5963ef1fb5adb3c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 09:52:57 +0200
Subject: [PATCH 118/632] [ADD] server-side web addons

bzr revid: xmo@openerp.com-20100928075257-06f2b3o6kvdb9f6y
---
 bin/addons/__init__.py           | 20 ++++++++---------
 bin/addons/base/base.sql         |  1 +
 bin/addons/base/module/module.py | 38 ++++++++++++++++++++++++++++++--
 bin/tools/misc.py                |  7 +++---
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 0c591f9ca4f..08cc60c19bd 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -203,14 +203,14 @@ def get_module_filetree(module, dir='.'):
 
     return tree
 
-def get_module_as_zip_from_module_directory(module_directory, b64enc=True, src=True):
-    """Compress a module directory
+def zip_directory(directory, b64enc=True, src=True):
+    """Compress a directory
 
-    @param module_directory: The module directory
+    @param directory: The directory to compress
     @param base64enc: if True the function will encode the zip file with base64
     @param src: Integrate the source files
 
-    @return: a stream to store in a file-like object
+    @return: a string containing the zip file
     """
 
     RE_exclude = re.compile('(?:^\..+\.swp$)|(?:\.py[oc]$)|(?:\.bak$)|(?:\.~.~$)', re.I)
@@ -225,16 +225,16 @@ def get_module_as_zip_from_module_directory(module_directory, b64enc=True, src=T
 
     archname = StringIO()
     archive = PyZipFile(archname, "w", ZIP_DEFLATED)
-    archive.writepy(module_directory)
-    _zippy(archive, module_directory, src=src)
+    archive.writepy(directory)
+    _zippy(archive, directory, src=src)
     archive.close()
-    val = archname.getvalue()
+    archive_data = archname.getvalue()
     archname.close()
 
     if b64enc:
-        val = base64.encodestring(val)
+        return base64.encodestring(archive_data)
 
-    return val
+    return archive_data
 
 def get_module_as_zip(modulename, b64enc=True, src=True):
     """Generate a module as zip file with the source or not and can do a base64 encoding
@@ -256,7 +256,7 @@ def get_module_as_zip(modulename, b64enc=True, src=True):
         if b64enc:
             val = base64.encodestring(val)
     else:
-        val = get_module_as_zip_from_module_directory(ap, b64enc, src)
+        val = zip_directory(ap, b64enc, src)
 
     return val
 
diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 778a64b2420..84676a7f59b 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -302,6 +302,7 @@ CREATE TABLE ir_module_module (
     certificate character varying(64),
     description text,
     demo boolean default False,
+    web boolean DEFAULT FALSE,
     primary key(id)
 );
 ALTER TABLE ir_module_module add constraint name_uniq unique (name);
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 7eeb3abf758..55a5c867264 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -173,12 +173,14 @@ class module(osv.osv):
         'reports_by_module': fields.function(_get_views, method=True, string='Reports', type='text', multi="meta", store=True),
         'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta", store=True),
         'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
+        'web': fields.boolean('Has a web component', readonly=True),
     }
 
     _defaults = {
         'state': lambda *a: 'uninstalled',
         'demo': lambda *a: False,
         'license': lambda *a: 'AGPL-3',
+        'web': False,
     }
     _order = 'name'
 
@@ -332,6 +334,7 @@ class module(osv.osv):
             'website': terp.get('website', ''),
             'license': terp.get('license', 'GPL-2'),
             'certificate': terp.get('certificate') or None,
+            'web': terp.get('web') or False,
         }
 
     # update the list of available packages
@@ -470,6 +473,39 @@ class module(osv.osv):
                     logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
                     raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
 
+    def list_web(self, cr, uid, context=False):
+        """ list_web(cr, uid, context) -> [module_name]
+        Lists all the currently installed modules with a web component.
+
+        Returns a list of addon names.
+        """
+        return [
+            module['name']
+            for module in self.browse(cr, uid,
+                self.search(cr, uid,
+                    [('web', '=', True),
+                     ('state', 'in', ['installed','to upgrade','to remove'])],
+                    context=context),
+                context=context)]
+    def get_web(self, cr, uid, names, context=False):
+        """ get_web(cr, uid, [module_name], context) -> [{name, depends, content}]
+
+        Returns the web content of all the named addons.
+
+        The toplevel directory of the zipped content is called 'web',
+        its final naming has to be managed by the client
+        """
+        modules = self.browse(cr, uid,
+            self.search(cr, uid, [('name', 'in', names)], context=context),
+                              context=context)
+        return [
+            {'name': module.name,
+             'depends': [dep.name for dep in module.dependencies_id],
+             'content': addons.zip_directory(
+                 addons.get_module_resource(module.name, 'web'))}
+            for module in modules
+        ]
+
 module()
 
 class module_dependency(osv.osv):
@@ -501,5 +537,3 @@ class module_dependency(osv.osv):
             ], string='State', readonly=True, select=True),
     }
 module_dependency()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 5a3d21bef86..b3b3d7d9baa 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -110,11 +110,12 @@ def init_db(cr):
         id = cr.fetchone()[0]
         cr.execute('insert into ir_module_module \
                 (id, author, website, name, shortdesc, description, \
-                    category_id, state, certificate) \
-                values (%s, %s, %s, %s, %s, %s, %s, %s, %s)', (
+                    category_id, state, certificate, web) \
+                values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)', (
             id, info.get('author', ''),
             info.get('website', ''), i, info.get('name', False),
-            info.get('description', ''), p_id, state, info.get('certificate') or None))
+            info.get('description', ''), p_id, state, info.get('certificate') or None,
+            info.get('web') or False))
         cr.execute('insert into ir_model_data \
             (name,model,module, res_id, noupdate) values (%s,%s,%s,%s,%s)', (
                 'module_meta_information', 'ir.module.module', i, id, True))

From 5577f2bc4ac052738be132d9368a6c22a27baf5a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 13:09:15 +0200
Subject: [PATCH 119/632] [FIX] web dependencies: only send dependencies to web
 modules

Issue: if we depend from a module which depends from a module with a web component, we're hosed. Normal?

bzr revid: xmo@openerp.com-20100928110915-0m22v3l4ittx51c1
---
 bin/addons/base/module/module.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 55a5c867264..954a1087962 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -500,7 +500,11 @@ class module(osv.osv):
                               context=context)
         return [
             {'name': module.name,
-             'depends': [dep.name for dep in module.dependencies_id],
+             'depends': [dep.name for dep in module.dependencies_id
+                         if self.search(cr, uid, [
+                             ('name', '=', dep.name),
+                             ('web', '=', True)
+                             ], context=context)],
              'content': addons.zip_directory(
                  addons.get_module_resource(module.name, 'web'))}
             for module in modules

From edd52b6a0a5e09d15a62fecefbdff6de47e819d4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 13:19:47 +0200
Subject: [PATCH 120/632] [IMP] decimal_precision: add explicit index(select)
 on precision name (even though there was already one due to the unique
 constraint)

bzr revid: odo@openerp.com-20100928111947-2ssoruldvg7vx4gu
---
 addons/decimal_precision/decimal_precision.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index d67fba67d0c..7d7dadd13de 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -27,7 +27,7 @@ import pooler
 class decimal_precision(osv.osv):
     _name = 'decimal.precision'
     _columns = {
-        'name': fields.char('Usage', size=50, required=True),
+        'name': fields.char('Usage', size=50, select=True, required=True),
         'digits': fields.integer('Digits', required=True),
     }
     _defaults = {

From 70911f1e6859e4f03d8351e60e310cc25e5794f9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 13:23:47 +0200
Subject: [PATCH 121/632] [FIX+IMP] stock: corrected moves and inventory
 analysis computation + improved views + decimal_precision for shipping delays

bzr revid: odo@openerp.com-20100928112347-6h0u53ujl0fevth8
---
 addons/stock/report/report_stock_move.py      | 102 ++++++++++--------
 .../stock/report/report_stock_move_view.xml   |   8 +-
 addons/stock/stock_data.xml                   |   8 +-
 3 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index a137b8a380e..3aad21f4f9c 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -44,23 +44,22 @@ class report_stock_move(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
         'product_qty':fields.integer('Quantity',readonly=True),
-        'categ_id': fields.many2one('product.category', 'Product Category', ),                
+        'categ_id': fields.many2one('product.category', 'Product Category', ),
         'product_qty_in':fields.integer('In Qty',readonly=True),
         'product_qty_out':fields.integer('Out Qty',readonly=True),
         'value' : fields.float('Total Value', required=True),
-        'day_diff2':fields.float('Delay (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
-        'day_diff1':fields.float('Planned (Days)',readonly=True, digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
-        'day_diff':fields.float('Real (Days)',readonly=True,  digits_compute=dp.get_precision('Product UoM'), group_operator="avg"),
-        'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),        
+        'day_diff2':fields.float('Lag (Days)',readonly=True,  digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
+        'day_diff1':fields.float('Planned Lead Time (Days)',readonly=True, digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
+        'day_diff':fields.float('Execution Lead Time (Days)',readonly=True,  digits_compute=dp.get_precision('Shipping Delay'), group_operator="avg"),
+        'stock_journal': fields.many2one('stock.journal','Stock Journal', select=True),
     }
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_move')
         cr.execute("""
-            create or replace view report_stock_move as (
-                select
+            CREATE OR REPLACE view report_stock_move AS (
+                SELECT
                         min(sm_id) as id,
-                        sum(value) as value,
                         al.dp as date,
                         al.curr_year as year,
                         al.curr_month as month,
@@ -81,13 +80,25 @@ class report_stock_move(osv.osv):
                         al.product_uom as product_uom,
                         al.categ_id as categ_id,
                         coalesce(al.type, 'other') as type,
-                        al.stock_journal as stock_journal
+                        al.stock_journal as stock_journal,
+                        sum(al.in_value - al.out_value) as value
                     FROM (SELECT
-
                         CASE WHEN sp.type in ('out','delivery') THEN
-                            sum(sm.product_qty) END AS out_qty,
+                            sum(sm.product_qty * pu.factor)
+                            ELSE 0.0
+                            END AS out_qty,
                         CASE WHEN sp.type in ('in') THEN
-                            sum(sm.product_qty)  END AS in_qty,
+                            sum(sm.product_qty * pu.factor)
+                            ELSE 0.0
+                            END AS in_qty,
+                        CASE WHEN sp.type in ('out','delivery') THEN
+                            sum(sm.product_qty * pu.factor) * pt.standard_price
+                            ELSE 0.0
+                            END AS out_value,
+                        CASE WHEN sp.type in ('in') THEN
+                            sum(sm.product_qty * pu.factor) * pt.standard_price
+                            ELSE 0.0
+                            END AS in_value,
                         min(sm.id) as sm_id,
                         sm.date as dp,
                         to_char(date_trunc('day',sm.date), 'YYYY') as curr_year,
@@ -98,8 +109,7 @@ class report_stock_move(osv.osv):
                         avg(date(sm.date)-date(sm.date_expected)) as curr_day_diff2,
                         sm.location_id as location_id,
                         sm.location_dest_id as location_dest_id,
-                        sum(sm.product_qty) as product_qty ,
-                        (pt.standard_price *pu.factor* sum(sm.product_qty)) as value,
+                        sum(sm.product_qty) as product_qty,
                         pt.categ_id as categ_id ,
                         sm.address_id as address_id,
                         sm.product_id as product_id,
@@ -108,23 +118,23 @@ class report_stock_move(osv.osv):
                             sm.state as state,
                             sm.product_uom as product_uom,
                             sp.type as type,
-                            sp.stock_journal_id as stock_journal
-                    from
+                            sp.stock_journal_id AS stock_journal
+                    FROM
                         stock_move sm
-                        left join stock_picking sp on (sm.picking_id=sp.id)
-                        left join product_product pp on (sm.product_id=pp.id)
-                        left join product_uom pu on (sm.product_uom=pu.id)
-                        left join product_template pt on (pp.product_tmpl_id=pt.id)
-                        left join stock_location sl on (sm.location_id = sl.id)
+                        LEFT JOIN stock_picking sp ON (sm.picking_id=sp.id)
+                        LEFT JOIN product_product pp ON (sm.product_id=pp.id)
+                        LEFT JOIN product_uom pu ON (sm.product_uom=pu.id)
+                        LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+                        LEFT JOIN stock_location sl ON (sm.location_id = sl.id)
 
-                    group by
+                    GROUP BY
                         sm.id,sp.type, sm.date,sm.address_id,
                         sm.product_id,sm.state,sm.product_uom,sm.date_expected,
                         sm.product_id,pt.standard_price, sm.picking_id, sm.product_qty,
                         sm.company_id,sm.product_qty, sm.location_id,sm.location_dest_id,pu.factor,pt.categ_id, sp.stock_journal_id)
-                    as al
+                    AS al
 
-                    group by
+                    GROUP BY
                         al.out_qty,al.in_qty,al.curr_year,al.curr_month,
                         al.curr_day,al.curr_day_diff,al.curr_day_diff1,al.curr_day_diff2,al.dp,al.location_id,al.location_dest_id,
                         al.address_id,al.product_id,al.state,al.product_uom,
@@ -157,42 +167,42 @@ class report_stock_inventory(osv.osv):
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_inventory')
         cr.execute("""
-create or replace view report_stock_inventory as (
-    (select
+CREATE OR REPLACE view report_stock_inventory AS (
+    (SELECT
         min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
         m.product_id as product_id,  m.product_uom as product_uom,l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(-m.product_qty*u.factor)::decimal as product_qty,
-        sum(-pt.standard_price * m.product_qty * u.factor)::decimal as value
-    from
+        coalesce(sum(-m.product_qty * u.factor)::decimal, 0.0) as product_qty,
+        coalesce(sum(-pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+    FROM
         stock_move m
-            left join stock_picking p on (m.picking_id=p.id)
-                left join product_product pp on (m.product_id=pp.id)
-                    left join product_template pt on (pp.product_tmpl_id=pt.id)
-            left join product_uom u on (m.product_uom=u.id)
-                left join stock_location l on (m.location_id=l.id)
-    group by
+            LEFT JOIN stock_picking p ON (m.picking_id=p.id)
+                LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_uom u ON (m.product_uom=u.id)
+                LEFT JOIN stock_location l ON (m.location_id=l.id)
+    GROUP BY
         m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
         m.date, m.state, l.usage, m.company_id,m.product_uom
-) union all (
-    select
+) UNION ALL (
+    SELECT
         -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, m.product_uom as product_uom, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
-        sum(m.product_qty*u.factor)::decimal as product_qty,
-        sum(pt.standard_price * m.product_qty * u.factor)::decimal as value
-    from
+        coalesce(sum(m.product_qty*u.factor)::decimal, 0.0) as product_qty,
+        coalesce(sum(pt.standard_price * m.product_qty * u.factor)::decimal, 0.0) as value
+    FROM
         stock_move m
-            left join stock_picking p on (m.picking_id=p.id)
-                left join product_product pp on (m.product_id=pp.id)
-                    left join product_template pt on (pp.product_tmpl_id=pt.id)
-            left join product_uom u on (m.product_uom=u.id)
-                left join stock_location l on (m.location_dest_id=l.id)
-    group by
+            LEFT JOIN stock_picking p ON (m.picking_id=p.id)
+                LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_uom u ON (m.product_uom=u.id)
+                LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
+    GROUP BY
         m.id, m.product_id, m.product_uom , m.address_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 7115048a411..0ee03fed220 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -31,8 +31,8 @@
                 <field name="product_qty_in" sum="Total incoming quantity" />
                 <field name="product_qty_out" sum="Total outgoing quantity"/>
                 <field name="value"  sum="Total value"/>
-                <field name="day_diff"/>
                 <field name="day_diff1"/>
+                <field name="day_diff"/>
                 <field name="day_diff2"/>
            </tree>
         </field>
@@ -141,7 +141,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  ref="view_stock_search"/>
-        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'search_default_group_categ_id':1,'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
     </record>
     <menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
 
@@ -215,7 +215,7 @@
                     <field name="date"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By..." >
+                <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter name="group_product_uom" string="Product UOM" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
@@ -238,7 +238,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id"  eval="False"/>
-        <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
     <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_system,base.group_user"/>
 
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 6933db289a0..b9aaff33e72 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -114,7 +114,13 @@
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_production')]"/>
             <field eval="'stock.location,'+str(location_production)" name="value"/>
         </record>
-        
+
+
+        <record forcecreate="True" id="decimal_shipping_delay" model="decimal.precision">
+            <field name="name">Shipping Delay</field>
+            <field name="digits" eval="2"/>
+        </record>
+
         <!--
     Resource: stock.warehouse
     -->

From fc2d8254e0bd1cad4bfda6bac2a259fe42e39497 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 14:29:04 +0200
Subject: [PATCH 122/632] [IMP] stock: finish renaming of
 stock.move.date_planned to stock.move.date

bzr revid: odo@openerp.com-20100928122904-refdktl1p0ks6qpc
---
 addons/stock/report/report_stock_move_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 0ee03fed220..440c3548c91 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -58,16 +58,16 @@
             <search string="Moves Analysis">
                 <group>
                 <filter icon="terp-go-year" string="  Year  "
-                domain="[('date_planned','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_planned','&gt;=',time.strftime('%%Y-01-01'))]"
+                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Current year"/>
                 <filter icon="terp-go-month" string="   Month   "
                 name="month"
-                domain="[('date_planned','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_planned','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                 help="Current month"/>
                 <filter icon="terp-go-month"
                  string="    Month-1    "
                  separator="1"
-                 domain="[('date_planned','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_planned','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>                    
                 <separator orientation="vertical"/>
                 <filter string="Done"
@@ -96,7 +96,7 @@
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date_planned"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -117,7 +117,7 @@
                     <filter string="Company" name="group_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day Planned"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date_planned'}" help="Month Planned"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'date'}" help="Month Planned"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"  help="Year Planned"/>
                 </group>
                 <newline/>

From 21fa7436db78dbeaf068f40468fbd84b2af28c69 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 14:29:49 +0200
Subject: [PATCH 123/632] [IMP] stock: code/labels cleanup

bzr revid: odo@openerp.com-20100928122949-hpbm9di13qmpvhhn
---
 addons/stock/stock.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bba58b1c77c..d1007375385 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1459,8 +1459,8 @@ class stock_move(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True),
-        'date': fields.datetime('Date ', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
-        'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
+        'date': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done.", readonly=True),
+        'date_expected': fields.datetime('Date Expected', required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
@@ -1547,9 +1547,9 @@ class stock_move(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         if uid != 1:
+            frozen_fields = set(['product_qty', 'product_uom', 'product_uos_qty', 'product_uos', 'location_id', 'location_dest_id', 'product_id'])
             for move in self.browse(cr, uid, ids):
                 if move.state == 'done':
-                    frozen_fields = set(['product_qty', 'product_uom', 'product_uos_qty', 'product_uos', 'location_id', 'location_dest_id', 'product_id'])
                     if frozen_fields.intersection(vals):
                         raise osv.except_osv(_('Operation forbidden'),
                                              _('Quantities, UoMs, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)'))
@@ -2305,8 +2305,7 @@ class stock_move(osv.osv):
                 user = users_obj.browse(cr, uid, uid)
                 context['currency_id'] = move.company_id.currency_id.id
                 qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                pricetype = 'standard_price'
-                if pricetype and qty > 0:
+                if qty > 0:
                     new_price = currency_obj.compute(cr, uid, product_currency,
                             user.company_id.currency_id.id, product_price)
                     new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
@@ -2315,11 +2314,11 @@ class stock_move(osv.osv):
                         new_std_price = new_price
                     else:
                         # Get the standard price
-                        amount_unit = product.price_get(pricetype, context)[product.id]
+                        amount_unit = product.price_get('standard_price', context)[product.id]
                         new_std_price = ((amount_unit * product.qty_available)\
                             + (new_price * qty))/(product.qty_available + qty)
 
-                    product_obj.write(cr, uid, [product.id],{pricetype: new_std_price})
+                    product_obj.write(cr, uid, [product.id],{'standard_price': new_std_price})
 
                     # Record the values that were chosen in the wizard, so they can be
                     # used for inventory valuation if real-time valuation is enabled.

From c5f030d5e0e6f82deecf6d294c27d9f9e2381c23 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 14:34:52 +0200
Subject: [PATCH 124/632] [IMP] add logging when server sends data to client,
 also bail out early from sending addons if we know we'll have nothing to send
 (client requested an empty set of web addons)

bzr revid: xmo@openerp.com-20100928123452-vhpoo1izp29lppo3
---
 bin/addons/base/module/module.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 954a1087962..759d4a14f43 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -72,6 +72,7 @@ module_category()
 class module(osv.osv):
     _name = "ir.module.module"
     _description = "Module"
+    __logger = logging.getLogger('base.' + _name)
 
     def get_module_info(self, name):
         info = {}
@@ -498,6 +499,9 @@ class module(osv.osv):
         modules = self.browse(cr, uid,
             self.search(cr, uid, [('name', 'in', names)], context=context),
                               context=context)
+        if not modules: return []
+        self.__logger.info('Sending web content of modules %s '
+                           'to web client', names)
         return [
             {'name': module.name,
              'depends': [dep.name for dep in module.dependencies_id

From cbbcc2f5935519f31c2d323da85f68034ba277f0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 14:38:42 +0200
Subject: [PATCH 125/632] [IMP] stock: make groups in picking search views more
 consistent + add journal

bzr revid: odo@openerp.com-20100928123842-bd2l7udwu9ylckz8
---
 addons/stock/stock_view.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f4f1b92e560..13e0ea66d90 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -788,8 +788,12 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -974,8 +978,12 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="10">
                         <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1190,9 +1198,13 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1402,6 +1414,8 @@
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}"  groups="base.group_extended"/>
                     </group>
                 </search>
             </field>
@@ -1455,9 +1469,13 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
                     </group>
                 </search>
             </field>

From 6d2e4664e82e8511900242e1d8e610d5d14c42a0 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 28 Sep 2010 18:46:15 +0530
Subject: [PATCH 126/632] [IMP] lunch, survery : Improvements

bzr revid: vir@tinyerp.com-20100928131615-nxslnafaf0r4v7ut
---
 addons/lunch/lunch.py         | 4 ++--
 addons/survey/survey_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index ad2996315aa..5a777564408 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -99,7 +99,7 @@ class lunch_cashmove(osv.osv):
         'amount': fields.float('Amount', digits=(16, 2)),
         'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, required=True),
         'active': fields.boolean('Active'),
-        'create_date': fields.datetime('Created date', readonly=True),
+        'create_date': fields.datetime('Creation Date', readonly=True),
     }
 
     _defaults = {
@@ -141,7 +141,7 @@ class lunch_order(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
         'price': fields.function(_price_get, method=True, string="Price"),
-        'category': fields.many2one('lunch.category','Category',readonly=True),
+        'category': fields.many2one('lunch.category','Category'),
     }
 
     _defaults = {
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2aa3eac089d..745cf98c484 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -265,7 +265,7 @@
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
                         <field name="responsible_id" select="1" default="1">
-                            <filter string="MY" icon="terp-partner" domain="[('responsible_id','=',uid)]"/>
+                            <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         </field>
                    </group>
                    <newline/>

From 60f6882c37c9473de9e0bfc1588fa203e700b7e2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Sep 2010 15:31:57 +0200
Subject: [PATCH 127/632] [FIX] web dependencies handling: walk the entire
 dependency tree, not just direct (server-side) dependencies of the current
 module, to discover and return the dependencies of the web addon to the web
 client

bzr revid: xmo@openerp.com-20100928133157-9n31dj4h1b96co5u
---
 bin/addons/base/module/module.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 759d4a14f43..ad10e4e8e5f 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -474,7 +474,7 @@ class module(osv.osv):
                     logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
                     raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
 
-    def list_web(self, cr, uid, context=False):
+    def list_web(self, cr, uid, context=None):
         """ list_web(cr, uid, context) -> [module_name]
         Lists all the currently installed modules with a web component.
 
@@ -488,7 +488,17 @@ class module(osv.osv):
                      ('state', 'in', ['installed','to upgrade','to remove'])],
                     context=context),
                 context=context)]
-    def get_web(self, cr, uid, names, context=False):
+    def _web_dependencies(self, cr, uid, module, context=None):
+        for dependency in module.dependencies_id:
+            (parent,) = self.browse(cr, uid, self.search(cr, uid,
+                [('name', '=', dependency.name)], context=context),
+                                 context=context)
+            if parent.web:
+                yield parent.name
+            else:
+                self._web_dependencies(
+                    cr, uid, parent, context=context)
+    def get_web(self, cr, uid, names, context=None):
         """ get_web(cr, uid, [module_name], context) -> [{name, depends, content}]
 
         Returns the web content of all the named addons.
@@ -504,11 +514,8 @@ class module(osv.osv):
                            'to web client', names)
         return [
             {'name': module.name,
-             'depends': [dep.name for dep in module.dependencies_id
-                         if self.search(cr, uid, [
-                             ('name', '=', dep.name),
-                             ('web', '=', True)
-                             ], context=context)],
+             'depends': list(self._web_dependencies(
+                 cr, uid, module, context=context)),
              'content': addons.zip_directory(
                  addons.get_module_resource(module.name, 'web'))}
             for module in modules

From 9f6c10ca2a1258aae7d418c26f5083177e38b1a6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:28:30 +0200
Subject: [PATCH 128/632] [FIX] stock: correct assignation of production lots
 during partial processing + cleanup + correct date read-only status

bzr revid: odo@openerp.com-20100928152830-qvlgv4o470xp1gjl
---
 addons/stock/stock.py | 118 ++++++++++++++++++++----------------------
 1 file changed, 57 insertions(+), 61 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d1007375385..dbf55768b3e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -642,7 +642,7 @@ class stock_picking(osv.osv):
                  "* Done: has been processed, can't be modified or cancelled anymore\n"\
                  "* Cancelled: has been cancelled, can't be confirmed anymore"),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
-                 method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed. Will be set to date of actual processing if not specified."),
+                 method=True, store=True, type='datetime', string='Expected Date', select=1, help="Expected date for the picking to be processed"),
         'date': fields.datetime('Order Date', help="Date of Order", select=True),
         'date_done': fields.datetime('Date Done', help="Date of Completion"),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
@@ -1116,6 +1116,8 @@ class stock_picking(osv.osv):
                           delivery moves with product_id, product_qty, uom
         @return: Dictionary of values
         """
+        import pdb
+        #pdb.set_trace()
         if context is None:
             context = {}
         else:
@@ -1124,7 +1126,6 @@ class stock_picking(osv.osv):
         move_obj = self.pool.get('stock.move')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
-        users_obj = self.pool.get('res.users')
         uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         sequence_obj = self.pool.get('ir.sequence')
@@ -1137,6 +1138,7 @@ class stock_picking(osv.osv):
             new_moves = []
             complete, too_many, too_few = [], [], []
             move_product_qty = {}
+            prodlot_ids = {}
             for move in pick.move_lines:
                 if move.state in ('done', 'cancel'):
                     continue
@@ -1147,7 +1149,8 @@ class stock_picking(osv.osv):
                 product_uom = partial_data.get('product_uom',False)
                 product_price = partial_data.get('product_price',0.0)
                 product_currency = partial_data.get('product_currency',False)
-                prodlot_id = partial_data.get('prodlot_id',False)
+                prodlot_id = partial_data.get('prodlot_id')
+                prodlot_ids[move.id] = prodlot_id
                 if move.product_qty == product_qty:
                     complete.append(move)
                 elif move.product_qty > product_qty:
@@ -1156,17 +1159,12 @@ class stock_picking(osv.osv):
                     too_many.append(move)
 
                 # Average price computation
-                # FIXME: we should not use the company of the user to determine the currency of the 
-                # product valuation field, we should use the company to which the destination location
-                # belongs! 
                 if (pick.type == 'in') and (move.product_id.cost_method == 'average'):
                     product = product_obj.browse(cr, uid, move.product_id.id)
-                    user = users_obj.browse(cr, uid, uid)
                     move_currency_id = move.company_id.currency_id.id
                     context['currency_id'] = move_currency_id
                     qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
-                    pricetype ='standard_price'
-                    if pricetype and qty > 0:
+                    if qty > 0:
                         new_price = currency_obj.compute(cr, uid, product_currency,
                                 move_currency_id, product_price)
                         new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
@@ -1175,12 +1173,12 @@ class stock_picking(osv.osv):
                             new_std_price = new_price
                         else:
                             # Get the standard price
-                            amount_unit = product.price_get(pricetype, context)[product.id]
+                            amount_unit = product.price_get('standard_price', context)[product.id]
                             new_std_price = ((amount_unit * product.qty_available)\
                                 + (new_price * qty))/(product.qty_available + qty)
 
                         # Write the field according to price type field
-                        product_obj.write(cr, uid, [product.id], {pricetype.field: new_std_price})
+                        product_obj.write(cr, uid, [product.id], {'standard_price': new_std_price})
 
                         # Record the values that were chosen in the wizard, so they can be
                         # used for inventory valuation if real-time valuation is enabled.
@@ -1191,8 +1189,8 @@ class stock_picking(osv.osv):
 
             for move in too_few:
                 product_qty = move_product_qty[move.id]
-                if not new_picking:
 
+                if not new_picking:
                     new_picking = self.copy(cr, uid, pick.id,
                             {
                                 'name': sequence_obj.get(cr, uid, 'stock.picking.%s'%(pick.type)),
@@ -1200,48 +1198,48 @@ class stock_picking(osv.osv):
                                 'state':'draft',
                             })
                 if product_qty != 0:
-
-                    new_obj = move_obj.copy(cr, uid, move.id,
-                        {
+                    defaults = {
                             'product_qty' : product_qty,
                             'product_uos_qty': product_qty, #TODO: put correct uos_qty
                             'picking_id' : new_picking,
                             'state': 'assigned',
                             'move_dest_id': False,
                             'price_unit': move.price_unit,
-                        })
+                    }
+                    prodlot_id = prodlot_ids[move.id]
+                    if prodlot_id:
+                        defaults.update(prodlot_id=prodlot_id)
+                    new_obj = move_obj.copy(cr, uid, move.id, defaults)
 
                 move_obj.write(cr, uid, [move.id],
                         {
                             'product_qty' : move.product_qty - product_qty,
                             'product_uos_qty':move.product_qty - product_qty, #TODO: put correct uos_qty
-
                         })
 
             if new_picking:
                 move_obj.write(cr, uid, [c.id for c in complete], {'picking_id': new_picking})
-                for move in too_many:
-                    product_qty = move_product_qty[move.id]
-                    move_obj.write(cr, uid, [move.id],
-                            {
-                                'product_qty' : product_qty,
-                                'product_uos_qty': product_qty, #TODO: put correct uos_qty
-                                'picking_id': new_picking,
-                            })
-            else:
-                for move in too_many:
-                    product_qty = move_product_qty[move.id]
-                    move_obj.write(cr, uid, [move.id],
-                            {
-                                'product_qty': product_qty,
-                                'product_uos_qty': product_qty #TODO: put correct uos_qty
-                            })
+                for move in complete:
+                    if prodlot_ids.get(move.id):
+                        move_obj.write(cr, uid, move.id, {'prodlot_id': prodlot_ids[move.id]})
+            for move in too_many:
+                product_qty = move_product_qty[move.id]
+                defaults = {
+                    'product_qty' : product_qty,
+                    'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                }
+                prodlot_id = prodlot_ids.get(move.id)
+                if prodlot_ids.get(move.id):
+                    defaults.update(prodlot_id=prodlot_id)
+                if new_picking:
+                    defaults.update(picking_id=new_picking)
+                move_obj.write(cr, uid, [move.id], defaults)
+
 
             # At first we confirm the new picking (if necessary)
             if new_picking:
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
-            # Then we finish the good picking
-            if new_picking:
+                # Then we finish the good picking
                 self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
                 self.action_move(cr, uid, [new_picking])
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
@@ -1459,8 +1457,8 @@ class stock_move(osv.osv):
         'name': fields.char('Name', size=64, required=True, select=True),
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True),
-        'date': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done.", readonly=True),
-        'date_expected': fields.datetime('Date Expected', required=True, help="Scheduled date for the movement of the products"),
+        'date': fields.datetime('Date', required=True, help="Move date: scheduled date until move is done, then date of actual move processing", readonly=True),
+        'date_expected': fields.datetime('Scheduled Date', required=True, help="Scheduled date for the processing of this move"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
@@ -2259,11 +2257,12 @@ class stock_move(osv.osv):
                           like partner_id, address_id, delivery_date, delivery
                           moves with product_id, product_qty, uom
         """
+        import pdb
+        #pdb.set_trace()
         res = {}
         picking_obj = self.pool.get('stock.picking')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
-        users_obj = self.pool.get('res.users')
         uom_obj = self.pool.get('product.uom')
         price_type_obj = self.pool.get('product.price.type')
         sequence_obj = self.pool.get('ir.sequence')
@@ -2278,6 +2277,7 @@ class stock_move(osv.osv):
 
         complete, too_many, too_few = [], [], []
         move_product_qty = {}
+        prodlot_ids = {}
         for move in self.browse(cr, uid, ids, context=context):
             if move.state in ('done', 'cancel'):
                 continue
@@ -2288,7 +2288,7 @@ class stock_move(osv.osv):
             product_uom = partial_data.get('product_uom',False)
             product_price = partial_data.get('product_price',0.0)
             product_currency = partial_data.get('product_currency',False)
-            prodlot_id = partial_data.get('prodlot_id',False)
+            prodlot_ids[move.id] = partial_data.get('prodlot_id')
             if move.product_qty == product_qty:
                 complete.append(move)
             elif move.product_qty > product_qty:
@@ -2297,17 +2297,14 @@ class stock_move(osv.osv):
                 too_many.append(move)
 
             # Average price computation
-            # FIXME: we should not use the company of the user to determine the currency of the 
-            # product valuation field, we should use the company to which the destination location
-            # belongs! 
             if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
                 product = product_obj.browse(cr, uid, move.product_id.id)
-                user = users_obj.browse(cr, uid, uid)
-                context['currency_id'] = move.company_id.currency_id.id
+                move_currency_id = move.company_id.currency_id.id
+                context['currency_id'] = move_currency_id
                 qty = uom_obj._compute_qty(cr, uid, product_uom, product_qty, product.uom_id.id)
                 if qty > 0:
                     new_price = currency_obj.compute(cr, uid, product_currency,
-                            user.company_id.currency_id.id, product_price)
+                            move_currency_id, product_price)
                     new_price = uom_obj._compute_price(cr, uid, product_uom, new_price,
                             product.uom_id.id)
                     if product.qty_available <= 0:
@@ -2330,15 +2327,18 @@ class stock_move(osv.osv):
         for move in too_few:
             product_qty = move_product_qty[move.id]
             if product_qty != 0:
-                new_move = self.copy(cr, uid, move.id,
-                    {
-                        'product_qty' : product_qty,
-                        'product_uos_qty': product_qty,
-                        'picking_id' : move.picking_id.id,
-                        'state': 'assigned',
-                        'move_dest_id': False,
-                        'price_unit': move.price_unit,
-                    })
+                defaults = {
+                            'product_qty' : product_qty,
+                            'product_uos_qty': product_qty,
+                            'picking_id' : move.picking_id.id,
+                            'state': 'assigned',
+                            'move_dest_id': False,
+                            'price_unit': move.price_unit,
+                            }
+                prodlot_id = prodlot_ids[move.id]
+                if prodlot_id:
+                    defaults.update(prodlot_id=prodlot_id)
+                new_move = self.copy(cr, uid, move.id, defaults)
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, move.id,
                     {
@@ -2356,8 +2356,8 @@ class stock_move(osv.osv):
             complete.append(move)
 
         for move in complete:
-            if prodlot_id:
-                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_id,})                
+            if prodlot_ids.get(move.id):
+                self.write(cr, uid, [move.id],{'prodlot_id': prodlot_ids.get(move.id)})
             self.action_done(cr, uid, [move.id], context=context)
             if  move.picking_id.id :
                 # TOCHECK : Done picking if all moves are done
@@ -2371,11 +2371,7 @@ class stock_move(osv.osv):
                     picking_obj.action_move(cr, uid, [move.picking_id.id])
                     wf_service.trg_validate(uid, 'stock.picking', move.picking_id.id, 'button_done', cr)
 
-        ref = {}
-        done_move_ids = []
-        for move in complete:
-            done_move_ids.append(move.id)
-        return done_move_ids
+        return [move.id for move in complete]
 
 stock_move()
 

From 71ee90c529380b85eb89f5dbaec56a128e23b7c1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:29:29 +0200
Subject: [PATCH 129/632] [IMP] product: default precision digits = 3 for
 Product UoM

bzr revid: odo@openerp.com-20100928152929-dhds0ig2154zq2e1
---
 addons/product/product_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 962f8aca560..83b36a1e130 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -158,7 +158,7 @@ parameter) will see those record just disappear.
         </record>
         <record forcecreate="True" id="decimal_product_uom" model="decimal.precision">
             <field name="name">Product UoM</field>
-            <field name="digits" eval="6"/>
+            <field name="digits" eval="3"/>
         </record>
     </data>
 </openerp>

From dea3d33eb3f4637a7b297d512f8205f529905067 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:30:03 +0200
Subject: [PATCH 130/632] [IMP] stock: return picking cleanup

bzr revid: odo@openerp.com-20100928153003-yy266nvttcqyeayj
---
 addons/stock/wizard/stock_return_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 9f34bbc5fac..88bc41e1aa7 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -109,7 +109,7 @@ class stock_return_picking(osv.osv_memory):
             arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
             for m in [line for line in pick.move_lines]:
                 quantity = m.product_qty
-                if m.state=='done' and quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
+                if m.state=='done' and quantity > return_history[m.id]:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
                     res.setdefault('returns', []).append(m.id)

From 48a0ca06fcd7888f23b8e835d215aec1d83ae321 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 17:30:49 +0200
Subject: [PATCH 131/632] [IMP] stock: remove duplicate tooltips on picking
 list actions + make more consistent

bzr revid: odo@openerp.com-20100928153049-2ps3f2e0bst333bm
---
 addons/stock/stock_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 13e0ea66d90..576774a2107 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -624,7 +624,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="confirmed,assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Picking"/>
+                    <button name="%(action_partial_picking)d" states="confirmed,assigned" string="Approve Picking" type="action" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -813,8 +813,8 @@
                     <field name="min_date"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Delivery"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
+                    <button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
                 </tree>
             </field>
         </record>
@@ -927,7 +927,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1038,7 +1038,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-go-forward" help="Approve Picking"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Approve Picking" type="action" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1147,7 +1147,7 @@
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1254,8 +1254,8 @@
                     <field name="invoice_state" groups="base.group_extended"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-ok" help="Receive products"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
+                    <button name="%(action_partial_picking)d" states="assigned" string="Receive products" type="action" icon="gtk-ok"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
         </record>
@@ -1549,7 +1549,7 @@
                     <field name="date"/>
                     <field name="date_expected"/>
                     <field name="state"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-ok"/>
                 </tree>
             </field>
         </record>

From 41d387d913c835e1008bc2e4cdf91abc450d589f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 18:36:49 +0200
Subject: [PATCH 132/632] [IMP] stock: move/inventory analysis review: correct
 report, add product category + improve views

bzr revid: odo@openerp.com-20100928163649-fueh01zap4ox8j86
---
 addons/stock/report/report_stock_move.py      | 24 ++++----
 .../stock/report/report_stock_move_view.xml   | 59 ++++++++-----------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 3aad21f4f9c..4bfd4537ec8 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -153,7 +153,7 @@ class report_stock_inventory(osv.osv):
         'date': fields.datetime('Date', readonly=True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
-        'product_uom':fields.many2one('product.uom', 'Product UOM', readonly=True),
+        'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
         'location_id': fields.many2one('stock.location', 'Location', readonly=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
@@ -171,7 +171,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
     (SELECT
         min(m.id) as id, m.date as date,
         m.address_id as partner_id, m.location_id as location_id,
-        m.product_id as product_id,  m.product_uom as product_uom,l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(-m.product_qty * u.factor)::decimal, 0.0) as product_qty,
@@ -179,18 +179,18 @@ CREATE OR REPLACE view report_stock_inventory AS (
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
-                LEFT JOIN product_product pp ON (m.product_id=pp.id)
-                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
-                LEFT JOIN stock_location l ON (m.location_id=l.id)
+            LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
-        m.id, m.product_id, m.address_id, m.location_id, m.prodlot_id,
-        m.date, m.state, l.usage, m.company_id,m.product_uom
+        m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id,  m.location_dest_id,
+        m.prodlot_id, m.date, m.state, l.usage, m.company_id
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
         m.address_id as partner_id, m.location_dest_id as location_id,
-        m.product_id as product_id, m.product_uom as product_uom, l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(m.product_qty*u.factor)::decimal, 0.0) as product_qty,
@@ -198,12 +198,12 @@ CREATE OR REPLACE view report_stock_inventory AS (
     FROM
         stock_move m
             LEFT JOIN stock_picking p ON (m.picking_id=p.id)
-                LEFT JOIN product_product pp ON (m.product_id=pp.id)
-                    LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
+            LEFT JOIN product_product pp ON (m.product_id=pp.id)
+                LEFT JOIN product_template pt ON (pp.product_tmpl_id=pt.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
-                LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
+            LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
-        m.id, m.product_id, m.product_uom , m.address_id, m.location_id, m.location_dest_id,
+        m.id, m.product_id, m.product_uom, pt.categ_id, m.address_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, m.company_id
     )
 );
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 440c3548c91..12a43a5abbe 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -57,18 +57,18 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter icon="terp-go-year" string="  Year  "
+                <filter icon="terp-go-year" string="Year"
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Current year"/>
-                <filter icon="terp-go-month" string="   Month   "
+                <filter icon="terp-go-month"
+                 string="Month-1"
+                 separator="1"
+                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 help="Last month"/>
+                <filter icon="terp-go-month" string="Month"
                 name="month"
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                 help="Current month"/>
-                <filter icon="terp-go-month"
-                 string="    Month-1    "
-                 separator="1"
-                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                 help="Last month"/>                    
                 <separator orientation="vertical"/>
                 <filter string="Done"
                     name="done"
@@ -81,24 +81,15 @@
                     help = "Future Stock-Moves"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="terp-go-home" name="in" string="Receptions" domain="[('type','=','in')]"/>
-                <filter icon="terp-go-home" name="internal" string="Internals" domain="[('type','=','internal')]"/>
-                <filter icon="terp-go-home" name="out" string="Packings" domain="[('type','=','out')]"/>
+                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
                 <filter icon="terp-go-home" name="delivery" string="Deliveries" domain="[('type','=','delivery')]"/>
                 <separator orientation="vertical"/>
-                <field name="product_id"/>
+                <field name="product_id" default_focus="1"/>
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="location_id" widget = "selection"/>
-                    <field name="location_dest_id"  widget = "selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By...">
                     <filter name="group_partner" string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
@@ -157,7 +148,7 @@
                 <field name="location_type" invisible="1"/>
                 <field name="location_id" invisible="1"/>
                 <field name="partner_id" invisible="1" context="{'contact_display':'partner'}"/>
-                <field name="product_uom" invisible="1"/>
+                <field name="product_categ_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="prodlot_id" invisible="1"/>
                 <field name="state" invisible="1"/>
@@ -199,26 +190,16 @@
 
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
-                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
                     <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="location_id"/>
+                    <field name="product_id" default_focus="1"/>
+                    <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                    <field name="partner_id" context="{'contact_display':'partner'}"/>
-                    <field name="product_uom" />
-                    <field name="prodlot_id"/>
-                    <field name="state"/>
-                    <field name="location_type"/>
-                    <field name="date"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="group_product_uom" string="Product UOM" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
+                    <filter name="group_product_categ_id" string="Product Category" icon="terp-stock_symbol-selection" context="{'group_by':'product_categ_id'}"/>
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                      <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
@@ -228,6 +209,16 @@
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="product_categ_id" />
+                    <field name="prodlot_id"/>
+                    <field name="state"/>
+                    <field name="location_type"/>
+                    <field name="date"/>
+                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
+                </group>
             </search>
         </field>
     </record>

From 4fd2e50269c56fbb484d0151b55c8bee818d2088 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 18:44:13 +0200
Subject: [PATCH 133/632] [IMP] stock: move o2m_list inside stock.picking
 should not have the redundant picking column

bzr revid: odo@openerp.com-20100928164413-4o1pdrmzqbrf8y66
---
 addons/stock/stock_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 576774a2107..639c22f226b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -663,7 +663,6 @@
                                         states="draft,waiting,confirmed,assigned" 
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
-                                    <field name="picking_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <button
                                         name="%(stock.track_line)d"

From 11cc4b59d48c1767b164f2edfd2338fe7c4ff5de Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 28 Sep 2010 19:25:47 +0200
Subject: [PATCH 134/632] [IMP] stock.picking return wizard: properly use uom +
 correct validation

bzr revid: odo@openerp.com-20100928172547-ngdqyn7g0etdz0u4
---
 addons/stock/wizard/stock_return_picking.py | 90 +++++++++++----------
 1 file changed, 49 insertions(+), 41 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 88bc41e1aa7..4bddc9a7ee4 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -69,15 +69,23 @@ class stock_return_picking(osv.osv_memory):
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
+            if pick.state not in ['done','confirmed','assigned']:
+                raise osv.except_osv(_('Warning !'), _("You may only return pickings that are Confirmed, Available or Done!"))
+            return_history = {}
+            valid_lines = 0
             for m in [line for line in pick.move_lines]:
-                if m.state=='done':
-                    if 'return%s'%(m.id) not in self._columns:
-                        self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
-                    if 'invoice_state' not in self._columns:
-                        self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
-                for rec in m.move_history_ids2:
-                    if rec.product_qty==m.product_qty:
-                        raise osv.except_osv(_('Warning !'), _("There is no product to return!"))
+                if m.state == 'done':
+                    return_history[m.id] = 0
+                    for rec in m.move_history_ids2:
+                        return_history[m.id] += (rec.product_qty * rec.product_uom.factor)
+                    if m.product_qty * m.product_uom.factor > return_history[m.id]:
+                        valid_lines += 1
+                        if 'return%s'%(m.id) not in self._columns:
+                            self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                        if 'invoice_state' not in self._columns:
+                            self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+            if not valid_lines:
+                raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
@@ -98,16 +106,13 @@ class stock_return_picking(osv.osv_memory):
         if record_id:
             pick_obj = self.pool.get('stock.picking')
             pick = pick_obj.browse(cr, uid, record_id)
-            if pick.state not in['done','confirmed']:
-                raise osv.except_osv(_('Warning !'), _("The Picking is not completed yet!\nYou cannot return picking which is not in 'Done' state!"))
             return_history = {}
-            for m_line in pick.move_lines:
-                return_history[m_line.id] = 0
-                for rec in m_line.move_history_ids2:
-                    return_history[m_line.id] += rec.product_qty
             res['fields'].clear()
             arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
-            for m in [line for line in pick.move_lines]:
+            for m in pick.move_lines:
+                return_history[m.id] = 0
+                for rec in m.move_history_ids2:
+                    return_history[m.id] += rec.product_qty
                 quantity = m.product_qty
                 if m.state=='done' and quantity > return_history[m.id]:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
@@ -146,6 +151,7 @@ class stock_return_picking(osv.osv_memory):
     
         move_ids = [m.id for m in [line for line in pick.move_lines]]
         set_invoice_state_to_none = True
+        returned_lines = 0
         for move in move_obj.browse(cr, uid, move_ids):
             if not new_picking:
                 if pick.type=='out':
@@ -167,34 +173,36 @@ class stock_return_picking(osv.osv_memory):
         
                 if returned_qty != new_qty:
                     set_invoice_state_to_none = False
-        
-                new_move=move_obj.copy(cr, uid, move.id, {
-                    'product_qty': new_qty,
-                    'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
-                        new_qty, move.product_uos.id),
-                    'picking_id':new_picking, 'state':'draft',
-                    'location_id':new_location, 'location_dest_id':move.location_id.id,
-                    'date':date_cur,})
-                move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
-        
+
+                if new_qty:
+                    returned_lines += 1 
+                    new_move=move_obj.copy(cr, uid, move.id, {
+                        'product_qty': new_qty,
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
+                            new_qty, move.product_uos.id),
+                        'picking_id':new_picking, 'state':'draft',
+                        'location_id':new_location, 'location_dest_id':move.location_id.id,
+                        'date':date_cur,})
+                    move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
+
+        if not returned_lines:
+            raise osv.except_osv(_('Warning !'), _("Please specify at least one non-zero quantity!"))
+
         if set_invoice_state_to_none:
             pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
-        if new_picking:
-            if new_picking:
-                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
-            pick_obj.force_assign(cr, uid, [new_picking], context)
-            return {
-                'domain': "[('id', 'in', ["+str(new_picking)+"])]",
-                'name': 'Picking List',
-                'view_type':'form',
-                'view_mode':'tree,form',
-                'res_model':'stock.picking',
-                'view_id':False,
-                'type':'ir.actions.act_window',
-                'context':context,
-            }            
-        return {}
-    
+        wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+        pick_obj.force_assign(cr, uid, [new_picking], context)
+        return {
+            'domain': "[('id', 'in', ["+str(new_picking)+"])]",
+            'name': 'Picking List',
+            'view_type':'form',
+            'view_mode':'tree,form',
+            'res_model':'stock.picking',
+            'view_id':False,
+            'type':'ir.actions.act_window',
+            'context':context,
+        }
+
 stock_return_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 17191285b3cc5b314b74f8f9477a3799146588df Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 28 Sep 2010 20:53:49 +0200
Subject: [PATCH 135/632] modifs

bzr revid: fp@tinyerp.com-20100928185349-4l60mx4oylaafjpy
---
 README | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/README b/README
index 80fb4701288..5725ce9f866 100644
--- a/README
+++ b/README
@@ -15,16 +15,3 @@ database, dynamic GUIs, customizable reports, NET-RPC and XML-RPC interfaces, ..
 For more information, please visit: 
 http://www.openerp.com
 
-About Tiny.be
-----------------
-
-Tiny.be is a company specialising in the development of high-level applications
-and websites. All the company products are free software, released under the 
-GNU GPL license. 
-
-Our main products include: OpenERP (ERP & CRM for SMB), Tiny eCommerce 
-(complete eCommerce system), OpenReport (automated generation of complex 
-documents), Tiny Raytracer, ...
-
-For more information, please visit:
-http://www.tiny.be

From 0c5c22241e7d70eec2accd9473d48c5a53ba4b84 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 29 Sep 2010 04:47:42 +0000
Subject: [PATCH 136/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20100929044742-hs94zc5tzloe42ql
---
 bin/addons/base/i18n/am.po    |  44 ++--
 bin/addons/base/i18n/ar.po    |  44 ++--
 bin/addons/base/i18n/bg.po    |  46 ++--
 bin/addons/base/i18n/bs.po    |  88 ++++----
 bin/addons/base/i18n/ca.po    |  46 ++--
 bin/addons/base/i18n/cs.po    |  44 ++--
 bin/addons/base/i18n/da.po    |  44 ++--
 bin/addons/base/i18n/de.po    |  48 ++--
 bin/addons/base/i18n/el.po    |  46 ++--
 bin/addons/base/i18n/en_GB.po |  50 +++--
 bin/addons/base/i18n/es.po    |  46 ++--
 bin/addons/base/i18n/es_EC.po |  83 ++++---
 bin/addons/base/i18n/et.po    | 169 ++++++++-------
 bin/addons/base/i18n/eu.po    |  44 ++--
 bin/addons/base/i18n/fa.po    |  46 ++--
 bin/addons/base/i18n/fi.po    |  45 ++--
 bin/addons/base/i18n/fr.po    |  64 +++---
 bin/addons/base/i18n/gl.po    |  53 +++--
 bin/addons/base/i18n/he.po    |  44 ++--
 bin/addons/base/i18n/hr.po    |  46 ++--
 bin/addons/base/i18n/hu.po    |  44 ++--
 bin/addons/base/i18n/id.po    |  44 ++--
 bin/addons/base/i18n/is.po    |  44 ++--
 bin/addons/base/i18n/it.po    | 397 +++++++++++++++++++---------------
 bin/addons/base/i18n/ja.po    |  46 ++--
 bin/addons/base/i18n/ko.po    |  44 ++--
 bin/addons/base/i18n/lt.po    |  58 +++--
 bin/addons/base/i18n/lv.po    |  44 ++--
 bin/addons/base/i18n/mn.po    | 283 +++++++++++++-----------
 bin/addons/base/i18n/nb.po    |  44 ++--
 bin/addons/base/i18n/nl.po    |  48 ++--
 bin/addons/base/i18n/pl.po    |  64 +++---
 bin/addons/base/i18n/pt.po    |  46 ++--
 bin/addons/base/i18n/pt_BR.po |  50 +++--
 bin/addons/base/i18n/ro.po    |  44 ++--
 bin/addons/base/i18n/ru.po    |  44 ++--
 bin/addons/base/i18n/sk.po    |  44 ++--
 bin/addons/base/i18n/sl.po    |  44 ++--
 bin/addons/base/i18n/sq.po    |  44 ++--
 bin/addons/base/i18n/sr.po    |  44 ++--
 bin/addons/base/i18n/sv.po    |  50 +++--
 bin/addons/base/i18n/th.po    |  44 ++--
 bin/addons/base/i18n/tlh.po   |  44 ++--
 bin/addons/base/i18n/tr.po    |  46 ++--
 bin/addons/base/i18n/uk.po    |  46 ++--
 bin/addons/base/i18n/vi.po    |  44 ++--
 bin/addons/base/i18n/zh_CN.po |  48 ++--
 bin/addons/base/i18n/zh_TW.po |  44 ++--
 debian/po/bg.po               |   2 +-
 debian/po/ca.po               |   2 +-
 debian/po/cs.po               |   2 +-
 debian/po/de.po               |   2 +-
 debian/po/el.po               |   2 +-
 debian/po/en_GB.po            |   2 +-
 debian/po/es.po               |   2 +-
 debian/po/es_EC.po            |   2 +-
 debian/po/fa.po               |   2 +-
 debian/po/fi.po               |   2 +-
 debian/po/fr.po               |   2 +-
 debian/po/gl.po               |   2 +-
 debian/po/hr.po               |   2 +-
 debian/po/it.po               |   2 +-
 debian/po/ja.po               |   2 +-
 debian/po/ko.po               |  12 +-
 debian/po/mn.po               |  41 ++++
 debian/po/nb.po               |   2 +-
 debian/po/nl.po               |   2 +-
 debian/po/pl.po               |   2 +-
 debian/po/pt.po               |   2 +-
 debian/po/ro.po               |   4 +-
 debian/po/ru.po               |   2 +-
 debian/po/sk.po               |   2 +-
 debian/po/sr.po               |   2 +-
 debian/po/sv.po               |   2 +-
 debian/po/tr.po               |   2 +-
 debian/po/uk.po               |   2 +-
 debian/po/zh_CN.po            |   2 +-
 debian/po/zh_TW.po            |   2 +-
 78 files changed, 1829 insertions(+), 1308 deletions(-)
 create mode 100644 debian/po/mn.po

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 673da21f0e0..718ec294ec0 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.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: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index f69ef3734bd..de0a35e7dfe 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,73 +7938,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8014,13 +8015,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 7f08e4a455d..325288006a4 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:19+0000\n"
+"PO-Revision-Date: 2010-09-09 18:37+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8104,73 +8104,74 @@ msgstr "руски / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Не може да има двама потребитела с един и същ \"логин\"!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8180,13 +8181,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index be26a65700a..af99a2b5185 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-03 04:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-12 21:46+0000\n"
+"Last-Translator: Bojan Markovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-04 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -413,7 +413,7 @@ msgstr "Naziv zemlje"
 #. module: base
 #: model:res.country,name:base.coreturn
 msgid "Colombia"
-msgstr ""
+msgstr "Kolumbija"
 
 #. module: base
 #: view:ir.module.module:0
@@ -620,7 +620,7 @@ msgstr "Oman"
 #: model:ir.actions.act_window,name:base.action_payterm_form
 #: model:ir.model,name:base.model_res_payterm
 msgid "Payment term"
-msgstr ""
+msgstr "Uvjeti plaćanja"
 
 #. module: base
 #: model:res.country,name:base.nu
@@ -635,23 +635,23 @@ msgstr "Radni dani"
 #. module: base
 #: help:ir.values,action_id:0
 msgid "This field is not used, it only helps you to select the right action."
-msgstr ""
+msgstr "Polje se ne koristi, služi za pomoć pri odabiru ispravne radnje."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Kreiraj izbornik"
 
 #. module: base
 #: model:res.country,name:base.in
 msgid "India"
-msgstr ""
+msgstr "Indija"
 
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract_module
 msgid "maintenance contract modules"
-msgstr ""
+msgstr "moduli s ugovorom o održavanju"
 
 #. module: base
 #: view:ir.values:0
@@ -661,28 +661,28 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ad
 msgid "Andorra, Principality of"
-msgstr ""
+msgstr "Andora"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Podkategorije"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
 msgid "TGZ Archive"
-msgstr ""
+msgstr "TGZ arhiva"
 
 #. module: base
 #: field:res.partner.som,factor:0
 msgid "Factor"
-msgstr ""
+msgstr "Faktor"
 
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
-msgstr ""
+msgstr "%B - Puni naziv za mjesec."
 
 #. module: base
 #: field:ir.actions.report.xml,report_type:0
@@ -692,7 +692,7 @@ msgstr ""
 #: field:ir.values,key:0
 #: view:res.partner:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -702,12 +702,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "Guam (USA)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_grid
 msgid "Objects Security Grid"
-msgstr ""
+msgstr "Mreža sigurnosnih postavki objekata"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -723,7 +723,7 @@ msgstr ""
 #: selection:ir.actions.server,state:0
 #: selection:workflow.activity,kind:0
 msgid "Dummy"
-msgstr ""
+msgstr "Prazno"
 
 #. module: base
 #: constraint:ir.ui.view:0
@@ -733,29 +733,29 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kajmanska ostrva"
 
 #. module: base
 #: model:res.country,name:base.ir
 msgid "Iran"
-msgstr ""
+msgstr "Iran"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-act
 #: model:ir.ui.menu,name:base.menu_res_request_act
 msgid "My Requests"
-msgstr ""
+msgstr "Moji zahtjevi"
 
 #. module: base
 #: field:ir.sequence,name:0
 #: field:ir.sequence.type,name:0
 msgid "Sequence Name"
-msgstr ""
+msgstr "Naziv sekvence"
 
 #. module: base
 #: model:res.country,name:base.td
 msgid "Chad"
-msgstr ""
+msgstr "Čad"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -7961,73 +7961,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8037,13 +8038,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 3ef8efd72dc..68f51968a1a 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:58+0000\n"
+"PO-Revision-Date: 2010-09-09 18:36+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8098,73 +8098,74 @@ msgstr "Rus / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "No podeu tenir dos usuaris amb el mateix identificador d'usuari!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8174,13 +8175,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 1132bdeb2e2..aa4ad43cbc3 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.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: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7941,73 +7941,74 @@ msgstr "Rusko / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8017,13 +8018,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 4069cf08816..614b8a8f285 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 44005e08899..968b8392abe 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-08-25 05:51+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 17:58+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-26 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8105,73 +8105,74 @@ msgstr "Russian / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "2 Benuzter können nicht den gleichen Login Code haben!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8181,13 +8182,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index b27a5d71152..5e1718b2d48 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -6,13 +6,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:42+0000\n"
+"PO-Revision-Date: 2010-09-09 18:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -8106,73 +8106,74 @@ msgstr "Ρώσσικα / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Δεν μπορεί να υπάρχουν δύο χρήστες με το ίδιο όνομα!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8182,13 +8183,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 3c516ddf1c7..0e2166dc01f 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:13+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-11 15:00+0000\n"
+"Last-Translator: Martin Hood <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -2646,7 +2646,7 @@ msgstr "You can not remove the field '%s' !"
 #: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
-msgstr "Zip"
+msgstr "Postcode"
 
 #. module: base
 #: field:ir.module.module,author:0
@@ -8080,73 +8080,74 @@ msgstr "Russian / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8156,13 +8157,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index b1c8dadcb33..be23757ec05 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:29+0000\n"
+"PO-Revision-Date: 2010-09-09 18:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8104,73 +8104,74 @@ msgstr "Ruso / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8180,13 +8181,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index 61123e004e8..88d23a33bfa 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2009-12-27 01:49+0000\n"
+"PO-Revision-Date: 2010-09-18 22:18+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8101,94 +8101,109 @@ msgstr "Ruso / русский язык"
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
-msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
- 
+msgstr "¡No puede tener dos usuarios con el mismo identificador!"
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
- 
+msgstr "Tamaño del campo nunca puede ser menor que 1 !"
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
- 
+msgstr "Acceso directo a este menú ya existe !"
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+"No puede tener varios registros con el mismo id para el mismo módulo !"
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
- 
+msgstr "Tu contrato de mantenimiento esta ya suscrito en el sistema !"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
- 
+msgstr "El nombre del módulo debe ser único !"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
- 
+msgstr "El ID del certificado del módulo debe ser único !"
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
- 
+msgstr "El codigo del Título del Partner debe ser único"
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
- 
+msgstr "El nombre del Partner debe ser único"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
- 
+msgstr "El nombre del país debe ser único"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
- 
+msgstr "El codigo del pais debe ser unico"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
- 
+msgstr "El nombre del lenguaje debe ser unico"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
- 
+msgstr "El codigo del lenguaje debe ser unico"
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
- 
+msgstr "El nombre del grupo debe ser unico"
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Error de restriccion"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"La operacion no puede ser completada, probablemente sucedio lo siguiente:\n"
+"- borrado: esta tratando de borrar un registro que hacer referencia a otro\n"
+"- creacion/actualizacion: un campo requerido no fue llenado correctamente"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[objeto con referencia: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Error de Integridad"
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 83d224a2e1c..0814b45f278 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-19 08:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-09-21 14:25+0000\n"
+"Last-Translator: Tanel Kurvits <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -180,7 +180,7 @@ msgstr "Otsi partnerit"
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
 #, python-format
 msgid "new"
-msgstr ""
+msgstr "uus"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -215,6 +215,8 @@ msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
 "text editor. The file encoding is UTF-8."
 msgstr ""
+"Salvest see dokument %s faili ja muuda seda spetsiaaltarkvaraga või "
+"tekstiredaktoriga. Faili kodeering on UTF-8."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -225,13 +227,13 @@ msgstr "STOCK_DELETE"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Password mismatch !"
-msgstr ""
+msgstr "Salasõna ei klapi !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "This url '%s' must provide an html file with links to zip modules"
-msgstr ""
+msgstr "See url '%s' peab andma html faili, mis viitab zip moodulitele"
 
 #. module: base
 #: selection:res.request,state:0
@@ -359,6 +361,8 @@ msgid ""
 "You can not remove the admin user as it is used internally for resources "
 "created by OpenERP (updates, module installation, ...)"
 msgstr ""
+"Sa ei saa eemaldada kasutajat 'admin' sest seda kasutatakse siseselt Open "
+"ERP poolt loodud vahendite jaoks (uuendused, moodulite paigaldamine, ...)"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -381,6 +385,8 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
+"Selle kasti märgistamisel pöördutakse eelmise aruande juurde, kui kasutaja "
+"prindib olemasoleva manuse nimega"
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -464,7 +470,7 @@ msgstr "Laiendatud"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr ""
+msgstr "Kohandatud väljadel peab olema nimi mis algab 'x_'-ga !"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -495,7 +501,7 @@ msgstr "Jordaania"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the model '%s' !"
-msgstr ""
+msgstr "Sa ei saa eemaldada mudelit '%s'!"
 
 #. module: base
 #: model:res.country,name:base.er
@@ -847,13 +853,13 @@ msgstr "RML"
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "Otsi"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Pie charts need exactly two fields"
-msgstr ""
+msgstr "Sektordiagrammid vajavad täpselt kahte välja"
 
 #. module: base
 #: help:wizard.module.lang.export,lang:0
@@ -997,7 +1003,7 @@ msgstr "STOCK_COPY"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Model %s Does not Exist !"
-msgstr ""
+msgstr "Mudelit %s ei eksisteeri !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -1006,6 +1012,8 @@ msgid ""
 "You try to install the module '%s' that depends on the module:'%s'.\n"
 "But this module is not available in your system."
 msgstr ""
+"Sa proovid installeerida moodulit '%s' mis sõltub moodulist:'%s'.\n"
+"Aga seda moodulit pole sinu süsteemis saadaval."
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1063,7 +1071,7 @@ msgstr "Päev: %(day)s"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not read this document! (%s)"
-msgstr ""
+msgstr "Sa ei saa lugeda seda dokumenti! (%s)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1125,7 +1133,7 @@ msgstr "Kohandatud aruanne"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (koopia)"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1140,7 +1148,7 @@ msgstr "7. %H:%M:%S ==> 18:25:20"
 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working on."
-msgstr ""
+msgstr "Firma kus see kasutaja hetkel töötab."
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1188,7 +1196,7 @@ msgstr "Valem"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Can not remove root user!"
-msgstr ""
+msgstr "Ei saa eemaldada root kasutajat!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1290,7 +1298,7 @@ msgstr "STOCK_PROPERTIES"
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Otsi kontakti"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1355,7 +1363,7 @@ msgstr "Grupid"
 #. module: base
 #: constraint:res.users:0
 msgid "This user can not connect using this company !"
-msgstr ""
+msgstr "See kasutaja ei saa ühendada kasutades seda firmat !"
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1453,7 +1461,7 @@ msgstr ""
 #. module: base
 #: help:ir.rule.group,global:0
 msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
+msgstr "Tee see reegel globaalseks, Teisel juhul peab ta panema gruppi"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
@@ -1471,7 +1479,7 @@ msgstr "Hetke määr"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Greek / Ελληνικά"
-msgstr ""
+msgstr "Greeka / Ελληνικά"
 
 #. module: base
 #: view:ir.values:0
@@ -1506,7 +1514,7 @@ msgstr "Kinnitus"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Enter at least one field !"
-msgstr ""
+msgstr "Sisesta vähemalt üks väli!"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -1557,7 +1565,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not write in this document! (%s)"
-msgstr ""
+msgstr "Sa ei saa kirjutada sellesse dokumenti! (%s)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1717,7 +1725,7 @@ msgstr "Kehtiv"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not delete this document! (%s)"
-msgstr ""
+msgstr "Sa ei saa kustutada seda dokumenti! (%s)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1728,7 +1736,7 @@ msgstr "XSL"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr ""
+msgstr "Ei saa uuendata moodulit '%s'. See pole paigaldatud"
 
 #. module: base
 #: model:res.country,name:base.cu
@@ -1972,7 +1980,7 @@ msgstr "Moodul"
 #: model:ir.actions.act_window,name:base.action_res_bank_form
 #: model:ir.ui.menu,name:base.menu_action_res_bank_form
 msgid "Bank List"
-msgstr ""
+msgstr "Bankade nimekiri"
 
 #. module: base
 #: field:ir.attachment,description:0
@@ -2047,7 +2055,7 @@ msgstr ""
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify an action to launch !"
-msgstr ""
+msgstr "Palun määra toiming, mida alustada!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2113,7 +2121,7 @@ msgstr "terp-konto"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Recursion error in modules dependencies !"
-msgstr ""
+msgstr "Rekursiooni viga moodulite sõltuvustes !"
 
 #. module: base
 #: view:ir.model:0
@@ -2377,12 +2385,14 @@ msgid ""
 "spreadsheet software. The file encoding is UTF-8. You have to translate the "
 "latest column before reimporting it."
 msgstr ""
+"Salvetsa see dokument .CSV faili ja ava oma lemmik tabelarvutusprogrammiga. "
+"Faili kodeering on UTF-8. Sa pead tõlkima viimase veeru enne taasimportimist."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Kliendid"
 
 #. module: base
 #: model:res.country,name:base.au
@@ -2556,6 +2566,8 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"Sa püüad uuendada moodulit, mis sõltub moodulist: %s.\n"
+"Aga seda moodulit pole sinu süsteemis saadaval."
 
 #. module: base
 #: view:res.partner.address:0
@@ -2571,7 +2583,7 @@ msgstr "Litsents"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Invalid operation"
-msgstr ""
+msgstr "Sobimatu tegevus"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2615,7 +2627,7 @@ msgstr "Mooduli import"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the field '%s' !"
-msgstr ""
+msgstr "Sa ei saa eemaldada välja '%s'!"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -2647,7 +2659,7 @@ msgstr "%c - Sobiv kuupäeva ja aja esitlus."
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Finland / Suomi"
-msgstr ""
+msgstr "Soome / Suomi"
 
 #. module: base
 #: model:res.country,name:base.bo
@@ -2694,6 +2706,7 @@ msgstr "Reeglid"
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
+"Proovid eemaldada moodulit, mis on juba paigaldatud või alles paigaldamisel"
 
 #. module: base
 #: help:ir.values,key2:0
@@ -2855,7 +2868,7 @@ msgstr "Turvalisus"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Using a relation field which uses an unknown object"
-msgstr ""
+msgstr "Kasutan seose välja, mis omakorda kasutab tundmatut objekti"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -3165,7 +3178,7 @@ msgstr "Näidisandmed"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (UK)"
-msgstr ""
+msgstr "Inglise (Suurbritannia)"
 
 #. module: base
 #: model:res.country,name:base.aq
@@ -3190,7 +3203,7 @@ msgstr "Veeb"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "Inglise (CA)"
 
 #. module: base
 #: field:res.partner.event,planned_revenue:0
@@ -3315,7 +3328,7 @@ msgstr "Panga tüüp"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "The name of the group can not start with \"-\""
-msgstr ""
+msgstr "Grupi nimi ei tohi alata \"-\" märgiga"
 
 #. module: base
 #: wizard_view:module.upgrade,end:0
@@ -3380,7 +3393,7 @@ msgstr "Kuhja"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Tree can only be used in tabular reports"
-msgstr ""
+msgstr "Puud saab kasutada ainult tabulaarsetes aruannetes"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -3908,7 +3921,7 @@ msgstr "Mosambiik"
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Manage Menus"
-msgstr ""
+msgstr "Halda menüüsid"
 
 #. module: base
 #: field:ir.actions.server,message:0
@@ -4012,7 +4025,7 @@ msgstr "Mongoolia"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Tõrge"
 
 #. module: base
 #: view:res.partner.som:0
@@ -4062,7 +4075,7 @@ msgstr "Failivorming"
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr ""
+msgstr "ISO kood"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_view
@@ -4318,7 +4331,7 @@ msgstr "Objekti väli"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "Prantsuse (CH) / Français (CH)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4392,7 +4405,7 @@ msgstr "Tühista eemaldus"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr ""
+msgstr "Suhtlemine"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -4403,7 +4416,7 @@ msgstr "ir.server.object.lines"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
-msgstr ""
+msgstr "Moodul %s: Vigane kvaliteedisertifikaat"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -4439,7 +4452,7 @@ msgstr "res.partner.event"
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
-msgstr ""
+msgstr "Aksepteeritud kasutajad"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4600,6 +4613,8 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
+"Ei saa luua mooduli faili:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_update
@@ -4615,7 +4630,7 @@ msgstr "Jätka"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "Tai / ภาษาไทย"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -4712,7 +4727,7 @@ msgstr "Objektid"
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Valitav"
 
 #. module: base
 #: view:res.request.link:0
@@ -4774,7 +4789,7 @@ msgstr "Saalomoni Saared"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Ligipääsuviga"
 
 #. module: base
 #: view:res.lang:0
@@ -4903,12 +4918,12 @@ msgstr "STOCK_GO_BACK"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "Üldised seadistused"
 
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Kohandatud kiirklahvid"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -4954,7 +4969,7 @@ msgstr "Python kood"
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr ""
+msgstr "Ei saa luua mooduli faili: %s !"
 
 #. module: base
 #: model:ir.module.module,description:base.module_meta_information
@@ -4980,7 +4995,7 @@ msgstr "Tühista"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr ""
+msgstr "Palun määra serveril valik --smtp-from!"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -5378,7 +5393,7 @@ msgstr "Aktiivsed partneri sündmused"
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Kontaktifunktsioonid"
 
 #. module: base
 #: view:multi_company.default:0
@@ -5421,7 +5436,7 @@ msgstr "Valik"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "Otsinguvaade"
 
 #. module: base
 #: field:ir.rule,domain_force:0
@@ -5531,7 +5546,7 @@ msgstr "Python toiming"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (US)"
-msgstr ""
+msgstr "Inglise (USA)"
 
 #. module: base
 #: field:res.partner.event,probability:0
@@ -5574,7 +5589,7 @@ msgstr "Tegevus"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Postiaadress"
 
 #. module: base
 #: field:res.company,parent_id:0
@@ -5719,7 +5734,7 @@ msgstr ""
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "This error occurs on database %s"
-msgstr ""
+msgstr "See viga juhtus andmebaasis %s"
 
 #. module: base
 #: wizard_button:base.module.import,init,import:0
@@ -5773,13 +5788,13 @@ msgstr "Kaskaad"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Väli %d peaks olema number"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
 #: model:ir.ui.menu,name:base.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Vaikimisi firma objektikohta"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -8044,73 +8059,74 @@ msgstr "Vene keel / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8120,13 +8136,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index 0598e9173ce..a5bf4a24011 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index fdb2fe97e75..0aa5c25bfbb 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:58+0000\n"
+"PO-Revision-Date: 2010-09-09 18:36+0000\n"
 "Last-Translator: Sadegh Ismael Nattaj <nat@sethack.com>\n"
 "Language-Team: OpenERP Iran <info@openerp-iran.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
@@ -8084,73 +8084,74 @@ msgstr "روسی / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "نمی‌توانید دو کاربر با یک لاگین داشته باشید!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8160,13 +8161,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index a2b99740d52..4e1a3189281 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.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: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8082,78 +8082,78 @@ msgstr "Sri Lanka"
 msgid "Russian / русский язык"
 msgstr "Venäjä / русский язык"
 
- 
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8163,13 +8163,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 9fbec3d4981..49ba7240160 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-03 07:19+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-09-16 19:03+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -34,7 +34,7 @@ msgstr "%j - Jour de l'année comme un nombre décimal [001,366]."
 #. module: base
 #: field:ir.values,meta_unpickle:0
 msgid "Metadata"
-msgstr "Métadonnées"
+msgstr "Méta-données"
 
 #. module: base
 #: field:ir.ui.view,arch:0
@@ -58,7 +58,7 @@ msgstr "Code (ex:fr__FR)"
 #: field:workflow.activity,wkf_id:0
 #: field:workflow.instance,wkf_id:0
 msgid "Workflow"
-msgstr "Processus"
+msgstr "Flux métier"
 
 #. module: base
 #: view:wizard.module.lang.export:0
@@ -74,7 +74,7 @@ msgstr "Hongrois / Magyar"
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr "Diagramme de flux actif"
+msgstr "Flux métier sur objet"
 
 #. module: base
 #: view:ir.module.module:0
@@ -107,13 +107,11 @@ msgid ""
 "understand. You will be able to switch to the extended view later.\n"
 "            "
 msgstr ""
-"Choisir entre \"Interface Simplifée\" et \"Interface Étendue\".\n"
+"Choisissez entre \"Interface Simplifée\" et \"Interface Étendue\".\n"
 "Si vous testez ou utilisez OpenERP pour la première fois, nous vous "
-"suggerons d'utiliser\n"
-"l'interface simplifiée, qui a moins d'option et de champ mais qui sera plus "
-"facile a \n"
-"comprendre. Vous pourrez basculer ultérieurement dans la vue étendu plus "
-"tard.\n"
+"suggérons d'utiliser l'interface simplifiée, qui a moins d'options et de "
+"champs mais sera plus facile à comprendre. Vous pourrez basculer "
+"ultérieurement dans la vue étendue.\n"
 "            "
 
 #. module: base
@@ -8117,73 +8115,74 @@ msgstr "Russie / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Vous ne pouvez pas avoir deux utilsiateurs avec le même login !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8193,13 +8192,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 5c077ce5b88..5d303846db7 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7807,12 +7807,6 @@ msgstr ""
 msgid "Seychelles"
 msgstr ""
 
-#. module: base
-#: code:addons/base/res/res_user.py:0
-#, python-format
-msgid "You can not have two users with the same login !"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
@@ -7945,68 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
+#. module: base
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr ""
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8016,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 2426ccb5e54..40e0f35f606 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8021,73 +8021,74 @@ msgstr "רוסית / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8097,13 +8098,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 651775fa941..679d8a9bf38 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:15+0000\n"
+"PO-Revision-Date: 2010-09-09 07:03+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -7984,73 +7984,74 @@ msgstr "Ruski / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8060,13 +8061,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 7698a7a7050..4a1e1c08a53 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.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: 2010-07-13 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,73 +7938,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8014,13 +8015,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index d7ff94230a0..27beb420c03 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-29 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7950,73 +7950,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8026,13 +8027,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index d816f03a2ad..c1ee9927d16 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.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: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index f824cbc7431..75981ae4507 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:23+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-19 17:45+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -78,7 +78,7 @@ msgstr "Flusso di lavoro per"
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Viste Create"
 
 #. module: base
 #: view:workflow.activity:0
@@ -496,7 +496,7 @@ msgstr "Descrizione Modello"
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
-msgstr ""
+msgstr "Espressione attivatrice"
 
 #. module: base
 #: model:res.country,name:base.jo
@@ -1119,6 +1119,9 @@ msgid ""
 "consider the present one as void. Do not hesitate to contact our accounting "
 "department at (+32).81.81.37.00."
 msgstr ""
+"Se il vostro pagamento è stato effettuato prima del ricevimento di questa "
+"mail, prego considerate nullo questo avvertimento. Non esitate a contattare "
+"la nostra amministrazione al (+32).81.81.37.00."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2342,7 +2345,7 @@ msgstr "Liechtenstein"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
 msgid "Ltd"
-msgstr "Srl"
+msgstr "Ltd"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -2610,7 +2613,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "Vincoli SQL"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -3284,6 +3287,9 @@ msgid ""
 "\"%s\" contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
+"\"%s\" contiene troppi punti. Gli IDS XML non devono contenere punti! Questi "
+"sono usati per riferisti ad altri modelli di dato, come in: "
+"module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3471,7 +3477,7 @@ msgstr "Indirizzi Partner"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Indonesian / Bahasa Indonesia"
-msgstr ""
+msgstr "Indonesiano / Bahasa Indonesiano"
 
 #. module: base
 #: model:res.country,name:base.cv
@@ -3858,7 +3864,7 @@ msgstr "Contratto di manutenzione"
 #. module: base
 #: help:ir.actions.server,trigger_obj_id:0
 msgid "Select the object from the model on which the workflow will executed."
-msgstr ""
+msgstr "Seleziona l'oggetto dal modello su cui il workflow verrà eseguito."
 
 #. module: base
 #: field:ir.model,state:0
@@ -3958,7 +3964,7 @@ msgstr "Messaggio"
 #. module: base
 #: field:ir.actions.act_window.view,multi:0
 msgid "On Multiple Doc."
-msgstr ""
+msgstr "Su multipli doc."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config_contact
@@ -4163,7 +4169,7 @@ msgstr "a4"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Rif. Vista Ricerca"
 
 #. module: base
 #: view:ir.rule.group:0
@@ -4433,7 +4439,7 @@ msgstr "Annulla Disinstallazione"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicazione"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
@@ -4444,7 +4450,7 @@ msgstr "ir.server.object.lines"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
-msgstr ""
+msgstr "Modulo %s: Certificato di qualità non valido"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -4463,6 +4469,9 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
+"Questo è il nome file dell'allegato usato per immagazzinare il risultato "
+"della stampa. Lasciare vuoto per non salvare il report stampato. Puoi usare "
+"una espressione di python con l'oggetto e le variabili temporali."
 
 #. module: base
 #: model:res.country,name:base.ng
@@ -4477,7 +4486,7 @@ msgstr "res.partner.event"
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
-msgstr ""
+msgstr "Utenti accettati"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4487,7 +4496,7 @@ msgstr "STOCK_UNDERLINE"
 #. module: base
 #: view:ir.values:0
 msgid "Values for Event Type"
-msgstr ""
+msgstr "Valori per i Tipi di Evento"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
@@ -4508,6 +4517,8 @@ msgstr "Hong Kong"
 #: help:ir.actions.server,name:0
 msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
 msgstr ""
+"E' facile riferisti all'azione per nome es. Un ordine di vendita -> molte "
+"fatture"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_10
@@ -4522,12 +4533,12 @@ msgstr "STOCK_BOLD"
 #. module: base
 #: model:res.country,name:base.ph
 msgid "Philippines"
-msgstr ""
+msgstr "Filippine"
 
 #. module: base
 #: model:res.country,name:base.ma
 msgid "Morocco"
-msgstr ""
+msgstr "Marocco"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4579,12 +4590,12 @@ msgstr "Rapporto di Introspezione su Oggetti"
 #. module: base
 #: model:res.country,name:base.pf
 msgid "Polynesia (French)"
-msgstr ""
+msgstr "Polinesia (Francese)"
 
 #. module: base
 #: model:res.country,name:base.dm
 msgid "Dominica"
-msgstr ""
+msgstr "Repubblica Dominicana"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
@@ -4594,7 +4605,7 @@ msgstr "Valore Valuta"
 #. module: base
 #: model:res.country,name:base.np
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. module: base
 #: field:res.partner.event,event_ical_id:0
@@ -4638,6 +4649,8 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
+"Impossibile creare il file di modulo:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_update
@@ -4653,13 +4666,13 @@ msgstr "Continua"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "Thailandia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form
 msgid "Default Properties"
-msgstr ""
+msgstr "Proprietà predefinite"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -4669,7 +4682,7 @@ msgstr "Slovenian / slovenščina"
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
 msgid "Reload from Attachment"
-msgstr ""
+msgstr "Ricarica dall'allegato"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -4750,7 +4763,7 @@ msgstr "Oggetti"
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Selezionabile"
 
 #. module: base
 #: view:res.request.link:0
@@ -4781,7 +4794,7 @@ msgstr "terp-stock"
 #. module: base
 #: model:res.country,name:base.ae
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Emirati Arabi Uniti"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4801,7 +4814,7 @@ msgstr "Globale"
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
-msgstr ""
+msgstr "Repubblica Ceca"
 
 #. module: base
 #: model:res.country,name:base.sb
@@ -4812,7 +4825,7 @@ msgstr "Isole Salomone"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "Errore in Accesso"
 
 #. module: base
 #: view:res.lang:0
@@ -4833,12 +4846,12 @@ msgstr "Riempimento Numero"
 #. module: base
 #: model:res.country,name:base.ua
 msgid "Ukraine"
-msgstr ""
+msgstr "Ucraina"
 
 #. module: base
 #: model:res.country,name:base.to
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_category
@@ -4849,7 +4862,7 @@ msgstr "Categoria Modulo"
 #. module: base
 #: model:res.country,name:base.us
 msgid "United States"
-msgstr ""
+msgstr "Stati Uniti d'America"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -4859,7 +4872,7 @@ msgstr "Guida di Riferimento"
 #. module: base
 #: model:res.country,name:base.ml
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4940,22 +4953,22 @@ msgstr "STOCK_GO_BACK"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "General Settings"
-msgstr ""
+msgstr "Impostazioni generali"
 
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Scorciatoie personalizzate"
 
 #. module: base
 #: model:res.country,name:base.dz
 msgid "Algeria"
-msgstr ""
+msgstr "Algeria"
 
 #. module: base
 #: model:res.country,name:base.be
 msgid "Belgium"
-msgstr ""
+msgstr "Belgio"
 
 #. module: base
 #: field:ir.translation,lang:0
@@ -4970,7 +4983,7 @@ msgstr "Lingua"
 #. module: base
 #: model:res.country,name:base.gm
 msgid "Gambia"
-msgstr ""
+msgstr "Gambia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_form
@@ -4991,7 +5004,7 @@ msgstr "Codice Python"
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr ""
+msgstr "Impossibile creare il file del modulo: %s !"
 
 #. module: base
 #: model:ir.module.module,description:base.module_meta_information
@@ -5017,7 +5030,7 @@ msgstr "Annulla"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify server option --smtp-from !"
-msgstr ""
+msgstr "Per favore specificare l'opzione server --smtp-from !"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -5063,7 +5076,7 @@ msgstr "Versione Pubblicata"
 #. module: base
 #: model:res.country,name:base.is
 msgid "Iceland"
-msgstr ""
+msgstr "Islanda"
 
 #. module: base
 #: view:res.users:0
@@ -5074,7 +5087,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.de
 msgid "Germany"
-msgstr ""
+msgstr "Germania"
 
 #. module: base
 #: view:ir.sequence:0
@@ -5117,7 +5130,7 @@ msgstr "Ricorda di uscire e rientrare se hai cambiato la password"
 #. module: base
 #: model:res.country,name:base.gy
 msgid "Guyana"
-msgstr ""
+msgstr "Guyana"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -5142,18 +5155,20 @@ msgstr "Creato Id"
 #. module: base
 #: model:res.country,name:base.hn
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. module: base
 #: model:res.country,name:base.eg
 msgid "Egypt"
-msgstr ""
+msgstr "Egitto"
 
 #. module: base
 #: help:ir.actions.server,model_id:0
 msgid ""
 "Select the object on which the action will work (read, write, create)."
 msgstr ""
+"Seleziona l'oggetto sul quale l'azione dovrà lavorare (lettura, scrittura, "
+"creazione)."
 
 #. module: base
 #: view:ir.model:0
@@ -5192,7 +5207,7 @@ msgstr "Da installare"
 #: model:ir.module.module,shortdesc:base.module_meta_information
 #: field:res.currency,base:0
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: base
 #: model:res.country,name:base.lr
@@ -5231,7 +5246,7 @@ msgstr "Imposta"
 #. module: base
 #: model:res.country,name:base.mc
 msgid "Monaco"
-msgstr ""
+msgstr "Principato di Monaco"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -5263,12 +5278,12 @@ msgstr "Crea"
 #. module: base
 #: field:ir.exports,export_fields:0
 msgid "Export ID"
-msgstr ""
+msgstr "ID esportazione"
 
 #. module: base
 #: model:res.country,name:base.fr
 msgid "France"
-msgstr ""
+msgstr "Francia"
 
 #. module: base
 #: field:workflow.activity,flow_stop:0
@@ -5278,18 +5293,18 @@ msgstr "Arresta Flusso"
 #. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
 #. module: base
 #: model:res.country,name:base.af
 msgid "Afghanistan, Islamic State of"
-msgstr ""
+msgstr "Stato islamico dell'Afghanistan"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_module_import.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Errore !"
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_contry
@@ -5326,7 +5341,7 @@ msgstr "Separatore delle migliaia"
 #. module: base
 #: field:res.request,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Data di Creazione"
 
 #. module: base
 #: selection:ir.report.custom,type:0
@@ -5339,6 +5354,8 @@ msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
 msgstr ""
+"Scegli l'azione che verrà eseguita. Azioni ricorsive non saranno disponibili "
+"dentro il ciclo."
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5378,7 +5395,7 @@ msgstr "Azienda"
 #. module: base
 #: model:res.country,name:base.pa
 msgid "Panama"
-msgstr ""
+msgstr "Panama"
 
 #. module: base
 #: selection:ir.report.custom,state:0
@@ -5411,12 +5428,12 @@ msgstr "Eventi Partner Attivi"
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Funzioni Contatto"
 
 #. module: base
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi Azienda"
 
 #. module: base
 #: view:ir.sequence:0
@@ -5426,7 +5443,7 @@ msgstr "Giorno dell'anno: %(doy)s"
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr ""
+msgstr "Zona neutrale"
 
 #. module: base
 #: view:ir.model:0
@@ -5454,7 +5471,7 @@ msgstr "Selezione"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr ""
+msgstr "Vista di Ricerca"
 
 #. module: base
 #: field:ir.rule,domain_force:0
@@ -5465,6 +5482,7 @@ msgstr "Forza Dominio"
 #: help:ir.sequence,weight:0
 msgid "If two sequences match, the highest weight will be used."
 msgstr ""
+"se due sequenze soddisfano, quella col peso maggiore sarà utilizzata."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
@@ -5519,12 +5537,12 @@ msgstr "Città"
 #. module: base
 #: model:res.country,name:base.qa
 msgid "Qatar"
-msgstr ""
+msgstr "Qatar"
 
 #. module: base
 #: model:res.country,name:base.it
 msgid "Italy"
-msgstr ""
+msgstr "Italia"
 
 #. module: base
 #: selection:ir.rule,operator:0
@@ -5554,7 +5572,7 @@ msgstr "GPL-3 o versione successiva"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML(Mako)"
-msgstr ""
+msgstr "HTML da HTML (MAKO)"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -5564,7 +5582,7 @@ msgstr "Puthon Attivo"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (US)"
-msgstr ""
+msgstr "Inglese Americano (U.S.A.)"
 
 #. module: base
 #: field:res.partner.event,probability:0
@@ -5607,7 +5625,7 @@ msgstr "Attività"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Indirizzo postale"
 
 #. module: base
 #: field:res.company,parent_id:0
@@ -5622,7 +5640,7 @@ msgstr "Valore"
 #. module: base
 #: model:res.country,name:base.cg
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports_line
@@ -5675,6 +5693,8 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
+"Oggetto nel quale vuoi creare/scrivere l'oggetto. Se vuoto allora si "
+"riferisce al campo oggetto."
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5685,7 +5705,7 @@ msgstr "Non installato"
 #. module: base
 #: field:workflow.activity,out_transitions:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Transizioni in Uscita"
 
 #. module: base
 #: field:ir.ui.menu,icon:0
@@ -5713,7 +5733,7 @@ msgstr "Richieste"
 #. module: base
 #: model:res.country,name:base.ye
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #. module: base
 #: selection:workflow.activity,split_mode:0
@@ -5723,17 +5743,17 @@ msgstr "Or"
 #. module: base
 #: model:res.country,name:base.pk
 msgid "Pakistan"
-msgstr ""
+msgstr "Pakistan"
 
 #. module: base
 #: model:res.country,name:base.al
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 #. module: base
 #: model:res.country,name:base.ws
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -5744,13 +5764,13 @@ msgstr "ID dipendenti"
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr ""
+msgstr "Problema nella configurazione 'Record Id' nell'azione del Server!"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "This error occurs on database %s"
-msgstr ""
+msgstr "Questo errore è avvenuto sul database %s"
 
 #. module: base
 #: wizard_button:base.module.import,init,import:0
@@ -5767,7 +5787,7 @@ msgstr "STOCK_DISCONNECT"
 #. module: base
 #: model:res.country,name:base.la
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -5783,7 +5803,7 @@ msgstr "Risincronizza i termini"
 #. module: base
 #: model:res.country,name:base.tg
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -5804,13 +5824,13 @@ msgstr "A Cascata"
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Field %d should be a figure"
-msgstr ""
+msgstr "Il campo %d dovrebbe essere una figura"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_inventory_form
 #: model:ir.ui.menu,name:base.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Azienda Predefinita per Oggetto"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -5825,7 +5845,7 @@ msgstr "Commento"
 #. module: base
 #: model:res.country,name:base.ro
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -5879,7 +5899,7 @@ msgstr "Inizia Installazione"
 #. module: base
 #: help:res.lang,code:0
 msgid "This field is used to set/get locales for user"
-msgstr ""
+msgstr "Questo campo è usato per impostare/leggere fuso locale per utente"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
@@ -5923,7 +5943,7 @@ msgstr "Utente"
 #. module: base
 #: model:res.country,name:base.pr
 msgid "Puerto Rico"
-msgstr ""
+msgstr "Porto Rico"
 
 #. module: base
 #: code:addons/base/res/res_currency.py:0
@@ -5933,6 +5953,9 @@ msgid ""
 "' \\n                    'for the currency: %s \n"
 "' \\n                    'at the date: %s"
 msgstr ""
+"Nessun tasso trovato \n"
+"'\\n' per valuta: %s \n"
+"'\\n' alla data: %s"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5948,7 +5971,7 @@ msgstr "Filtro"
 #. module: base
 #: model:res.country,name:base.ch
 msgid "Switzerland"
-msgstr ""
+msgstr "Svizzera"
 
 #. module: base
 #: model:res.country,name:base.gd
@@ -5984,7 +6007,7 @@ msgstr "Aggiornamento di Sistema Completato"
 #. module: base
 #: model:res.country,name:base.so
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_simple_view_form
@@ -6038,7 +6061,7 @@ msgstr "Nome Report"
 #. module: base
 #: field:ir.module.module,shortdesc:0
 msgid "Short Description"
-msgstr ""
+msgstr "Descrizione breve"
 
 #. module: base
 #: field:res.partner.event,partner_type:0
@@ -6058,7 +6081,7 @@ msgstr "Formato Orario 00->24: %(h24)s"
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr ""
+msgstr "Seleziona la propietà del campo"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -6087,12 +6110,12 @@ msgstr "Sequenza"
 #. module: base
 #: model:res.country,name:base.tn
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
 
 #. module: base
 #: field:ir.actions.wizard,name:0
 msgid "Wizard Info"
-msgstr ""
+msgstr "Informazioni procedura guidata"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -6128,7 +6151,7 @@ msgstr "Propensioni"
 #: model:ir.actions.act_window,name:base.action_country_state
 #: model:ir.ui.menu,name:base.menu_country_state_partner
 msgid "Fed. States"
-msgstr ""
+msgstr "Stati Federali"
 
 #. module: base
 #: view:ir.model:0
@@ -6149,7 +6172,7 @@ msgstr "Superiore"
 #. module: base
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Sto ritornando"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -6230,7 +6253,7 @@ msgstr "Tabulare"
 #. module: base
 #: field:ir.actions.todo,start_on:0
 msgid "Start On"
-msgstr ""
+msgstr "Inizio a"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
@@ -6304,7 +6327,7 @@ msgstr "Tutti i Termini"
 #. module: base
 #: model:res.country,name:base.no
 msgid "Norway"
-msgstr ""
+msgstr "Norvegia"
 
 #. module: base
 #: view:res.lang:0
@@ -6353,6 +6376,8 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Se impostato a vero, la procedura guidata non verrà visualizzata nella barra "
+"degli strumenti a destra nella vista: modulo."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -6421,18 +6446,18 @@ msgstr "SMS"
 #. module: base
 #: model:res.country,name:base.cr
 msgid "Costa Rica"
-msgstr ""
+msgstr "Costa Rica"
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "Your can't submit bug reports due to uncovered modules: %s"
-msgstr ""
+msgstr "Non puoi sottoporre report di errori dovuto a moduli non coperti: %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr ""
+msgstr "Altri Partner"
 
 #. module: base
 #: view:ir.model:0
@@ -6460,7 +6485,7 @@ msgstr "Deseleziona il campo attivo per nascondere il contatto."
 #. module: base
 #: model:res.country,name:base.dk
 msgid "Denmark"
-msgstr ""
+msgstr "Danimarca"
 
 #. module: base
 #: field:res.country,code:0
@@ -6485,12 +6510,12 @@ msgstr "Signora"
 #. module: base
 #: model:res.country,name:base.ee
 msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
 
 #. module: base
 #: model:res.country,name:base.nl
 msgid "Netherlands"
-msgstr ""
+msgstr "Olanda"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_4
@@ -6520,7 +6545,7 @@ msgstr "STOCK_ZOOM_FIT"
 #. module: base
 #: model:res.country,name:base.cd
 msgid "Congo, The Democratic Republic of the"
-msgstr ""
+msgstr "Repubblica Democratica del Congo"
 
 #. module: base
 #: view:res.request:0
@@ -6532,12 +6557,12 @@ msgstr "Richiesta"
 #. module: base
 #: model:res.country,name:base.jp
 msgid "Japan"
-msgstr ""
+msgstr "Giappone"
 
 #. module: base
 #: field:ir.cron,numbercall:0
 msgid "Number of Calls"
-msgstr ""
+msgstr "Numero di chiamate"
 
 #. module: base
 #: wizard_view:module.lang.install,start:0
@@ -6577,7 +6602,7 @@ msgstr "Aggiungi Intestazione RML"
 #. module: base
 #: model:res.country,name:base.gr
 msgid "Greece"
-msgstr ""
+msgstr "Grecia"
 
 #. module: base
 #: field:res.request,trigger_date:0
@@ -6597,7 +6622,7 @@ msgstr "STOCK_GO_FORWARD"
 #. module: base
 #: help:ir.actions.server,code:0
 msgid "Python code to be executed"
-msgstr ""
+msgstr "Codice python da eseguire"
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
@@ -6607,7 +6632,7 @@ msgstr "Disinstallabile"
 #. module: base
 #: view:res.partner.category:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Categoria Partner"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -6740,12 +6765,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nc
 msgid "New Caledonia (French)"
-msgstr ""
+msgstr "Nuova Caledonia (Francese)"
 
 #. module: base
 #: field:res.partner.function,name:0
 msgid "Function Name"
-msgstr ""
+msgstr "Nome funzione"
 
 #. module: base
 #: view:maintenance.contract.wizard:0
@@ -6755,7 +6780,7 @@ msgstr "_Annulla"
 #. module: base
 #: model:res.country,name:base.cy
 msgid "Cyprus"
-msgstr ""
+msgstr "Cipro"
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -6794,18 +6819,18 @@ msgstr "Transizioni in Ingresso"
 #. module: base
 #: model:res.country,name:base.cn
 msgid "China"
-msgstr ""
+msgstr "Cina"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Password empty !"
-msgstr ""
+msgstr "Manca la Password !"
 
 #. module: base
 #: model:res.country,name:base.eh
 msgid "Western Sahara"
-msgstr ""
+msgstr "Sahara Occidentale"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow
@@ -6815,7 +6840,7 @@ msgstr "Workflow"
 #. module: base
 #: model:res.country,name:base.id
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 #. module: base
 #: selection:ir.actions.todo,start_on:0
@@ -6830,12 +6855,12 @@ msgstr "Scrivi Oggetto"
 #. module: base
 #: model:res.country,name:base.bg
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #. module: base
 #: model:res.country,name:base.ao
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #. module: base
 #: model:res.country,name:base.tf
@@ -6913,7 +6938,7 @@ msgstr "child_of"
 #: view:res.users:0
 #: field:res.users,company_ids:0
 msgid "Accepted Companies"
-msgstr ""
+msgstr "Aziende accettate"
 
 #. module: base
 #: field:ir.report.custom.fields,operation:0
@@ -6935,7 +6960,7 @@ msgstr "Kiribati"
 #. module: base
 #: model:res.country,name:base.iq
 msgid "Iraq"
-msgstr ""
+msgstr "Iraq"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7024,7 +7049,7 @@ msgstr "Condizione"
 #. module: base
 #: model:res.country,name:base.zr
 msgid "Zaire"
-msgstr ""
+msgstr "Zaire"
 
 #. module: base
 #: field:ir.attachment,res_id:0
@@ -7089,7 +7114,7 @@ msgstr "Termini non tradotti"
 #. module: base
 #: wizard_view:module.lang.import,init:0
 msgid "Import New Language"
-msgstr ""
+msgstr "Importa nuova lingua"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_workflow_activity_form
@@ -7117,7 +7142,7 @@ msgstr "="
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Second field should be figures"
-msgstr ""
+msgstr "Il secondo campo dovrebbe contenere figure"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_grid_security
@@ -7141,7 +7166,7 @@ msgstr "Alta"
 #. module: base
 #: field:ir.exports.line,export_id:0
 msgid "Export"
-msgstr ""
+msgstr "Esporta"
 
 #. module: base
 #: help:res.bank,bic:0
@@ -7151,7 +7176,7 @@ msgstr "Codice Identificazione Banca"
 #. module: base
 #: model:res.country,name:base.tm
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #. module: base
 #: model:res.country,name:base.pm
@@ -7196,12 +7221,12 @@ msgstr "STOCK_CONVERT"
 #. module: base
 #: model:res.country,name:base.tz
 msgid "Tanzania"
-msgstr ""
+msgstr "Tanzania"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Danish / Dansk"
-msgstr ""
+msgstr "Danese / Danimarca"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -7273,6 +7298,8 @@ msgid ""
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
 "may be uploaded to launchpad."
 msgstr ""
+"Salva questo documento come file .tgz. Questo archivio contiene %s file UTF-"
+"8 e può essere inviato a Launchpad."
 
 #. module: base
 #: wizard_button:module.upgrade,end,config:0
@@ -7288,7 +7315,7 @@ msgstr "Catalan / Català"
 #. module: base
 #: model:res.country,name:base.do
 msgid "Dominican Republic"
-msgstr ""
+msgstr "Repubblica Dominicana"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7298,13 +7325,13 @@ msgstr "STOCK_COLOR_PICKER"
 #. module: base
 #: model:res.country,name:base.sa
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "Arabia Saudita"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Bar charts need at least two fields"
-msgstr ""
+msgstr "I Grafici a Barre necessitano di almeno due campi"
 
 #. module: base
 #: help:res.partner,supplier:0
@@ -7329,7 +7356,7 @@ msgstr "Istanza Destinazione"
 #. module: base
 #: field:ir.actions.wizard,multi:0
 msgid "Action on Multiple Doc."
-msgstr ""
+msgstr "Azione su doc. multipli"
 
 #. module: base
 #: view:wizard.module.lang.export:0
@@ -7349,12 +7376,12 @@ msgstr "Percorso XML"
 #. module: base
 #: model:res.country,name:base.gn
 msgid "Guinea"
-msgstr ""
+msgstr "Guinea"
 
 #. module: base
 #: model:res.country,name:base.lu
 msgid "Luxembourg"
-msgstr ""
+msgstr "Lussemburgo"
 
 #. module: base
 #: model:ir.actions.todo,note:base.config_wizard_step_user
@@ -7377,7 +7404,7 @@ msgstr "Bassa"
 #. module: base
 #: view:ir.values:0
 msgid "tree_but_action, client_print_multi"
-msgstr ""
+msgstr "tree_but_action, client_print_multi"
 
 #. module: base
 #: model:res.country,name:base.sv
@@ -7398,7 +7425,7 @@ msgstr "Menu Accesso"
 #. module: base
 #: model:res.country,name:base.th
 msgid "Thailand"
-msgstr ""
+msgstr "Thailandia"
 
 #. module: base
 #: selection:ir.report.custom.fields,fc0_op:0
@@ -7416,7 +7443,7 @@ msgstr "Permesso di cancellazione"
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "multi_company.default"
-msgstr ""
+msgstr "multi_company.default"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -7445,7 +7472,7 @@ msgstr "<"
 #. module: base
 #: model:res.country,name:base.uz
 msgid "Uzbekistan"
-msgstr ""
+msgstr "Uzbekistan"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window
@@ -7456,12 +7483,12 @@ msgstr "ir.actions.act_window"
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
-msgstr ""
+msgstr "Isole Vergini (Stati Uniti d'America)"
 
 #. module: base
 #: model:res.country,name:base.tw
 msgid "Taiwan"
-msgstr ""
+msgstr "Taiwan"
 
 #. module: base
 #: view:ir.rule:0
@@ -7570,7 +7597,7 @@ msgstr "Accesso"
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovak Republic"
-msgstr ""
+msgstr "Repubblica Slovacca"
 
 #. module: base
 #: model:res.country,name:base.aw
@@ -7612,7 +7639,7 @@ msgstr "Aggiungere il contratto di manutenzione"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
-msgstr ""
+msgstr "Vietnam / Cộng hòa xã hội chủ nghĩa Việt Nam"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -7628,7 +7655,7 @@ msgstr "Flusso di lavoro da eseguire su questo modello."
 #. module: base
 #: model:res.country,name:base.jm
 msgid "Jamaica"
-msgstr ""
+msgstr "Giamaica"
 
 #. module: base
 #: model:res.country,name:base.az
@@ -7654,7 +7681,7 @@ msgstr "Gibilterra"
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
-msgstr ""
+msgstr "Isole Vergini (Gran Bretagna)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7674,7 +7701,7 @@ msgstr "Wallis e Fortuna"
 #. module: base
 #: model:res.country,name:base.rw
 msgid "Rwanda"
-msgstr ""
+msgstr "Ruanda"
 
 #. module: base
 #: constraint:res.partner:0
@@ -7703,6 +7730,9 @@ msgid ""
 "invoice, then `object.invoice_address_id.mobile` is the field which gives "
 "the correct mobile number"
 msgstr ""
+"Fornisce campi che possono essere usati per reperire il numero di celluare, "
+"ad esempio: seleziona la fattura, poi 'object.invoice_address_id.mobile' è "
+"il campo che da il corretto numero di cellulare"
 
 #. module: base
 #: field:ir.model.data,noupdate:0
@@ -7712,12 +7742,12 @@ msgstr "Non Aggiornabile"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Klingon"
-msgstr ""
+msgstr "Klingon"
 
 #. module: base
 #: model:res.country,name:base.sg
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
@@ -7854,7 +7884,7 @@ msgstr "Procedure di Configurazione"
 #. module: base
 #: field:res.lang,code:0
 msgid "Locale Code"
-msgstr ""
+msgstr "Codice Locale"
 
 #. module: base
 #: field:workflow.activity,split_mode:0
@@ -7874,7 +7904,7 @@ msgstr "Interfaccia Semplice"
 #. module: base
 #: model:res.country,name:base.cl
 msgid "Chile"
-msgstr ""
+msgstr "Cile"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7912,7 +7942,7 @@ msgstr "Salva come Prefisso Allegato"
 #. module: base
 #: model:res.country,name:base.hr
 msgid "Croatia"
-msgstr ""
+msgstr "Croazia"
 
 #. module: base
 #: field:ir.actions.server,mobile:0
@@ -7947,7 +7977,7 @@ msgstr "Seychelles"
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
-msgstr ""
+msgstr "Sierra Leone"
 
 #. module: base
 #: view:res.company:0
@@ -8013,12 +8043,12 @@ msgstr "Istanze Workflow"
 #: code:addons/base/res/partner/partner.py:0
 #, python-format
 msgid "Partners: "
-msgstr ""
+msgstr "Partners: "
 
 #. module: base
 #: model:res.country,name:base.kp
 msgid "North Korea"
-msgstr ""
+msgstr "Corea del Nord"
 
 #. module: base
 #: view:ir.report.custom:0
@@ -8048,7 +8078,7 @@ msgstr "Polish / Język polski"
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr ""
+msgstr "Nome esportato"
 
 #. module: base
 #: help:res.partner.address,type:0
@@ -8067,7 +8097,7 @@ msgstr "Scegli una lingua da installare"
 #. module: base
 #: model:res.country,name:base.lk
 msgid "Sri Lanka"
-msgstr ""
+msgstr "Sri Lanka"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -8077,97 +8107,114 @@ msgstr "Russian / русский язык"
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
-msgstr ""
- 
+msgstr "Non puoi avere due utenti con lo stesso nome di accesso!"
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
- 
+msgstr "La dimensione del campo non può mai essere minore a 1 !"
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
- 
+msgstr "Il collegamento per questo menù esiste già!"
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+"Non puoi avere record multipli con lo stesso ID per lo stesso modulo!"
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
- 
+msgstr "Il tuo contratto di manutenzione è già sottoscritto nel sistema!"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
- 
+msgstr "Il nome del modulo deve essere unico!"
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
- 
+msgstr "L'ID del certificato del modulo deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
- 
+msgstr "Il codice della funzione Partner deve essere unica!"
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
- 
+msgstr "Il nome del Partner deve esser unico!"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
- 
+msgstr "Il nome della nazione deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
- 
+msgstr "Il codice della Nazione deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
- 
+msgstr "Il nome della lingua deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
- 
+msgstr "Il codice della lingua deve essere unico!"
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
- 
+msgstr "Il nome del gruppo deve essere unico!"
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Errore nei Vincoli"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"L'operazione non può essere completata, probabilmente in seguito a:\n"
+"- cancellazione: stai cercando di cancellare un record mentra altri record "
+"sono referenziati a esso\n"
+"- creazione/aggiornamento: un campo obbligatorio deve essere correttamente "
+"impostato"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[oggetto con referenza: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Errore di integrità"
 
 #~ msgid "Attached ID"
 #~ msgstr "ID Allegato"
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index d63110985cb..9854b3d9c55 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:43+0000\n"
+"PO-Revision-Date: 2010-09-09 06:58+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@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: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7941,73 +7941,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8017,13 +8018,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index 005f565f675..e8d4f6df07e 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7980,73 +7980,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8056,13 +8057,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index b1587b12873..5cb44432d4e 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,75 +7938,101 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
 msgstr ""
+
+#. module: base
+#: code:addons/osv/osv.py:0
+#, python-format
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
+msgstr ""
+
+#. module: base
+#: code:addons/osv/osv.py:0
+#, python-format
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
+msgstr ""
+
+#. module: base
+#: code:addons/osv/osv.py:0
+#, python-format
+msgid "Integrity Error"
+msgstr ""
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index e27d60fa081..b731641cfa7 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8075,73 +8075,74 @@ msgstr "Krievu / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8151,13 +8152,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index ec489b19ee6..521063fcfbe 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:12+0000\n"
+"PO-Revision-Date: 2010-09-13 08:00+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr ""
+msgstr "Сэйнт Хелена"
 
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
@@ -369,7 +369,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.gf
 msgid "French Guyana"
-msgstr ""
+msgstr "Франц Гуана"
 
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
@@ -534,7 +534,7 @@ msgstr "Нэмэлт Тайлан"
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "Баганан диаграм"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -559,7 +559,7 @@ msgstr "Визард харагдац"
 #. module: base
 #: model:res.country,name:base.kh
 msgid "Cambodia, Kingdom of"
-msgstr ""
+msgstr "Камбож, Хаант улс"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -577,7 +577,7 @@ msgstr "STOCK_DIALOG_QUESTION"
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Папуа Шинэ Гвиней"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
@@ -624,7 +624,7 @@ msgstr "Төлбөрийн нөхцөл"
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -701,7 +701,7 @@ msgstr "STOCK_FILE"
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
+msgstr "Гуам (USA)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_grid
@@ -774,7 +774,7 @@ msgstr "Негр"
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
-msgstr ""
+msgstr "Босни-Герцоговин"
 
 #. module: base
 #: field:ir.report.custom.fields,alignment:0
@@ -973,7 +973,7 @@ msgstr "Тайлангууд"
 #. module: base
 #: field:workflow,on_create:0
 msgid "On Create"
-msgstr ""
+msgstr "Үүсгэх үед"
 
 #. module: base
 #: wizard_view:base.module.import,init:0
@@ -1295,7 +1295,7 @@ msgstr "Испани"
 #. module: base
 #: field:res.company,logo:0
 msgid "Logo"
-msgstr "Эмблем"
+msgstr "Лого"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1415,6 +1415,9 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
+"Жагсаалт гаргах талбар эсвэл илэрхийлэл бичнэ. Жнь. Object дээр борлуулалтын "
+"захиалгыг сонговол борлуулалтын захиалгын мөрүүдээр гүйх боломжтой болно. "
+"Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1811,7 +1814,7 @@ msgstr "Австри"
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Calendar"
-msgstr "Хуанли"
+msgstr "Календар"
 
 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -2164,7 +2167,7 @@ msgstr "Оросын холбооны улс"
 #. module: base
 #: field:res.company,name:0
 msgid "Company Name"
-msgstr "Компаны нэр"
+msgstr "Компанийн нэр"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_roles_form
@@ -2214,6 +2217,10 @@ msgid ""
 "- The second parenthesis must match the whole version number.\n"
 "- The last parenthesis must match the extension of the module."
 msgstr ""
+"Кодын сайт дээр модуль хайх регуляр илэрхийлэл:\n"
+"- Эхний хаалт нь модулийг заана.\n"
+"- Хоёр дахь хаалт нь хувилбарын дугаарыг заана.\n"
+"- Сүүлийн хаалт нь модулийн өргөтгөлийг заана."
 
 #. module: base
 #: view:res.lang:0
@@ -2229,7 +2236,7 @@ msgstr "Тажикстан"
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 msgid "Connect Actions To Client Events"
-msgstr ""
+msgstr "Үйлдлүүдийг клиент үзэгдлүүдтэй холбох"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -2341,7 +2348,7 @@ msgstr "Португаль"
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Unvalid"
-msgstr ""
+msgstr "Буруу"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -2447,7 +2454,7 @@ msgstr "Нөхцөл"
 #: selection:ir.values,key:0
 #: selection:res.partner.address,type:0
 msgid "Default"
-msgstr ""
+msgstr "Өгөгдмөл"
 
 #. module: base
 #: field:ir.model.fields,required:0
@@ -2494,7 +2501,7 @@ msgstr "Хэлний нэр"
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Холи Сий (Ватикан хот улс)"
 
 #. module: base
 #: help:ir.actions.server,condition:0
@@ -2556,7 +2563,7 @@ msgstr "Банкны данс"
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequence Type"
-msgstr ""
+msgstr "Дугаарлалтын төрөл"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -2691,7 +2698,7 @@ msgstr "wizard.module.update_translations"
 #: view:wizard.ir.model.menu.create:0
 #: field:wizard.ir.model.menu.create,view_ids:0
 msgid "Views"
-msgstr ""
+msgstr "Дэлгэцүүд"
 
 #. module: base
 #: view:res.groups:0
@@ -2732,7 +2739,7 @@ msgstr "Ажлын урсгалууд"
 #: model:ir.actions.act_window,name:base.action_config_wizard_form
 #: model:ir.ui.menu,name:base.menu_config_module
 msgid "Configuration Wizard"
-msgstr ""
+msgstr "Тохиргооны визард"
 
 #. module: base
 #: model:ir.model,name:base.model_res_roles
@@ -2803,7 +2810,7 @@ msgstr "NULL болгох"
 #: field:res.partner.event,som:0
 #: field:res.partner.som,name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Нөхцөл байдал"
 
 #. module: base
 #: model:res.country,name:base.bj
@@ -2813,7 +2820,7 @@ msgstr "Бенин"
 #. module: base
 #: view:ir.rule.group:0
 msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
+msgstr "Бүх шалгалтыг давбал дүрэм хангагдана"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2843,7 +2850,7 @@ msgstr "RML толгой"
 #. module: base
 #: wizard_field:res.partner.sms_send,init,app_id:0
 msgid "API ID"
-msgstr ""
+msgstr "API ID"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -2912,7 +2919,7 @@ msgstr "Дараагийн дугаар"
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
 msgid "Rates"
-msgstr "Харьцаанууд"
+msgstr "Ханшууд"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -2982,13 +2989,13 @@ msgstr "Өгөгдөл"
 #. module: base
 #: view:res.users:0
 msgid "Groups are used to defined access rights on each screen and menu."
-msgstr ""
+msgstr "Групп нь дэлгэц, цэснүүдэд хандах эрхийг тохируулахад хэрэглэгдэнэ."
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
 #: field:wizard.ir.model.menu.create,menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Толгой цэс"
 
 #. module: base
 #: help:ir.actions.act_window.view,multi:0
@@ -2998,6 +3005,7 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
+"Хэрэв чагт тавибал уг үйлдэл дэлгэцийн баруун талын самбар дээр харагдахгүй."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
@@ -3012,7 +3020,7 @@ msgstr ""
 #. module: base
 #: field:res.lang,decimal_point:0
 msgid "Decimal Separator"
-msgstr ""
+msgstr "Орон тусгаарлагч"
 
 #. module: base
 #: view:res.partner:0
@@ -3114,7 +3122,7 @@ msgstr "Шинэчлэлийг болих"
 #. module: base
 #: model:res.country,name:base.ci
 msgid "Ivory Coast (Cote D'Ivoire)"
-msgstr ""
+msgstr "Иворын эрэг"
 
 #. module: base
 #: model:res.country,name:base.kz
@@ -3152,12 +3160,12 @@ msgstr "Нэр"
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
-msgstr ""
+msgstr "Монтсеррат"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
 msgid "Application Terms"
-msgstr ""
+msgstr "Програмын нэр томъёонууд"
 
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
@@ -3197,7 +3205,7 @@ msgstr "Вэб"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "English (CA)"
 
 #. module: base
 #: field:res.partner.event,planned_revenue:0
@@ -3236,7 +3244,7 @@ msgstr "Мужийн код гурван тэмдэгтээр.\n"
 #. module: base
 #: model:res.country,name:base.sj
 msgid "Svalbard and Jan Mayen Islands"
-msgstr ""
+msgstr "Свалбард, Ян Маэны арлууд"
 
 #. module: base
 #: view:ir.rule:0
@@ -3276,7 +3284,7 @@ msgstr "хаагдсан"
 #. module: base
 #: selection:wizard.module.lang.export,state:0
 msgid "get"
-msgstr ""
+msgstr "авах"
 
 #. module: base
 #: help:ir.model.fields,on_delete:0
@@ -3286,7 +3294,7 @@ msgstr "many2one талбарын on delete шинж"
 #. module: base
 #: field:ir.actions.server,write_id:0
 msgid "Write Id"
-msgstr ""
+msgstr "Бичих Id"
 
 #. module: base
 #: field:ir.actions.act_window,domain:0
@@ -3307,7 +3315,7 @@ msgstr "SMS тохиргоо"
 #: model:ir.actions.act_window,name:base.ir_access_act
 #: model:ir.ui.menu,name:base.menu_ir_access_act
 msgid "Access Controls List"
-msgstr ""
+msgstr "Хандах эрхийн жагсаалт"
 
 #. module: base
 #: model:res.country,name:base.um
@@ -3341,7 +3349,7 @@ msgstr "Товчлол"
 #. module: base
 #: field:ir.model.data,date_init:0
 msgid "Init Date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: base
 #: field:workflow.activity,flow_start:0
@@ -3363,7 +3371,7 @@ msgstr "Данс эзэмшигч"
 #: model:ir.actions.act_window,name:base.act_values_form
 #: model:ir.ui.menu,name:base.menu_values_form
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Клиент үйлдлүүдийн холбоо"
 
 #. module: base
 #: field:ir.ui.view_sc,resource:0
@@ -3378,18 +3386,18 @@ msgstr "Цаг"
 #. module: base
 #: model:res.country,name:base.gp
 msgid "Guadeloupe (French)"
-msgstr ""
+msgstr "Гуаделоп (Франц)"
 
 #. module: base
 #: field:ir.report.custom.fields,cumulate:0
 msgid "Accumulate"
-msgstr ""
+msgstr "Хураах"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Tree can only be used in tabular reports"
-msgstr ""
+msgstr "Модыг зөвхөн хүснэгтэн тайланд хэрэглэнэ"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -3429,7 +3437,7 @@ msgstr "res.request.history"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Client Action Configuration"
-msgstr ""
+msgstr "Клиент үйлдлийн тохиргоо"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_address_form
@@ -3437,17 +3445,17 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_address_form
 #: view:res.partner.address:0
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Харилцагчийн хаягууд"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Indonesian / Bahasa Indonesia"
-msgstr ""
+msgstr "Индонези / Бахаса Индонези"
 
 #. module: base
 #: model:res.country,name:base.cv
 msgid "Cape Verde"
-msgstr ""
+msgstr "Кэйп Вэрде"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -3456,6 +3464,9 @@ msgid ""
 "Some installed modules depend on the module you plan to Uninstall :\n"
 " %s"
 msgstr ""
+"Зарим суулгагдсан модулиуд таны хасах гэж байгаа модулиас хамааралтай "
+"байна:\n"
+" %s"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_res_partner_event
@@ -3468,7 +3479,7 @@ msgstr "Үйл явдал"
 #: model:ir.actions.act_window,name:base.action_res_roles
 #: model:ir.ui.menu,name:base.menu_action_res_roles
 msgid "Roles Structure"
-msgstr ""
+msgstr "Дүрүүдийн бүтэц"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_url
@@ -3555,7 +3566,7 @@ msgstr "Гох ассан"
 #. module: base
 #: model:res.country,name:base.fj
 msgid "Fiji"
-msgstr ""
+msgstr "Фиджи"
 
 #. module: base
 #: field:ir.model.fields,size:0
@@ -3627,7 +3638,7 @@ msgstr "Таны систем шинэчлэгдэнэ"
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
-msgstr ""
+msgstr "Тогтсон тайлангууд"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3709,7 +3720,7 @@ msgstr "Биелэх үйлдлийн төрөл"
 #. module: base
 #: field:ir.server.object.lines,server_id:0
 msgid "Object Mapping"
-msgstr ""
+msgstr "Объект буулгалт"
 
 #. module: base
 #: help:res.currency,rate:0
@@ -3730,7 +3741,7 @@ msgstr "Үүсгэх / Бичих"
 #. module: base
 #: help:res.partner.category,active:0
 msgid "The active field allows you to hide the category without removing it."
-msgstr ""
+msgstr "Идэвхитэй талбар нь ангиллыг хасалгүйгээр нуух боломж олгоно."
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -3747,7 +3758,7 @@ msgstr "Ботсван"
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr ""
+msgstr "Харилцагчийн гарчиг"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -3757,7 +3768,7 @@ msgstr "Үйлчилгээ"
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr ""
+msgstr "Дэлгэцэнд автомат шинэчлэл нэмэх"
 
 #. module: base
 #: wizard_view:module.upgrade,next:0
@@ -3774,12 +3785,12 @@ msgstr "Ажлын элементүүд"
 #. module: base
 #: field:wizard.module.lang.export,advice:0
 msgid "Advice"
-msgstr ""
+msgstr "Заавар"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Lithuanian / Lietuvių kalba"
-msgstr ""
+msgstr "Литва / Lietuvių kalba"
 
 #. module: base
 #: help:ir.actions.server,record_id:0
@@ -3787,6 +3798,8 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
+"Үүсгэх үйлдлийн дараа бичлэг үүссэн талбарын нэрийг заана. Хэрэв хоосон "
+"орхивол шинэ бичлэгийг олж чадахгүй."
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
@@ -3850,17 +3863,17 @@ msgstr "Аймаг/Муж"
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Британий энэтхэгийн далайн нутаг"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
-msgstr ""
+msgstr "Талбарын буулгалт"
 
 #. module: base
 #: field:maintenance.contract,date_start:0
 msgid "Starting Date"
-msgstr "Эхлэл огноо"
+msgstr "Эхлэл Огноо"
 
 #. module: base
 #: view:ir.model:0
@@ -3876,7 +3889,7 @@ msgstr "Мужийн код"
 #. module: base
 #: field:ir.model.fields,on_delete:0
 msgid "On delete"
-msgstr ""
+msgstr "Устгахад"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -3912,7 +3925,7 @@ msgstr "Мозамбик"
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Manage Menus"
-msgstr ""
+msgstr "Цэсүүдийг удирдах"
 
 #. module: base
 #: field:ir.actions.server,message:0
@@ -3923,7 +3936,7 @@ msgstr "Мессеж"
 #. module: base
 #: field:ir.actions.act_window.view,multi:0
 msgid "On Multiple Doc."
-msgstr ""
+msgstr "Олон баримтад."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config_contact
@@ -3961,7 +3974,7 @@ msgstr "module,type,name,res_id,src,value"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_management
 msgid "Modules Management"
-msgstr ""
+msgstr "Модулийн удирдлага"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -4021,7 +4034,7 @@ msgstr "Алдаа"
 #. module: base
 #: view:res.partner.som:0
 msgid "Partner State of Mind"
-msgstr ""
+msgstr "Харилцагчийн нөхцөл байдал"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -4051,7 +4064,7 @@ msgstr "Бутан"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Textile Suppliers"
-msgstr ""
+msgstr "Нэхмэл нийлүүлэгчид"
 
 #. module: base
 #: selection:ir.actions.url,target:0
@@ -4081,7 +4094,7 @@ msgstr "STOCK_INDENT"
 #. module: base
 #: view:workflow.workitem:0
 msgid "Workflow Workitems"
-msgstr ""
+msgstr "Ажлын урсгалын элементүүд"
 
 #. module: base
 #: model:res.country,name:base.vc
@@ -4128,7 +4141,7 @@ msgstr "a4"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Хайлтын дэлгэц."
 
 #. module: base
 #: view:ir.rule.group:0
@@ -4220,7 +4233,7 @@ msgstr "Камерун"
 #. module: base
 #: model:res.country,name:base.bf
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Буркина Фасо"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4235,7 +4248,7 @@ msgstr "Алгассан"
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Custom Field"
-msgstr ""
+msgstr "Зохиомол талбар"
 
 #. module: base
 #: model:res.country,name:base.cc
@@ -4262,7 +4275,7 @@ msgstr "11. %U эсвэл %W ==> 48 (49-р долоо хоног)"
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type_field
 msgid "Bank type fields"
-msgstr ""
+msgstr "Банкны төрөл талбарууд"
 
 #. module: base
 #: wizard_view:module.lang.import,init:0
@@ -4272,7 +4285,7 @@ msgstr "type,name,res_id,src,value"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Dutch / Nederlands"
-msgstr ""
+msgstr "Нидерланд"
 
 #. module: base
 #: wizard_view:server.action.create,step_1:0
@@ -4305,7 +4318,7 @@ msgstr "Макау"
 #. module: base
 #: model:ir.actions.report.xml,name:base.res_partner_address_report
 msgid "Labels"
-msgstr ""
+msgstr "Шошго"
 
 #. module: base
 #: wizard_field:res.partner.spam_send,init,from:0
@@ -4330,7 +4343,7 @@ msgstr "STOCK_NEW"
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "None"
-msgstr ""
+msgstr "Хоосон"
 
 #. module: base
 #: view:ir.report.custom.fields:0
@@ -4345,12 +4358,12 @@ msgstr "Ерөнхий"
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr ""
+msgstr "Зорилтот үйлдэл"
 
 #. module: base
 #: view:ir.values:0
 msgid "Connect Events to Actions"
-msgstr ""
+msgstr "Үзэгдлүүдийг үйлдлүүдэд холбох"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4450,12 +4463,12 @@ msgstr "STOCK_UNDERLINE"
 #. module: base
 #: view:ir.values:0
 msgid "Values for Event Type"
-msgstr ""
+msgstr "Үзэгдлийн төрлийн утгууд"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
-msgstr ""
+msgstr "Үргэлж хайгдахуйц"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4475,7 +4488,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_10
 msgid "Scheduler"
-msgstr ""
+msgstr "Төлөвлөгч"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4508,6 +4521,8 @@ msgid ""
 "The selected language has been successfully installed. You must change the "
 "preferences of the user and open a new menu to view changes."
 msgstr ""
+"Сонгосон хэл амжилттай суулгагдлаа. Та өөрийн тохиргоо руу ороод хэлээ солих "
+"хэрэгтэй, дараа нь шинэ цэс нээхэд өөрчлөлт харагдана."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence
@@ -4559,7 +4574,7 @@ msgstr "Непал"
 #. module: base
 #: field:res.partner.event,event_ical_id:0
 msgid "iCal id"
-msgstr ""
+msgstr "iCal id"
 
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
@@ -4574,12 +4589,12 @@ msgstr "%Y - Жилийн зуун орсон тоон дугаар."
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Pie Chart"
-msgstr ""
+msgstr "Дугуй диаграм"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Seconde: %(sec)s"
-msgstr ""
+msgstr "Секунд: %(сек)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -4621,12 +4636,12 @@ msgstr "Тай / ภาษาไทย"
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form
 msgid "Default Properties"
-msgstr ""
+msgstr "Үндсэн шинжүүд"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Slovenian / slovenščina"
-msgstr ""
+msgstr "Словян / slovenščina"
 
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
@@ -4774,7 +4789,7 @@ msgstr "Соломоны арлууд"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "ХандалтынАлдаа"
 
 #. module: base
 #: view:res.lang:0
@@ -4816,7 +4831,7 @@ msgstr "Америкын нэгдсэн улс"
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Reference Guide"
-msgstr ""
+msgstr "Ишлэл гарын авлага"
 
 #. module: base
 #: model:res.country,name:base.ml
@@ -4831,7 +4846,7 @@ msgstr "STOCK_UNINDENT"
 #. module: base
 #: field:ir.cron,interval_number:0
 msgid "Interval Number"
-msgstr ""
+msgstr "Интервал тоо"
 
 #. module: base
 #: selection:maintenance.contract,kind:0
@@ -4892,6 +4907,8 @@ msgid ""
 "This function will check for new modules in the 'addons' path and on module "
 "repositories:"
 msgstr ""
+"Энэ функц нь модулын сайт болон 'addons' хавтас дотор шинэ модуль нэмэгдсэн "
+"эсэхийг шалгана:"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4906,7 +4923,7 @@ msgstr "Ерөнхий тохируулга"
 #. module: base
 #: model:ir.ui.menu,name:base.custom_shortcuts
 msgid "Custom Shortcuts"
-msgstr ""
+msgstr "Зохиомол товчлол"
 
 #. module: base
 #: model:res.country,name:base.dz
@@ -4999,7 +5016,7 @@ msgstr "Харилцагид, ангиллаар"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
 msgid "Components Supplier"
-msgstr ""
+msgstr "Эд анги нийлүүлэгч"
 
 #. module: base
 #: field:ir.actions.act_window,default_user_ids:0
@@ -5029,7 +5046,7 @@ msgstr "Исланд"
 #. module: base
 #: view:res.users:0
 msgid "Roles are used to defined available actions, provided by workflows."
-msgstr ""
+msgstr "Дүр нь ажлын урсгалын үйлдлүүдтэй холбож хэрэглэгдэнэ."
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5039,7 +5056,7 @@ msgstr "Герман"
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the year: %(woy)s"
-msgstr ""
+msgstr "Жилийн долоо хоног: %(ждх)"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
@@ -5072,7 +5089,7 @@ msgstr "Таны үйлчилгээний гэрээнүүд"
 msgid ""
 "Please note that you will have to logout and relog if you change your "
 "password."
-msgstr ""
+msgstr "Хэрэв нууц үгээ солисон бол системээс гараад орох хэрэгтэй."
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -5092,12 +5109,12 @@ msgstr "GPL-2"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Portugese (BR) / português (BR)"
-msgstr ""
+msgstr "Португал / português (BR)"
 
 #. module: base
 #: field:ir.actions.server,record_id:0
 msgid "Create Id"
-msgstr ""
+msgstr "Үүсгэх Id"
 
 #. module: base
 #: model:res.country,name:base.hn
@@ -5140,7 +5157,7 @@ msgstr "Үйл явдлын төрөл"
 #: model:ir.actions.act_window,name:base.ir_sequence_type
 #: model:ir.ui.menu,name:base.menu_ir_sequence_type
 msgid "Sequence Types"
-msgstr ""
+msgstr "Дугаарлалтын төрлүүд"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -5243,7 +5260,7 @@ msgstr "Аргентин"
 #. module: base
 #: model:res.country,name:base.af
 msgid "Afghanistan, Islamic State of"
-msgstr ""
+msgstr "Афганистан, Исламын муж"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_module_import.py:0
@@ -5259,7 +5276,7 @@ msgstr "country_id"
 #. module: base
 #: field:ir.cron,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Интервал нэгж"
 
 #. module: base
 #: field:maintenance.contract,kind:0
@@ -5291,14 +5308,14 @@ msgstr "Үүссэн огноо"
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Line Plot"
-msgstr ""
+msgstr "Мөрийн утга"
 
 #. module: base
 #: help:ir.actions.server,loop_action:0
 msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
-msgstr ""
+msgstr "Гүйцэтгэх үйлдлийг сонгоно. Давталт доторхи давтах үйлдэл боломжгүй."
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -5358,20 +5375,20 @@ msgstr "Алхамыг алгасах"
 #. module: base
 #: model:res.country,name:base.pn
 msgid "Pitcairn Island"
-msgstr ""
+msgstr "Питкэйрн арал"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_event_type-act
 #: model:ir.ui.menu,name:base.menu_res_partner_event_type-act
 msgid "Active Partner Events"
-msgstr ""
+msgstr "Харилцагчийн үйл явдлууд"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_function_form
 #: model:ir.ui.menu,name:base.menu_partner_function_form
 #: view:res.partner.function:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Харьцах хүний үүрэг"
 
 #. module: base
 #: view:multi_company.default:0
@@ -5386,7 +5403,7 @@ msgstr "Жилийн өдөр: %(doy)s"
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr ""
+msgstr "Дундын бүс"
 
 #. module: base
 #: view:ir.model:0
@@ -5424,7 +5441,7 @@ msgstr ""
 #. module: base
 #: help:ir.sequence,weight:0
 msgid "If two sequences match, the highest weight will be used."
-msgstr ""
+msgstr "Хэрэв хоёр эрэмбэ давхацвал өндөх жинтэйг нь ашиглана."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_attachment
@@ -5499,12 +5516,12 @@ msgstr "<="
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Estonian / Eesti keel"
-msgstr ""
+msgstr "Эстони / Eesti keel"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Portugese / português"
-msgstr ""
+msgstr "Португали / português"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -5550,7 +5567,7 @@ msgstr "Суусан хувилбар"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_workflow_root
 msgid "Workflow Definitions"
-msgstr ""
+msgstr "Ажлын ургсалын тодорхойлолтууд"
 
 #. module: base
 #: model:res.country,name:base.mr
@@ -5561,7 +5578,7 @@ msgstr "Мавритани"
 #: view:workflow.activity:0
 #: field:workflow.workitem,act_id:0
 msgid "Activity"
-msgstr ""
+msgstr "Ажилбар"
 
 #. module: base
 #: view:res.partner:0
@@ -5603,7 +5620,7 @@ msgstr "Муж"
 #: model:ir.actions.act_window,name:base.ir_property_form_all
 #: model:ir.ui.menu,name:base.menu_ir_property_form_all
 msgid "All Properties"
-msgstr ""
+msgstr "Бүх шинжүүд"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_window
@@ -6078,7 +6095,7 @@ msgstr "Огноо форматлах тэмдэглэгээнүүд"
 #. module: base
 #: selection:ir.report.custom,frequency:0
 msgid "Monthly"
-msgstr "Сар тутмын"
+msgstr "Сарын"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_partner_som-act
@@ -6619,7 +6636,7 @@ msgstr "сонгох"
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Graph"
-msgstr "График"
+msgstr "Граф"
 
 #. module: base
 #: field:res.partner,child_ids:0
@@ -6707,7 +6724,7 @@ msgstr "Функцийн нэр"
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "_Cancel"
-msgstr "_Цуцлах"
+msgstr "_Болих"
 
 #. module: base
 #: model:res.country,name:base.cy
@@ -7790,7 +7807,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.configuration.wizard,progress:0
 msgid "Configuration Progress"
-msgstr "Тохируулгын явц"
+msgstr "Тохиргооны явц"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_11
@@ -8020,73 +8037,74 @@ msgstr "Орос / орос хэл"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8096,13 +8114,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
@@ -8110,3 +8135,7 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#, python-format
+#~ msgid "You can not have two users with the same login !"
+#~ msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 1e9993b4d68..eef57ddd6b6 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index ae3d9c50f19..0e1b62fa594 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:14+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 18:36+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8105,73 +8105,74 @@ msgstr "Russisch / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8181,13 +8182,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 3945b229279..e9604cd0de8 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:50+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-26 10:02+0000\n"
+"Last-Translator: Michał Węgrzynek <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -68,7 +68,7 @@ msgstr "Aby zobaczyć oficjalne tłumaczenia, zobacz ten link: "
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Hungarian / Magyar"
-msgstr ""
+msgstr "Węgierski"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
@@ -149,7 +149,7 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CANCEL"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: base
 #: field:ir.report.custom,sortby:0
@@ -316,7 +316,7 @@ msgstr "Moduły niezainstalowanie"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "txt"
-msgstr ""
+msgstr "txt"
 
 #. module: base
 #: wizard_view:server.action.create,init:0
@@ -332,7 +332,7 @@ msgstr "Konfiguruj"
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -349,7 +349,7 @@ msgstr "Format daty"
 #: field:res.bank,email:0
 #: field:res.partner.address,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base
 #: model:res.country,name:base.an
@@ -438,7 +438,7 @@ msgstr ""
 #: selection:workflow.activity,join_mode:0
 #: selection:workflow.activity,split_mode:0
 msgid "Xor"
-msgstr ""
+msgstr "XOR"
 
 #. module: base
 #: view:res.partner:0
@@ -2256,7 +2256,7 @@ msgstr "GPL-2 lub wersja późniejsza"
 #. module: base
 #: selection:res.partner.event,type:0
 msgid "Prospect Contact"
-msgstr ""
+msgstr "Potencjalny Kontakt"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -8054,7 +8054,7 @@ msgstr "Kod BIC/Swift"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "Potencjalny Klient"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -8094,73 +8094,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Nie może być dwóch użytkowników o tym samym loginie !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8170,13 +8171,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index e09e05ac826..f2d03d46696 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:19+0000\n"
+"PO-Revision-Date: 2010-09-09 18:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8088,73 +8088,74 @@ msgstr "Russo / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Não pode ter dois utilizadores com o mesmo código de acesso!"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8164,13 +8165,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 7f0a6842f49..9bae937bb20 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:39+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 18:12+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8090,74 +8090,75 @@ msgstr "Russo / русский язык"
 #. module: base
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
-msgstr ""
- 
+msgstr "Não é permitido criar dois usuários com o mesmo login!"
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr "Não é permitido criar dois usuários com o mesmo login!"
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8167,13 +8168,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index ab158bb0387..39f4f21635c 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7960,73 +7960,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8036,13 +8037,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 0593b6c28be..145d2f828f8 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.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: 2010-09-03 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8073,73 +8073,74 @@ msgstr "Русский / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8149,13 +8150,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 525b88f0fc3..5654b60553b 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7987,73 +7987,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8063,13 +8064,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index 8b7a6c11755..fe867b0ae1f 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7979,73 +7979,74 @@ msgstr "rusko"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8055,13 +8056,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index 85359ae27d0..98911a06d0b 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.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: 2010-07-13 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7944,73 +7944,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8020,13 +8021,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 331813e39f3..3d0dc60859e 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8070,73 +8070,74 @@ msgstr "Ruski / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8146,13 +8147,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 60616745c10..ed47e2be7c6 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:06+0000\n"
-"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
+"PO-Revision-Date: 2010-09-27 12:19+0000\n"
+"Last-Translator: Daniel Stenlöv (XCLUDE) <Unknown>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -530,7 +530,7 @@ msgstr "Skräddarsydd rapport"
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "Stapeldiagram"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7960,73 +7960,74 @@ msgstr "Russian / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8036,13 +8037,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index 3d89bb7c03c..a8c0a3ca261 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index b5c2beaf76d..816c8a463c0 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7938,73 +7938,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8014,13 +8015,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 097bdfd0cb6..8feffb44a99 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:42+0000\n"
+"PO-Revision-Date: 2010-09-09 18:06+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8077,73 +8077,74 @@ msgstr "Rusça / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8153,13 +8154,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index cc74cdef068..08556556f93 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 22:18+0000\n"
+"PO-Revision-Date: 2010-09-09 06:59+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8022,73 +8022,74 @@ msgstr "Російська / Russian"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8098,13 +8099,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 53c56cbc52f..43e1bc0ac30 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7939,73 +7939,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8015,13 +8016,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index bf78a77838f..8c2d99e0864 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-08 21:31+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-09 18:09+0000\n"
+"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-09 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7967,73 +7967,74 @@ msgstr "俄语 / русский язык"
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr "用户名必须唯一！"
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8043,13 +8044,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index 40ec7115a88..69dd7e92bcc 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-25 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -7953,73 +7953,74 @@ msgstr ""
 #: sql_constraint:res.user:0
 msgid "You cannot have two users with the same login !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.model.data:0
-msgid "You cannot have multiple records with the same id for the same module !"
+msgid ""
+"You cannot have multiple records with the same id for the same module !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
 msgstr ""
- 
+
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
@@ -8029,13 +8030,20 @@ msgstr ""
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "The operation cannot be completed, probably due to the following:\n- deletion: you may be trying to delete a record while other records still reference it\n- creation/update: a mandatory field is not correctly set"
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
 msgstr ""
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
-msgid "\n\n[object with reference: %s - %s]"
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
 msgstr ""
 
 #. module: base
diff --git a/debian/po/bg.po b/debian/po/bg.po
index d8f13067dda..64571e2e63f 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 77177aaa666..b549feb2080 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 1f7fc1c4c58..4db913ca2d2 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/de.po b/debian/po/de.po
index 08fb34dfca1..43f5b2f2589 100644
--- a/debian/po/de.po
+++ b/debian/po/de.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/el.po b/debian/po/el.po
index ab9a69979ea..2d7be856aea 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index d3ca66429cd..a1f484305ba 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/es.po b/debian/po/es.po
index 7ad0e2b4434..46d906b1248 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index 6d951e15c24..03035c61d26 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/fa.po b/debian/po/fa.po
index 436ac5811d6..331aa5d0d9d 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 72784367e2e..7dc02829e54 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 7bd2d8f0ed5..414a4999f6b 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 6be40ac91f6..2fa653b1970 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 00706c0c5b6..af9c295a595 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/it.po b/debian/po/it.po
index f2ed8ac826c..45bd312e0c1 100644
--- a/debian/po/it.po
+++ b/debian/po/it.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ja.po b/debian/po/ja.po
index b197d925b88..20e0bc105be 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 268d893c01c..5218c4ce019 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-02-16 05:47+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-09-15 02:58+0000\n"
+"Last-Translator: barge <Unknown>\n"
 "Language-Team: Korean <ko@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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr ""
+msgstr "Open ERP 서버를 위한 전용 시스템 계정:"
 
 #. Type: string
 #. Description
@@ -30,10 +30,10 @@ msgid ""
 "The Open ERP server must use a dedicated account for its operation so that "
 "the system's security is not compromised by running it with superuser "
 "privileges."
-msgstr ""
+msgstr "Open ERP 서버를 운영하실때는 슈퍼유저가 아닌 전용 계정을 이용하셔야 보안을 확보할수 있습니다"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Please choose that account's username."
-msgstr ""
+msgstr "사용자 이름을 선택하세요"
diff --git a/debian/po/mn.po b/debian/po/mn.po
new file mode 100644
index 00000000000..6d686d6e110
--- /dev/null
+++ b/debian/po/mn.po
@@ -0,0 +1,41 @@
+# Mongolian translation for openobject-server
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2010-09-10 03:13+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Dedicated system account for the Open ERP server:"
+msgstr "Open ERP серверт зориулсан системийн тусгай эрх:"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid ""
+"The Open ERP server must use a dedicated account for its operation so that "
+"the system's security is not compromised by running it with superuser "
+"privileges."
+msgstr ""
+"Open ERP сервер тусгай хандах эрх хэрэглэх ёстой, ингэснээр супер "
+"хэрэглэгчийн эрх ашиглаж системийн хамгаалалтыг муутгахгүй болно."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Нэвтрэх эрхийг сонгоно уу."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index e47c06330de..818da6d0626 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 74e4e74742a..e1e37a63720 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 46a8c98366d..826e50fd881 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 43f085929f4..079780d23df 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 11c923af7a4..bace70806da 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-12-21 06:11+0000\n"
+"PO-Revision-Date: 2010-09-27 23:36+0000\n"
 "Last-Translator: Valentin Caragea <carageav@gmail.com>\n"
 "Language-Team: Romanian <ro@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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 622e2dba6a9..0eebf4f7086 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 3b89810b2e4..25895cff9b8 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/sr.po b/debian/po/sr.po
index f9d964e00f5..7e895bfbfe4 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 384489afe97..e4138456cb4 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: Swedish\n"
 
diff --git a/debian/po/tr.po b/debian/po/tr.po
index c7bda785999..9379a4f8ef9 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 31375230c11..39ac200e9c5 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 7a64f4cac15..243dc2a4a40 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.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: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 3e847c82ecf..0b9df2604e3 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"

From bb17e729bfc8340d44fc3ca03151c8abc9ea45b9 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 29 Sep 2010 10:22:19 +0530
Subject: [PATCH 137/632] [FIX] stock: Error while opening dashboard.

bzr revid: uco@tinyerp.com-20100929045219-a2q4dqsbu3el14yk
---
 addons/stock/stock.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dbf55768b3e..571b9643129 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2630,7 +2630,7 @@ class report_delivery_products_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
         cr.execute("""
             create or replace view report_delivery_products_planned as (
-                select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+                select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
@@ -2639,14 +2639,12 @@ class report_delivery_products_planned(osv.osv):
 
                     union
 
-               select stock.date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date as date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'out'
                     where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date
-
-
+                    group by stock.date
                 )
         """)
 

From 031db2274363c41c8b7773f0d686a1b00d8a9d2c Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 10:36:57 +0530
Subject: [PATCH 138/632] [IMP] subscription : Improvements in view

bzr revid: vir@tinyerp.com-20100929050657-v6b2hpiqzcxv59r1
---
 addons/subscription/subscription_view.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index abe58ced56d..b27414bb60c 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,11 +15,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscriptions">
-                    <group colspan="4">
+                    <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="active" select="1" groups="base.group_extended"/>
-                        <field name="user_id" select="1"/>
                         <field name="partner_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="active" select="1" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Subsription Data">
@@ -92,7 +92,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="4">
                         <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-personal" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -140,9 +140,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Document">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="model" select="1"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="model" select="1"/>
+                        <field name="active" select="1"/>
+                    </group>
+                    <newline/>
                     <field colspan="4" name="field_ids" nolabel="1"/>
                 </form>
             </field>

From 7ed2a8b8b62936e7b608505319a12996ade15f17 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 29 Sep 2010 11:35:49 +0530
Subject: [PATCH 139/632] [MOD/IMP] survey: Improvements in survey
 wizrd,view,groups and access rights

bzr revid: amp@tinyerp.com-20100929060549-h3g518f6e6ertu3t
---
 addons/survey/security/ir.model.access.csv     | 13 +++++++++++++
 addons/survey/security/survey_security.xml     |  3 +++
 addons/survey/survey_view.xml                  | 17 ++++++++---------
 addons/survey/wizard/survey_send_invitation.py |  2 +-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 2a64acdb0d4..5ea4017fb01 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -36,3 +36,16 @@
 "access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
 "access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
 "access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
+"access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
+"access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
+"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
+"access_survey_request_survey_user","survey.request.survey.user","model_survey_request","group_survey_user",1,1,1,1
+"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","group_survey_user",1,1,1,1
+"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","group_survey_user",1,1,1,1
+"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","group_survey_user",1,1,1,1
+"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","group_survey_user",1,1,1,1
+"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","group_survey_user",1,1,1,1
+"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
+"access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
+"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
+"access_survey_res_partner_address_survey_user","survey.res.partner.address.survey.user","base.model_res_partner_address","group_survey_user",1,1,1,0
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 6c3559fa138..1506fdaec1b 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -11,6 +11,9 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
+   	<record model="res.groups" id="group_survey_user">
+        	<field name="name">Survey / User</field>
+   	</record>
 
 </data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 745cf98c484..8152caed45c 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -4,11 +4,11 @@
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user" sequence="2"/>
+                        groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_manager,base.group_tool_user,base.group_system"
+                 groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -291,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
 
         <!--
             Survey Pages
@@ -491,7 +491,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1075,7 +1075,7 @@
             <field name="model">survey.request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Evaluation Plan Phase">
+                <tree string="Evaluation Plan Phase" colors="red:date_deadline&lt;current_date">
                     <field name="date_deadline"/>
                     <field name="user_id"/>
                     <field name="survey_id"/>
@@ -1125,7 +1125,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
 
         <!--
             Survey Type
@@ -1189,8 +1189,7 @@
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-            action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user" icon="STOCK_INDEX"/>
+            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index d0bb7ed87cc..fd7a35bfa89 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -100,7 +100,7 @@ class survey_send_invitation(osv.osv_memory):
         survey_ref= self.pool.get('survey')
 
         model_data_obj = self.pool.get('ir.model.data')
-        group_id = model_data_obj._get_id(cr, uid, 'base', 'group_tool_user')
+        group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user')
         group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id
 
         act_id = self.pool.get('ir.actions.act_window')

From 9a82843d053bdaf11fca18240b352183008d1b95 Mon Sep 17 00:00:00 2001
From: dbr <dbr@dbr-desktop>
Date: Wed, 29 Sep 2010 11:37:54 +0530
Subject: [PATCH 140/632] [MOD/IMP]tools:usability improvement in tools Modules

bzr revid: dbr@dbr-desktop-20100929060754-wmlj8s6czjxxj2id
---
 addons/idea/idea_view.xml                    |  2 +-
 addons/idea/report/report_vote_view.xml      | 10 +++++-----
 addons/survey/survey_view.xml                |  2 +-
 addons/survey/wizard/survey_browse_answer.py |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index b6e8b926a0c..f7ddb8bf504 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -377,7 +377,7 @@
 <!-- Idea Votes Statistics Action -->
 
     <record model="ir.actions.act_window" id="action_idea_vote_stat">
-        <field name="name">Statistics on Votes</field>
+        <field name="name">Vote Statistics</field>
         <field name="res_model">idea.vote.stat</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 9556f86a281..711d6c0d29f 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -60,12 +60,12 @@
                             domain="[('idea_state','=',('cancel'))]"/>
                         <separator orientation="vertical"/>
                         <field name="idea_id" string="Idea"/>
-                        <field name="creater_id" string="creator"/>
+                        <field name="creater_id" string="Creator"/>
                         <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="10" col="12">
-                        <filter string="creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
+                        <filter string="Creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
                         <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Idea" icon="terp-idea" context="{'group_by':'idea_id'}"/>
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by opendate"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of opendate"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of opendate"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 8152caed45c..6c9027a043e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1114,7 +1114,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_survey_request_tree">
-            <field name="name">Survey Request</field>
+            <field name="name">Survey Requests</field>
             <field name="res_model">survey.request</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index cf047a0930c..c8979ee3a6f 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -46,7 +46,7 @@ class survey_browse_answer(osv.osv_memory):
 
     _columns = {
         'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'response_id': fields.many2one("survey.response", "Survey Answers", help="If you want to print all answers of selected survey then don't select survey answer and if you select survey answer then print only selected survey answer."),
+        'response_id': fields.many2one("survey.response", "Survey Answers", help="If this field is empty, all answers of the selected survey will be print."),
     }
 
     def action_next(self, cr, uid, ids, context=None):

From f44295b29789d5f6bdc9d3823ec6d98bb87d9a29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 11:44:01 +0530
Subject: [PATCH 141/632] [IMP] stock: Stock partial move and partial picking
 wizard  select only production lots for the product on that line

bzr revid: sbh@tinyerp.com-20100929061401-3c13j05vvprjwk5g
---
 addons/stock/wizard/stock_partial_move.py    | 4 ++--
 addons/stock/wizard/stock_partial_picking.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index dafb50cefe1..4825fa9c47e 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -104,8 +104,8 @@ class stock_partial_move(osv.osv_memory):
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
-                    <field name="move%s_prodlot_id" groups="base.group_extended" />                    
-                """%(m.id, m.id, m.id,m.id)
+                    <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]"  groups="base.group_extended" />                    
+                """%(m.id, m.id, m.id,m.id,m.id)
                 if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 3bfe075eb0b..d52198170a6 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -105,8 +105,8 @@ class stock_partial_picking(osv.osv_memory):
                         <field name="move%s_product_id" nolabel="1"/>
                         <field name="move%s_product_qty" string="Qty" />
                         <field name="move%s_product_uom" nolabel="1" />
-                        <field name="move%s_prodlot_id" groups="base.group_extended" />
-                    """%(m.id, m.id, m.id, m.id)
+                        <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]" groups="base.group_extended" />
+                    """%(m.id, m.id, m.id, m.id,m.id)
                     if (m.product_id.cost_method == 'average'):
                         _moves_fields.update({
                             'move%s_product_price'%(m.id) : {

From 16e73105c1e70a79a9872fe674e388922faf67d8 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 11:53:16 +0530
Subject: [PATCH 142/632] [IMP] survery : the button Test survey shouldn't be
 available before saving the survey

bzr revid: vir@tinyerp.com-20100929062316-a8nq1ps498pytof1
---
 addons/survey/survey_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 6c9027a043e..40288a601b7 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -25,9 +25,10 @@
                     <field name="title" select="1"/>
                     <group col="6" colspan="6">
                         <field name="responsible_id"/>
+                        <field name="id" invisible="1"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                             string="Test Survey" type="action" icon="gtk-new"
-                            context="{'active':True,'survey_id': active_id}"/>
+                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                             string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"

From 9d8bbcbb602f7f3461be85a118eb79eb8c061018 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 29 Sep 2010 08:54:41 +0200
Subject: [PATCH 143/632] [FIX] warnings in module.pyfix ordering and grouping
 of imports

bzr revid: xmo@openerp.com-20100929065441-3xdi5tkbh71qole8
---
 bin/addons/base/module/module.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index ad10e4e8e5f..a35a4f59f03 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -19,27 +19,24 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import tarfile
-import re
-import urllib
-import os
 import imp
 import logging
-import tools
-from osv import fields, osv, orm
-import zipfile
-import release
+import os
+import re
+import urllib
 import zipimport
 
-import wizard
 import addons
-import pooler
 import netsvc
+import pooler
+import release
+import tools
 
 from tools.parse_version import parse_version
 from tools.translate import _
 
+from osv import fields, osv, orm
+
 class module_category(osv.osv):
     _name = "ir.module.category"
     _description = "Module Category"
@@ -126,7 +123,7 @@ class module(osv.osv):
                         res[mnames[data_id.module]]['menus_by_module'] += m.complete_name + '\n'
                     except:
                         pass
-            except KeyError, e:
+            except KeyError:
                 pass
         return res
 
@@ -393,7 +390,7 @@ class module(osv.osv):
                 fp = file(fname, 'wb')
                 fp.write(zipfile)
                 fp.close()
-            except Exception, e:
+            except Exception:
                 raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,))
             terp = self.get_module_info(mod.name)
             self.write(cr, uid, mod.id, self.get_values_from_terp(terp))

From 54fb35b34b8c3e53d43ab9b7b69239aa8cdd78f1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 29 Sep 2010 09:03:46 +0200
Subject: [PATCH 144/632] [IMP] add logging to bare except in modules

bzr revid: xmo@openerp.com-20100929070346-zs7u7qy2xyp5ps3d
---
 bin/addons/base/module/module.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index a35a4f59f03..b446f39f5b5 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -77,8 +77,9 @@ class module(osv.osv):
             info = addons.load_information_from_description_file(name)
             if 'version' in info:
                 info['version'] = release.major_version + '.' + info['version']
-        except:
-            pass
+        except Exception:
+            self.__logger.debug('Error when trying to fetch informations for '
+                                'module %s', name, exc_info=True)
         return info
 
     def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context={}):
@@ -113,16 +114,20 @@ class module(osv.osv):
                         v = view_obj.browse(cr,uid,data_id.res_id)
                         aa = v.inherit_id and '* INHERIT ' or ''
                         res[mnames[data_id.module]]['views_by_module'] += aa + v.name + ' ('+v.type+')\n'
-                    except:
-                        pass
+                    except Exception:
+                        self.__logger.debug(
+                            'Unknown error while browsing ir.ui.view[%s]',
+                            data_id.res_id, exc_info=True)
                 elif key=='ir.actions.report.xml':
                     res[mnames[data_id.module]]['reports_by_module'] += report_obj.browse(cr,uid,data_id.res_id).name + '\n'
                 elif key=='ir.ui.menu':
                     try:
                         m = menu_obj.browse(cr,uid,data_id.res_id)
                         res[mnames[data_id.module]]['menus_by_module'] += m.complete_name + '\n'
-                    except:
-                        pass
+                    except Exception:
+                        self.__logger.debug(
+                            'Unknown error while browsing ir.ui.menu[%s]',
+                            data_id.res_id, exc_info=True)
             except KeyError:
                 pass
         return res
@@ -391,6 +396,8 @@ class module(osv.osv):
                 fp.write(zipfile)
                 fp.close()
             except Exception:
+                self.__logger.exception('Error when trying to create module '
+                                        'file %s', fname)
                 raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,))
             terp = self.get_module_info(mod.name)
             self.write(cr, uid, mod.id, self.get_values_from_terp(terp))

From 9583cb02310b090c950b08e2a4ca7fa7ed681004 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 12:43:40 +0530
Subject: [PATCH 145/632] [IMP] stock: change the action in  Warehouse
 Dashboard

bzr revid: sbh@tinyerp.com-20100929071340-3ngeu0s9tjx32uj7
---
 addons/stock/board_warehouse_view.xml | 27 ++++++++++++++++++++-------
 addons/stock/stock_view.xml           | 18 ++++++++++++++++++
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 5704df7685b..2166dea00fd 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -5,14 +5,25 @@
             <field name="name">Warehouse</field>
         </record>
 
-		<record id="action_reception_picking_move_board" model="ir.actions.act_window">
-            <field name="name">Reception Picking Stock Move</field>
+    
+		<record id="action_incoming_product_board" model="ir.actions.act_window">
+            <field name="name">Incoming Product</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in'),('date','&lt;=',time.strftime('%Y-%m-%d 23:59:59'))]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
+			<field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>            
+			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+        </record>
+                
+		<record id="action_outgoing_product_board" model="ir.actions.act_window">
+            <field name="name">Outgoing Product</field>
+            <field name="res_model">stock.move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+			<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>			
+			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
 		<record id="board_warehouse_form" model="ir.ui.view">
@@ -23,13 +34,15 @@
                 <form string="Warehouse board">
                     <hpaned position="100">
                         <child1>
-					    	<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
+					    	<action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
+					    
                         </child1>
 
                         <child2>
+						<action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />                        
 					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
-					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
-                        </child2>
+<!--					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
+-->                        </child2>
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 639c22f226b..c2af2715c4e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1724,6 +1724,24 @@
                 </tree>
             </field>
         </record>
+        <!-- test -->
+          <record id="view_move_tree_reception_picking_board" model="ir.ui.view">
+            <field name="name">stock.move.tree3</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="grey:state in ('cancel')" string="Moves">
+                    <field name="picking_id" string="Reference"/>
+                    <field name="partner_id" string="Partner"/>
+                    <field name="product_id"/>
+                    <field name="product_qty" />
+                    <field name="product_uom" string="UoM"/>
+                    <field name="date"/>
+                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>

From 796cf9ba41226b4b9c49be332b72717a04bf0fa9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 12:56:25 +0530
Subject: [PATCH 146/632] procurement : Add the tree view for Warehouse
 Dashboard

bzr revid: sbh@tinyerp.com-20100929072625-9kbd9yhuovqf660n
---
 addons/procurement/board_mrp_procurement_view.xml | 11 ++++++++++-
 addons/procurement/procurement_view.xml           | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index d5f71f6d4bc..3b18a876f4f 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+		<record id="procurement_action_board" model="ir.actions.act_window">
+            <field name="name">Procurement Exceptions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">procurement.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','exception')]</field>
+			<field name="view_id" ref="procurement.procurement_tree_view_board"/>            
+        </record>
         <record id="board_mrp_procurement_form" model="ir.ui.view">
             <field name="name">board.mrp.procurement.form</field>
             <field name="model">board.board</field>
@@ -8,7 +17,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
       		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" name="%(procurement.procurement_action5)d" string="Procurement Exceptions" width="510" />
+				<action colspan="4" name="%(procurement_action_board)d" string="Procurement Exceptions" width="510" />
 			</xpath>
             </field>
         </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index fada5c18c28..e2e8c591f3f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -23,6 +23,21 @@
                     <field name="name" invisible="1"/>
                 </tree>
             </field>
+        </record>
+         <record id="procurement_tree_view_board" model="ir.ui.view">
+            <field name="name">procurement.order.tree.board</field>
+            <field name="model">procurement.order</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
+                    <field name="date_planned" widget="date"/>
+                    <field name="origin"/>
+                    <field name="product_id"/>
+                    <field name="product_qty"/>
+                    <field name="product_uom" string="UOM"/>
+                    <field name="message"/>
+                </tree>
+            </field>
         </record>
         <record id="procurement_form_view" model="ir.ui.view">
             <field name="name">procurement.order.form</field>

From 38fdf845844c8e915314fefad00ede12c927974c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 29 Sep 2010 13:03:34 +0530
Subject: [PATCH 147/632] improved

bzr revid: apa@tinyerp.com-20100929073334-snelmyf56ldzlp1y
---
 .../report/account_aged_partner_balance.rml        | 12 ++++++------
 addons/account/report/account_partner_ledger.rml   |  8 ++++----
 .../report/account_partner_ledger_other.rml        |  8 ++++----
 addons/hr_expense/report/expense.rml               | 14 +++++++-------
 addons/stock/report/lot_overview.rml               |  4 ++--
 addons/stock/report/lot_overview_all.rml           |  4 ++--
 addons/stock/report/stock_inventory_move.rml       | 10 +++++-----
 7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index 7f90ae0983b..ab57db23a27 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -168,22 +168,22 @@
           <para style="terp_tblheader_Details">Partners</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0"></font></para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Total</para>
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 7de67780056..ec0adbdc400 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -289,7 +289,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -359,7 +359,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ line['ref'] ]] - [[ line['name'] ]]</para>
@@ -391,7 +391,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -472,7 +472,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 53cb0d46d83..a49616e4427 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -443,7 +443,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -506,7 +506,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
@@ -536,7 +536,7 @@
           <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">A/c No.- Name</para>
+          <para style="terp_tblheader_Details">Account</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
@@ -611,7 +611,7 @@
             <para style="P3">[[ line['move_name'] ]]</para>
           </td>
           <td>
-            <para style="P3">[[ line['a_code'] ]] - [[ line['a_name'] ]]</para>
+            <para style="P3">[[ line['a_code'] ]]</para>
           </td>
           <td>
             <para style="P3">[[ (line['ref'] or '') + ' ' + line['name'] ]]</para>
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index fa9e78c68cd..7d7be76ea8e 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -115,9 +115,9 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header_Centre">HR Expenses [[ o.name or '' ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
+    <para style="terp_header_Centre">HR Expenses</para>
+    <para style="terp_tblheader_General_Centre">
+      <font face="Helvetica" size="9.0">[[ o.name or '' ]]</font>
     </para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -166,10 +166,10 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
+          <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total Price([[ o.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Total Price</para>
         </td>
       </tr>
     </blockTable>
@@ -181,7 +181,7 @@
       <blockTable colWidths="49.0,204.0,46.0,79.0,53.0,92.0" style="Table_expense_line">
         <tr>
           <td>
-            <para style="terp_default_9">[[ formatLang(line.date_value,date = True) ]]</para>
+            <para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
@@ -259,7 +259,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ setTag('para','xpre') ]] [[ o.note or '' ]] </para>
+    <para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index f4332455cf9..4b6e02c5b81 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -108,7 +108,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Value([[ company.currency_id.name ]])</para>
+          <para style="terp_tblheader_Details_Right">Value</para>
         </td>
       </tr>
     </blockTable>
@@ -209,4 +209,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index a0e58e8ce7d..13ca75381a1 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -108,7 +108,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Value([[ company.currency_id.name ]])</para>
+          <para style="terp_tblheader_Details_Right">Value</para>
         </td>
       </tr>
     </blockTable>
@@ -209,4 +209,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index 7cb18a4e161..9531c534dec 100755
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.rml
@@ -151,7 +151,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="114.0,93.0,194.0,138.0" style="Table4">
+    <blockTable colWidths="70.0,103.0,256.0,109.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Location</para>
@@ -172,7 +172,7 @@
     </para>
     <section>
       <para style="terp_default_9">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
-      <blockTable colWidths="114.0,93.0,194.0,138.0" style="Table8">
+      <blockTable colWidths="70.0,105.0,255.0,109.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ p.location_id.name ]]</para>
@@ -181,7 +181,7 @@
             <para style="terp_default_Centre_9">[[ p.prod_lot_id and p.prod_lot_id.name or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ p.product_id.name ]]</para>
+            <para style="terp_default_9">[ [[ p.product_id.code ]] ] [[ p.product_id.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(p.product_qty) ]] [[ p.product_uom.name ]]</para>
@@ -189,7 +189,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="402.0,137.0" style="Table7">
+    <blockTable colWidths="430.0,109.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
@@ -203,4 +203,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From 9b0e0fa9d834c26fa93c97d92b727eae231a669b Mon Sep 17 00:00:00 2001
From: "RGA (OpenERP)" <rga@tinyerp.com>
Date: Wed, 29 Sep 2010 13:07:41 +0530
Subject: [PATCH 148/632] Add UNIQUE constraint in ir.filters + refactor code

bzr revid: rga@tinyerp.com-20100929073741-kpnvws23uvj3g00e
---
 bin/addons/base/ir/ir_filters.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 272d1c718c1..c9cdf16d31e 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -38,17 +38,14 @@ class ir_filters(osv.osv):
         return my_acts
     
     def create_or_replace(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        is_filter_exist = False
+        filter_id = None
         for filter in self.get_filters(cr, uid, vals['model_id']):
             if filter['name'].lower() == vals['name'].lower():
-                is_filter_exist = filter['id']
+                filter_id = filter['id']
                 break
-        if is_filter_exist:
-             return super(ir_filters, self).write(cr, uid, is_filter_exist, vals, context)
-        else:
-             return super(ir_filters, self).create(cr, uid, vals, context)
+        if filter_id:
+            return self.write(cr, uid, filter_id, vals, context)
+        return self.create(cr, uid, vals, context)
 
 
     _columns = {
@@ -58,6 +55,11 @@ class ir_filters(osv.osv):
         'context': fields.text('Context Value', required=True),
         'model_id': fields.selection(_list_all_models, 'Model', required=True),
     }
+    
+    _sql_constraints = [
+        ('name_model_uid_uniq', 'UNIQUE(name, model_id, user_id)', 'Filter name must be unique!'),
+    ]
+
 
 ir_filters()
 

From 9321323c4c3da27b30965ae1ebcf663badf03141 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 29 Sep 2010 09:51:46 +0200
Subject: [PATCH 149/632] [IMP] sale_journal: renaming of date_planned field to
 date in stock.move

bzr revid: odo@openerp.com-20100929075146-bomk2f60oghucj0q
---
 addons/sale_journal/test/picking_journal.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_journal/test/picking_journal.yml b/addons/sale_journal/test/picking_journal.yml
index af4ee8ec8a0..9412c3d40d1 100644
--- a/addons/sale_journal/test/picking_journal.yml
+++ b/addons/sale_journal/test/picking_journal.yml
@@ -20,7 +20,7 @@
     move_lines:
       - company_id: base.main_company
         date_expected: '2010-08-04 14:09:38'
-        date_planned: '2010-08-04 14:09:38'
+        date: '2010-08-04 14:09:38'
         location_id: stock.stock_location_stock
         product_id: product.product_product_24
         product_qty: 50.0
@@ -84,4 +84,4 @@
 -
   !python {model: sale_journal.picking.journal}: |
     pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
-    assert (pick_jour.state == 'close'), "Journal is not in the open state"
\ No newline at end of file
+    assert (pick_jour.state == 'close'), "Journal is not in the open state"

From 55bec50ff09b29eb616ffbd56949b9ca194753d0 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 29 Sep 2010 13:28:01 +0530
Subject: [PATCH 150/632] [IMP]: base : Improvements in base module

bzr revid: jas@tinyerp.com-20100929075801-l569rvj9tiq2ha9w
---
 bin/addons/base/base_menu.xml                 |  7 +-
 bin/addons/base/ir/ir_model.py                | 99 +------------------
 .../module/wizard/base_module_import_view.xml |  2 +-
 .../base/module/wizard/base_module_update.py  |  2 +-
 .../module/wizard/base_module_update_view.xml |  2 +-
 .../wizard/base_module_upgrade_view.xml       |  2 +-
 .../module/wizard/base_update_translations.py |  6 ++
 bin/addons/base/res/res_config.xml            |  2 +-
 bin/addons/base/res/res_lang_view.xml         | 47 +++++----
 bin/addons/base/res/res_log.py                |  7 +-
 bin/addons/base/res/res_log_view.xml          |  7 +-
 11 files changed, 50 insertions(+), 133 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 5da97026e48..3049fbb17b2 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -13,14 +13,13 @@
         <menuitem id="menu_custom_action" name="Actions" parent="base.menu_custom" groups="base.group_extended" sequence="20"/>
         <menuitem id="menu_config" name="Configuration" parent="base.menu_administration" sequence="1"/>
         <menuitem id="menu_translation" name="Translations" parent="base.menu_administration" sequence="4"/>
-        <menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4"/>
+        <menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4" groups="base.group_extended"/>
         <menuitem id="menu_translation_export" name="Import / Export"
-            groups="base.group_extended"
-            parent="base.menu_translation" sequence="4"/>
+            groups="base.group_extended" parent="base.menu_translation" sequence="3"/>
         <menuitem id="menu_users" name="Users" parent="base.menu_administration" sequence="6"/>
         <menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="8"
             groups="base.group_extended"/>
-        <menuitem id="menu_management" name="Modules Management" parent="base.menu_administration" sequence="10"
+        <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
         <menuitem icon="terp-graph" id="reporting_menu" name="Reporting" sequence="45"
             groups="group_extended"/>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 69a9e2990c5..27ccb9286ee 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -142,103 +142,6 @@ class ir_model(osv.osv):
         x_custom_model._rec_name = x_name
 ir_model()
 
-
-class ir_model_grid(osv.osv):
-    _name = 'ir.model.grid'
-    _table = 'ir_model'
-    _inherit = 'ir.model'
-    _description = "Objects Security Grid"
-
-    def create(self, cr, uid, vals, context=None):
-        raise osv.except_osv('Error !', 'You cannot add an entry to this view !')
-
-    def unlink(self, *args, **argv):
-        raise osv.except_osv('Error !', 'You cannot delete an entry of this view !')
-
-    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
-        result = super(osv.osv, self).read(cr, uid, ids, fields, context, load)
-        allgr = self.pool.get('res.groups').search(cr, uid, [], context=context)
-        acc_obj = self.pool.get('ir.model.access')
-
-        if not isinstance(result,list):
-            result=[result]
-
-        for res in result:
-            rules = acc_obj.search(cr, uid, [('model_id', '=', res['id'])])
-            rules_br = acc_obj.browse(cr, uid, rules, context=context)
-            for g in allgr:
-                res['group_'+str(g)] = ''
-            for rule in rules_br:
-                perm_list = []
-                if rule.perm_read:
-                    perm_list.append('r')
-                if rule.perm_write:
-                    perm_list.append('w')
-                if rule.perm_create:
-                    perm_list.append('c')
-                if rule.perm_unlink:
-                    perm_list.append('u')
-                perms = ",".join(perm_list)
-                if rule.group_id:
-                    res['group_%d'%rule.group_id.id] = perms
-                else:
-                    res['group_0'] = perms
-        return result
-
-    #
-    # This function do not write fields from ir.model because
-    # access rights may be different for managing models and
-    # access rights
-    #
-    def write(self, cr, uid, ids, vals, context=None):
-        vals_new = vals.copy()
-        acc_obj = self.pool.get('ir.model.access')
-        for grid in self.browse(cr, uid, ids, context=context):
-            model_id = grid.id
-            perms_rel = ['read','write','create','unlink']
-            for val in vals:
-                if not val[:6]=='group_':
-                    continue
-                group_id = int(val[6:]) or False
-                rules = acc_obj.search(cr, uid, [('model_id', '=', model_id),('group_id', '=', group_id)])
-                if not rules:
-                    rules = [acc_obj.create(cr, uid, {
-                        'name': grid.name,
-                        'model_id':model_id,
-                        'group_id':group_id
-                    }) ]
-                vals2 = dict(map(lambda x: ('perm_'+x, x[0] in (vals[val] or '')), perms_rel))
-                acc_obj.write(cr, uid, rules, vals2, context=context)
-        return True
-
-    def fields_get(self, cr, uid, fields=None, context=None):
-        result = super(ir_model_grid, self).fields_get(cr, uid, fields, context)
-        groups = self.pool.get('res.groups').search(cr, uid, [])
-        groups_br = self.pool.get('res.groups').browse(cr, uid, groups)
-        result['group_0'] = {'string': 'All Users','type': 'char','size': 7}
-        for group in groups_br:
-            result['group_%d'%group.id] = {'string': '%s'%group.name,'type': 'char','size': 7}
-        return result
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
-        result = super(ir_model_grid, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        groups = self.pool.get('res.groups').search(cr, uid, [])
-        groups_br = self.pool.get('res.groups').browse(cr, uid, groups)
-        cols = ['model', 'name']
-        xml = '''<?xml version="1.0"?>
-<%s editable="bottom">
-    <field name="name" select="1" readonly="1" required="1"/>
-    <field name="model" select="1" readonly="1" required="1"/>
-    <field name="group_0"/>
-    ''' % (view_type,)
-        for group in groups_br:
-            xml += '''<field name="group_%d"/>''' % (group.id, )
-        xml += '''</%s>''' % (view_type,)
-        result['arch'] = xml
-        result['fields'] = self.fields_get(cr, uid, cols, context)
-        return result
-ir_model_grid()
-
 class ir_model_fields(osv.osv):
     _name = 'ir.model.fields'
     _description = "Fields"
@@ -327,7 +230,7 @@ class ir_model_access(osv.osv):
         'perm_read': fields.boolean('Read Access'),
         'perm_write': fields.boolean('Write Access'),
         'perm_create': fields.boolean('Create Access'),
-        'perm_unlink': fields.boolean('Delete Permission'),
+        'perm_unlink': fields.boolean('Delete Access'),
     }
 
     def check_groups(self, cr, uid, group):
diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index 8cb974167d9..9d1aa1bce49 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -7,7 +7,7 @@
             <field name="model">base.module.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Module import">
+            <form string="Import module">
             <separator string="Module Import" colspan="4"/>
             <label string="Please give your module .ZIP file to import." colspan="4"/>
             <field name="module_file"/>
diff --git a/bin/addons/base/module/wizard/base_module_update.py b/bin/addons/base/module/wizard/base_module_update.py
index 29e897b3a0c..eea5f5aaee4 100644
--- a/bin/addons/base/module/wizard/base_module_update.py
+++ b/bin/addons/base/module/wizard/base_module_update.py
@@ -92,7 +92,7 @@ class base_module_update_open(osv.osv_memory):
         """
         res = {
             'domain': str([]),
-            'name': 'Module List',
+            'name': 'Modules',
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'ir.module.module',
diff --git a/bin/addons/base/module/wizard/base_module_update_view.xml b/bin/addons/base/module/wizard/base_module_update_view.xml
index 08576006ba5..9091b5a1b9d 100644
--- a/bin/addons/base/module/wizard/base_module_update_view.xml
+++ b/bin/addons/base/module/wizard/base_module_update_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Scan for new modules">
-            <label string="This function will check for new modules in the 'addons' path" colspan="4" align="0.0"/>
+           <label string="This wizard will scan all module repositories (on the server side) to detect any new or updated modules. Please be patient as this operation may take a few seconds..." colspan="4" align="0.0"/>
             <separator string="" colspan="4" />
             <newline/>
             <group colspan="6" >
diff --git a/bin/addons/base/module/wizard/base_module_upgrade_view.xml b/bin/addons/base/module/wizard/base_module_upgrade_view.xml
index ce7d2e6b659..75e635b3ab4 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/bin/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -47,7 +47,7 @@
             <field name="model">base.module.upgrade</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="System update done">
+            <form string="Apply Scheduled Upgrades">
             <separator string="System update completed" colspan="4"/>
             <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
             <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
diff --git a/bin/addons/base/module/wizard/base_update_translations.py b/bin/addons/base/module/wizard/base_update_translations.py
index 7e61c0a2431..cc7a3361a29 100644
--- a/bin/addons/base/module/wizard/base_update_translations.py
+++ b/bin/addons/base/module/wizard/base_update_translations.py
@@ -50,6 +50,12 @@ class base_update_translations(osv.osv_memory):
         buf.close()
         return {'type': 'ir.actions.act_window_close'}
 
+    def default_get(self, cr, uid, fields, context=None):
+        lang_obj = self.pool.get('res.lang')
+        record_id = context and context.get('active_id', False) or False
+        lang=lang_obj.browse(cr,uid,record_id).code
+        return {'lang':lang}
+
     _name = 'base.update.translations'
     _columns = {
         'lang': fields.selection(_get_languages, 'Language', required=True),
diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 5adbfb41ced..28bfa0d1911 100644
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -19,7 +19,7 @@
            </group>
          </group>
          <group colspan="8" col="8">
-           <separator string="" colspan="8"/>
+           <separator string="" colspan="6"/>
            <group colspan="4" width="220">
              <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
            </group>
diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml
index bf1e611c3d6..cbe5fb388ba 100644
--- a/bin/addons/base/res/res_lang_view.xml
+++ b/bin/addons/base/res/res_lang_view.xml
@@ -24,22 +24,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Languages">
-                	<group col="4" colspan="4">
-                    <field name="name" colspan="4"/>
-                    <field name="code" />
-                    <field name="iso_code"/>
-                    <field name="active" />
-                    <field name="translatable"/>
-                    <field name="grouping" />
-                    <field name="direction" />
-                    <newline/>
-                    <field name="date_format"/>
-                    <field name="time_format"/>
-                    <field name="decimal_point"/>
-                    <field name="thousands_sep"/>
-                    <newline/>
-                    </group>
-                    <separator colspan="4" string="Legends for Date and Time Formats"/>
+                	<group col="6" colspan="4">
+                    	<field name="name"/>
+                   		<field name="code" />
+                    	<field name="iso_code"/>
+                    	<newline/>
+                    	<field name="grouping" />
+                    	<field name="date_format"/>
+              		    <field name="time_format"/>
+              		    <newline/>
+						<field name="direction" />
+           		        <field name="decimal_point"/>
+           		        <field name="thousands_sep"/>
+           		        <newline/>
+           		        <field name="active" />
+	                    <field name="translatable"/>
+           		    </group>
+					<separator colspan="4" string="Legends for Date and Time Formats"/>
                     <group col="4" colspan="4">
 	                     <label align="0.0" string="%%a - Abbreviated weekday name."/>
 	                     <label align="0.0" string="%%A - Full weekday name."/>
@@ -106,10 +107,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Languages">
-					<field name="name"/>
-					<field name="code"/>
-					<field name="iso_code"/>
-					<field name="direction"/>
+	                 <group>
+	                	<filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
+	                    <separator orientation="vertical"/>
+						<field name="name"/>
+						<field name="code"/>
+						<field name="iso_code"/>
+						<field name="direction"/>
+					</group>
                 </search>
             </field>
         </record>
@@ -121,6 +126,6 @@
             <field name="context">{'active_test': False}</field>
             <field name="search_view_id" ref="res_lang_search"/>
         </record>
-        <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation"/>
+        <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation" groups="base.group_extended" sequence="1"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 886221ada77..97ee249fccd 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-import tools 
+import tools
 
 class res_log(osv.osv_memory):
     _name = 'res.log'
@@ -29,7 +29,8 @@ class res_log(osv.osv_memory):
         'user_id': fields.many2one('res.users','User', required=True),
         'res_model': fields.char('Object', size=128),
         'res_id': fields.integer('Object ID'),
-        'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on')
+        'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
+        'create_date': fields.datetime('Created Date', readonly=True),
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid
diff --git a/bin/addons/base/res/res_log_view.xml b/bin/addons/base/res/res_log_view.xml
index 046d93f1788..24857831bfc 100644
--- a/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@ -23,6 +23,7 @@
                 <tree string="Logs">
                     <field name="name"/>
                     <field name="user_id"/>
+                    <field name="create_date"/>
                 </tree>
             </field>
         </record>
@@ -32,11 +33,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Logs">
-                    <group colspan="4" col="6">
-                        <field name="name" colspan="4"/>
+                 <field name="name" colspan="3"/>
+                 <newline/>
+                    <group colspan="4" col="8">
                         <field name="user_id" />
                         <field name="res_model"/>
                         <field name="res_id"/>
+                        <field name="create_date" colspan="1"/>
                     </group>
                 </form>
             </field>

From 1a6eb1e917b78f3dffacf3cc2beb2e29dd0290e2 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 13:28:17 +0530
Subject: [PATCH 151/632] [IMP]: base:Improvement in base module

bzr revid: ron@tinyerp.com-20100929075817-ve8a7w8gw6e6v7k1
---
 bin/addons/base/base_menu.xml            |  2 +-
 bin/addons/base/ir/ir_actions.py         |  2 +-
 bin/addons/base/ir/ir_filters.py         |  2 +-
 bin/addons/base/res/ir_property_view.xml |  2 +-
 bin/addons/base/res/res_request_view.xml | 31 +++++++++++++++---------
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 5da97026e48..3fe8e96a352 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -5,7 +5,7 @@
         <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
-            groups="base.group_extended"/>
+            groups="base.group_extended,base.group_no_one"  />
         <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 4b9d59743cb..09469e33450 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -36,7 +36,7 @@ class actions(osv.osv):
     _table = 'ir_actions'
     _columns = {
         'name': fields.char('Action Name', required=True, size=64),
-        'type': fields.char('Action Type', required=True, size=32),
+        'type': fields.char('Action Type', required=True, size=32,readonly=True),
         'usage': fields.char('Action Usage', size=32),
     }
     _defaults = {
diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 2821d0c94b7..8f9869a6922 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -42,7 +42,7 @@ class ir_filters(osv.osv):
         'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
-        'model_id': fields.selection(_list_all_models, 'Model', required=True),
+        'model_id': fields.selection(_list_all_models, 'Object', required=True),
     }
 
 ir_filters()
diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index f5a951d0c29..399cac47136 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -73,7 +73,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config"/>
+        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" />
         <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 3e83f6c3e96..2b1195df51c 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    	<menuitem name="Requests" id="menu_resquest_ref" parent="base.next_id_4" sequence="1"/>
+
         <record id="res_request_tree-view" model="ir.ui.view">
             <field name="name">res.request.tree</field>
             <field name="model">res.request</field>
@@ -40,9 +42,9 @@
                             <field colspan="4" name="body" nolabel="1"/>
                             <group col="5" colspan="4">
                                 <field name="state"/>
-                                <button name="request_close" states="waiting,draft,active" string="End of Request" type="object"/>
-                                <button name="request_send" states="draft,active" string="Send" type="object"/>
-                                <button name="request_reply" states="waiting" string="Reply" type="object"/>
+                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-stop"/>
+                                <button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/>
+                                <button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
                             </group>
                         </page>
                         <page string="References" groups="base.group_extended">
@@ -75,12 +77,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Requests">
-                    <group colspan="4" col="10">
-	                    <field name="act_from"/>
-	                    <field name="act_to" select="1"/>
-	                    <field name="name"/>
-	                    <field name="state"/>
-	                </group>
+                    <filter string="Current" icon="terp-camera_test" domain="['|',('state','=','draft'),('state','=','active')]"
+                    help="Draft and Active"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state','=','waiting')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="act_from"/>
+                    <field name="act_to" select="1"/>
+                    <field name="name"/>
+                    <field name="state"/>
 	                <newline/>
 	                <group expand="0" string="Group By" colspan="4">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -108,7 +113,7 @@
             <field name="search_view_id" ref="res_request_search_view"/>
             <field name="context">{"search_default_act_to":uid}</field>
         </record>
-        <menuitem action="res_request-act" id="menu_res_request_act" parent="base.next_id_4" sequence="1"/>
+        <menuitem action="res_request-act" id="menu_res_request_act" parent="menu_resquest_ref" />
 
         <record id="res_request_link-view" model="ir.ui.view">
             <field name="name">res.request.link.form</field>
@@ -146,14 +151,16 @@
         </record>
 
         <record id="res_request_link-act" model="ir.actions.act_window">
-            <field name="name">References Link</field>
+            <field name="name">Request Reference Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.request.link</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="res_request_link_search_view"/>
         </record>
-        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_4" sequence="4"/>
+        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="menu_resquest_ref" />
+
+
 
 
         <record id="res_request_history_tree-view" model="ir.ui.view">

From 278b1454c0a166fedef40efaab390b7e43eb0213 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Wed, 29 Sep 2010 13:54:37 +0530
Subject: [PATCH 152/632] [IMP]:Change the name of button.

bzr revid: jni@tinyerp.com-20100929082437-knbp6re6k69ii44p
---
 addons/account/wizard/account_vat_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index c8a6645f744..72c6fa768e5 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -16,7 +16,7 @@
                 <field name="periods" nolabel="1" colspan="2"/>
                 <group col="2" colspan="4">
                     <button icon='gtk-cancel' special="cancel"  string="Cancel" />
-                    <button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
+                    <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>
                 </group>
             </form>
             </field>

From f3bb5ba6c9a1c2a1fba41a4a4e8bfd4a8a41d672 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 14:07:44 +0530
Subject: [PATCH 153/632] [IMP] stock: Improve the view of dashboard

bzr revid: sbh@tinyerp.com-20100929083744-84pl51rfc8h6z51d
---
 addons/stock/board_warehouse_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 2166dea00fd..20a99f0ab6a 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -32,14 +32,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Warehouse board">
-                    <hpaned position="100">
+                    <hpaned position="200">
                         <child1>
 					    	<action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
-					    
+					    	<action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
                         </child1>
 
                         <child2>
-						<action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />                        
+						                        
 					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
 <!--					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
 -->                        </child2>

From 9f597d43cecb7a59783dd8a9a3d014f990496b97 Mon Sep 17 00:00:00 2001
From: "SAZ(OpenERP)" <>
Date: Wed, 29 Sep 2010 14:19:36 +0530
Subject: [PATCH 154/632] [IMP]:Changed the title of Tax Report

bzr revid: jni@tinyerp.com-20100929084936-87wfc7rr0xooep2l
---
 addons/account/report/tax_report.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index 9ad4ff56112..2434437e803 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -104,7 +104,7 @@
 
   </stylesheet>
   <story>
-	<para style="P2">Taxes</para>
+	<para style="P2">Tax Statement</para>
 	<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
 	  <tr>
 	    <td><para style="P12">Tax Name</para></td>

From e5b5e202b46de0cf7ff824127b767281f56f9931 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 15:57:23 +0530
Subject: [PATCH 155/632] [MOD] hr_recruitment : job position, state changed to
 old when expected and no of employee will be same

bzr revid: vir@tinyerp.com-20100929102723-eyxqhmhpo5rcir5j
---
 addons/hr_recruitment/hr_recruitment.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index b9241477409..fbb1287afb4 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -436,8 +436,10 @@ class hr_applicant(crm.crm_case, osv.osv):
         if applicant.job_id :
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp,'state': 'old'})
+            if job_data.expected_employees == int(job_data.no_of_employee):
+                job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
+#            expected_emp = job_data['expected_employees'] - 1
+#            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
 
         return res
 

From 06b263590b67e20c48043646418326057116c3e8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 29 Sep 2010 16:04:24 +0530
Subject: [PATCH 156/632] [MOD/IMP]hr_*:usability improvement

bzr revid: dbr@tinyerp.com-20100929103424-ffqsulgieop241zv
---
 addons/hr/hr_view.xml                   | 2 +-
 addons/hr_contract/hr_contract_view.xml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 7d2cec69667..f3edf5ab4e2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -147,7 +147,7 @@
             <field name="domain">[]</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
-            <field name="help">The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.</field>
+            <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index cb486df91b1..ba77b630385 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -155,8 +155,8 @@
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
                     <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Working Schedule" icon="terp-personal+" domain="[]" context="{'group_by':'working_hours'}"/>
-                    <filter string="Current" icon="terp-stock_symbol-selection" 
+                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                    <filter string="Current" icon="terp-stock_symbol-selection" name="current"
                             domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]" 
                             context="{'group_by':'date_end'}"/>                    
                    </group>
@@ -213,7 +213,7 @@
                     <field name="employee_id"/>
                     <field name="type_id"/>
                     <field name="job_id"/>
-                    <field name="department_id"/>
+                    <!--field name="department_id"/-->
                     <field name="working_hours"/>                    
                     <field name="date_start"/>
                     <field name="date_end"/>
@@ -229,6 +229,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 

From 4d0025737fa148cbf0e9d258b53a4ce4d02c37ea Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 16:37:18 +0530
Subject: [PATCH 157/632] [FIX]: base module :in action parent menu

bzr revid: ron@tinyerp.com-20100929110718-usm83e55csfc6tkd
---
 bin/addons/base/ir/ir.xml                    | 2 +-
 bin/addons/base/security/ir.model.access.csv | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 63d5daf071e..08c2b6af2bb 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -106,7 +106,6 @@
 	    </record>
 
 
-        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 
 
         <!-- Values -->
@@ -342,6 +341,7 @@
         </record>
         <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
+        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 
         <!--Filters form view-->
 
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 9168d93078d..481007d52b2 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -8,12 +8,10 @@
 "access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
-"access_ir_model_grid_group_erp_manager","ir_model_access_grid_group_erp_manager","model_ir_model_grid","group_erp_manager",1,1,1,1
 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1
 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1
 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0
 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0
-"access_ir_model_grid_all","ir_model_access_grid_all","model_ir_model_grid",,0,0,0,0
 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0

From b4779a1bd361a979b997345bc66444f7b97d517f Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 29 Sep 2010 16:42:00 +0530
Subject: [PATCH 158/632] [IMP/FIX]: base : Improvement in User,Security menu

bzr revid: jas@tinyerp.com-20100929111200-fs00cbqhpo4uzz3z
---
 bin/addons/base/base_update.xml               |  45 +--
 bin/addons/base/ir/ir.xml                     | 293 ++++++++----------
 bin/addons/base/ir/ir_model.py                |   1 +
 .../base/maintenance/maintenance_view.xml     |  12 +-
 .../wizard/base_export_language_view.xml      |  62 ++--
 .../wizard/base_import_language_view.xml      |  32 +-
 .../base/module/wizard/base_module_upgrade.py |   4 +-
 bin/addons/base/res/res_log_view.xml          |   5 +-
 bin/addons/base/security/ir.model.access.csv  |   2 -
 9 files changed, 223 insertions(+), 233 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 361bbfa67a0..af6d4f59a22 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -114,21 +114,30 @@
                     <newline/>
                     <notebook colspan="4">
                         <page string="User">
-                            <field name="company_id" required="1"
-                                context="{'user_id': self, 'user_preference': 1}"
-                                on_change="on_change_company_id(company_id)"
-                                groups="base.group_multi_company"
-                                />                        
-                            <field name="address_id" select="1"/>
-                            <field name="user_email" widget="email"/>
-                            <field name="context_lang"/>   
-                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
-                            <field name="action_id" required="True"/>
-
-
-                            <field name="context_tz"/>
-                            <field name="view" readonly="0"/>
-                            <field name="menu_tips" colspan="2"/>
+	                        <group colspan="1" col="2">
+	                          <separator string="Contact" colspan="2"/>
+	                            <field name="company_id" required="1"
+	                                context="{'user_id': self, 'user_preference': 1}"
+	                                on_change="on_change_company_id(company_id)"
+	                                groups="base.group_multi_company"
+	                                />
+	                            <field name="address_id" select="1"/>
+	                            <field name="user_email" widget="email"/>
+							</group>
+							<group colspan="1" col="2" groups="base.group_extended">
+							<separator string="Action" colspan="2"/>
+                           		 <field name="action_id" required="True"/>
+                           		 <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
+                            </group>
+                            <group colspan="1" col="2">
+							  <separator string="Preferences" colspan="2"/>
+                           		 <field name="context_lang"/>
+                          		 <field name="context_tz"/>
+                          		 <group colspan="2" col="4">
+	                                 <field name="view" readonly="0"/>
+	                                 <field name="menu_tips" colspan="2"/>
+                                 </group>
+                            </group>
                             <newline/>
                             <group colspan="2" col="2">
                                 <separator string="Signature" colspan="2"/>
@@ -142,7 +151,7 @@
                         <page string="Roles">
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
-                        <page string="Companies">
+                        <page string="Companies" groups="base.group_multi_company">
                             <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
@@ -157,7 +166,7 @@
                 <tree string="Users">
                     <field name="name"/>
                     <field name="login"/>
-                    <field name="address_id" string="Address" />
+                    <field name="context_lang"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
@@ -172,7 +181,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="address_id" string="Address"/>
-                    <field name="company_ids" string="Company"/>
+                    <field name="company_ids" string="Company" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index d6c092bd6f6..0e88dfc6bce 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -10,22 +10,14 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Connect Events to Actions">
-                	<group col="6" colspan="4">
                     <field name="name" required="1"/>
                     <field name="model_id" on_change="onchange_object_id(model_id)"/>
                     <field name="action_id" on_change="onchange_action_id(action_id)"/>
                     <field name="key2" required="1"/>
-                    <field name="res_id"/>
                     <field name="object" readonly="1"/>
-					</group>
-                	<group col="2" colspan="2">
-                        <separator colspan="2" string="Value"/>
-                    	<field name="value_unpickle" nolabel="1"/>
-                    </group>
-                	<group col="2" colspan="2">
-                        <separator colspan="2" string="Metadata"/>
-	                    <field name="meta_unpickle" nolabel="1"/>
-                    </group>
+                    <field name="res_id"/>
+                    <field name="value_unpickle"/>
+                    <field name="meta_unpickle"/>
                     <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </form>
@@ -55,17 +47,12 @@
                     <field name="name"/>
                     <field name="model"/>
                     <field name="key2"/>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
-                    </group>
                 </search>
             </field>
         </record>
 
         <record id="act_values_form_action" model="ir.actions.act_window">
-            <field name="name">Client Events</field>
+            <field name="name">Client Actions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
@@ -89,9 +76,7 @@
 	        <field name="act_window_id" ref="act_values_form_action"/>
 	    </record>
 
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
-
-        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
+        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/>
 
 
         <!-- Values -->
@@ -269,7 +254,7 @@
         </record>
 
         <record id="ir_sequence_type" model="ir.actions.act_window">
-            <field name="name">Sequence Codes</field>
+            <field name="name">Sequence Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.sequence.type</field>
             <field name="view_type">form</field>
@@ -325,8 +310,7 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-
-
+        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
 
         <!--Filters form view-->
@@ -842,29 +826,23 @@
                 <search string="Role">
                     <field name="name"/>
                     <field name="parent_id"/>
+                    <field name="description"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Parent" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/>
+                	</group>
                 </search>
             </field>
         </record>
 
-        <record id="action_res_roles" model="ir.actions.act_window">
-            <field name="name">Roles Structure</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.roles</field>
-            <field name="view_type">tree</field>
-            <field eval="[('parent_id','=',False)]" name="domain"/>
-        </record>
-        <menuitem action="action_res_roles"
-            groups="base.group_extended"
-            id="menu_action_res_roles" parent="base.menu_users"/>
-
-        <record id="action_res_roles_form" model="ir.actions.act_window">
+       <record id="action_res_roles_form" model="ir.actions.act_window">
             <field name="name">Roles</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.roles</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_roles_search"/>
         </record>
-        <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="menu_action_res_roles"/>
+        <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="base.menu_users"/>
 
         <!-- View -->
         <record id="view_view_form" model="ir.ui.view">
@@ -873,25 +851,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views">
-		            <group colspan="4" col="6">
-		                <field name="name" select="1" colspan="6"/>
-		                <field name="type" select="1"/>
-		                <field name="model" select="1"/>
-		                <field name="priority"/>
-		            </group>
-                    <notebook colspan="4">
-                    	<page string="Architecture">
-	                    	<field colspan="4" nolabel="1" name="arch"/>
-	                	</page>
-                    	<page string="Extra Info">
-	                        <separator string="Advanced" colspan="4"/>
-	                        <newline/>
-	                        <field name="field_parent"/>
-	                        <field name="inherit_id" select="1"/>
-	                        <field name="xml_id" select="1"/>
-	                	</page>
-
-	                </notebook>
+                    <group colspan="2" col="2">
+                        <separator string="General" colspan="2"/>
+                        <field name="name" select="1"/>
+                        <field name="type" select="1"/>
+                        <field name="model" select="1"/>
+                        <field name="priority"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Advanced" colspan="2"/>
+                        <field name="field_parent"/>
+                        <field name="inherit_id" select="1"/>
+                        <field name="xml_id" select="1"/>
+                    </group>
+                    <separator string="View architecture" colspan="4"/>
+                    <field colspan="4" nolabel="1" name="arch"/>
                 </form>
             </field>
         </record>
@@ -918,13 +892,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Views">
-                    <filter icon="terp-stock_zoom" string="Search"
-                        domain="[('type', '=', 'search')]" />
-                    <filter icon="gtk-indent" string="Tree"
-                        domain="[('type', '=', 'tree')]" />
-                    <filter icon="gtk-new" string="Form"
-                        domain="[('type', '=','form')]" />
-                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="type"/>
                     <field name="model"/>
@@ -932,7 +899,7 @@
                     <field name="xml_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
@@ -954,14 +921,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Attachments">
-                    <group colspan="4" col="2">
+                    <group colspan="4" col="4">
                         <field name="name" select="1" />
+                        <field name="type"/>
                     </group>
                     <notebook colspan="4">
                     <page string="Attachment">
                     <group col="4" colspan="4">
-                        <separator string="Data" colspan="2"/>
-                        <field name="type"/>
+                        <separator string="Data" colspan="4"/>
                         <newline />
                         <group col="2" colspan="4" attrs="{'invisible':[('type','=','url')]}">
                             <field name="datas" filename="datas_fname"/>
@@ -1010,13 +977,21 @@
             <field name="arch" type="xml">
                 <search string="Attachments">
                     <group colspan="4" col="10">
+                      <filter icon="terp-stage"
+                        string="URL"
+                        domain="[('type','=','url')]"/>
+                      <filter icon="terp-stock_align_left_24"
+                        string="Binary"
+                        domain="[('type','=','binary')]"/>
+                    <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="datas_fname"/>
                         <field name="type"/>
+                        <field name="datas_fname"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By" colspan="4">
-                        <filter string="File Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Creator" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter string="Date" icon="terp-calendar" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
             </field>
@@ -1182,7 +1157,7 @@
                                         <field name="translate"/>
                                         <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
                                     </group>
-                                    <separator string="Security on Groups" colspan="4"/>
+                                    <separator string="Groups" colspan="4"/>
                                     <field name="groups" colspan="4" nolabel="1"/>
                                 </form>
                             </field>
@@ -1235,18 +1210,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Model Description">
-                    <filter icon="terp-camera_test" string="In Memory"
-                        domain="[('osv_memory', '=', True)]" />
-                    <separator orientation="vertical" />
-                    <filter icon="terp-stock_symbol-selection"
-                        string="Custom" domain="[('state', '=', 'manual')]" />
-                    <separator orientation="vertical" />
-                    <filter icon="terp-stock_align_left_24" string="Base"
-                        domain="[('state', '=', 'base')]" />
-                    <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="model"/>
-                    <newline/>
+                    <field name="osv_memory"/>
+                    <field name="state"/>
+                    <field name="access_ids"/>
+                    <field name="info"/>
                 </search>
             </field>
         </record>
@@ -1258,12 +1227,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fields">
-                	<group colspan="4" col="6">
-		                <field name="name" select="1" />
-		            	<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
-		            	<field name="field_description"/>
-		            	<field name="state"/>
-           	   		</group>
+                    <group colspan="4" col="4">
+                        <field name="name" select="1"/>
+                        <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
+                        <field name="field_description"/>
+                        <field name="state"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Properties">
                             <group colspan="2" col="2">
@@ -1313,29 +1282,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
-                	<filter icon="terp-camera_test"
-                        string="Required"
-                        domain="[('required', '=', True)]"/>
-                    <separator orientation="vertical"/>
-                	<filter icon="terp-stock_align_left_24"
-                        string="Readonly"
-                        domain="[('readonly', '=', True)]"/>
-                    <separator orientation="vertical"/>
-                	<filter icon="terp-translate"
-                        string="Translate"
-                        domain="[('translate', '=', True)]"/>
-                    <newline/>
                     <field name="name"/>
                     <field name="field_description"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
-                    </group>
-
                 </search>
             </field>
         </record>
@@ -1378,10 +1330,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Module Data">
-                	<filter icon="terp-stock_effects-object-colorize"
-                        string="Updatable"
-                        domain="[('noupdate', '=', False)]"/>
-                    <separator orientation="vertical"/>
                     <field name="module"/>
                     <field name="name"/>
                     <field name="model"/>
@@ -1389,8 +1337,8 @@
                     <field name="noupdate"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
-                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Module" icon="terp-stage" domain="[]" context="{'group_by':'module'}"/>
+                        <filter string="Object" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'model'}"/>
                     </group>
                 </search>
             </field>
@@ -1433,7 +1381,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
-                    <filter icon="terp-project"
+                    <filter icon="terp-document-new"
                         string="Untranslated"
                         domain="['|',('value', '=', False),('value','=','')]"/>
                     <separator orientation="vertical"/>
@@ -1454,16 +1402,15 @@
                     <field name="type"/>
                     <field name="name"/>
                     <field name="res_id"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-		                    <separator string="Source Term" colspan="2"/>
-		                    <field name="src" nolabel="1" height="400"/>
-	                    </group>
-	                    <group colspan="2" col="2">
-		                    <separator string="Tranlsation Term" colspan="2"/>
-		                    <field name="value" nolabel="1" height="400"/>
-		                </group>
+                    <group colspan="2" col="2">
+		               <separator string="Source Term" colspan="2"/>
+		               <field name="src" nolabel="1" height="400"/>
 	                </group>
+	                <group colspan="2" col="2">
+		               <separator string="Tranlsation" colspan="2"/>
+		               <field name="value" nolabel="1" height="400"/>
+		            </group>
+
                 </form>
             </field>
         </record>
@@ -1488,7 +1435,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_translation_tree"/>
         </record>
-        <menuitem action="action_translation" id="menu_action_translation" parent="base.menu_translation_app"/>
+        <menuitem action="action_translation" id="menu_action_translation" parent="base.menu_translation_app" />
 
         <!--
     =============================================================
@@ -1548,7 +1495,7 @@
                         <field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Security on Groups">
+                        <page string="Groups">
 		                    <field name="groups_id" colspan="4" nolabel="1"/>
 		                </page>
 		            </notebook>
@@ -1569,13 +1516,13 @@
 	    </record>
 
         <record id="grant_menu_access" model="ir.actions.act_window">
-            <field name="name">Manage Menus</field>
+            <field name="name">Menu Items</field>
             <field name="res_model">ir.ui.menu</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_menu"/>
             <field name="search_view_id" ref="edit_menu_access_search"/>
         </record>
-        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security" sequence="1"/>
+        <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/>
 
         <!--
     =============================================================
@@ -1622,8 +1569,7 @@
                         <separator string="Action to Trigger" colspan="4"/>
                         <field name="model" groups="base.group_extended"/>
                         <field name="function"/>
-                        <separator string="Arguments" colspan="4"/>
-                        <field colspan="4" name="args" nolabel="1"/>
+                        <field colspan="4" name="args"/>
                     </page>
                     </notebook>
                 </form>
@@ -1642,8 +1588,8 @@
                     <field name="active"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Execution" icon="terp-go-month"
+                        <filter string="User" icon="terp-personal-" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Next Call" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'nextcall'}" />
                     </group>
                 </search>
@@ -1698,14 +1644,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access Controls">
-                    <field colspan="4" name="name"/>
-                    <field name="model_id"/>
-                    <field name="group_id"/>
-                    <newline/>
-                    <field name="perm_read"/>
-                    <field name="perm_write"/>
-                    <field name="perm_create"/>
-                    <field name="perm_unlink"/>
+                    <group col="6" colspan="4">
+	                    <field name="name"/>
+	                    <field name="model_id"/>
+	                    <field name="group_id"/>
+	                </group>
+	                <separator string="Access" colspan="4"/>
+		                <group col="4" colspan="4">
+							<field name="perm_read"/>
+			                <field name="perm_write"/>
+			                <field name="perm_create"/>
+			                <field name="perm_unlink"/>
+			           </group>
                 </form>
             </field>
         </record>
@@ -1715,9 +1665,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Access Controls">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="group_id"/>
+                <group>
+                		<filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
+                        <filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
+	                    <separator orientation="vertical"/>
+                		<field name="name"/>
+	          			<field name="model_id"/>
+	            		<field name="group_id"/>
+	            </group>
+	            <newline/>
+	            <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                     <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
+                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+               	</group>
                 </search>
             </field>
         </record>
@@ -1729,8 +1692,7 @@
             <field name="view_id" ref="ir_access_view_tree"/>
             <field name="search_view_id" ref="ir_access_view_search"/>
         </record>
-        <menuitem name="Access Controls" id="menu_security_access" parent="menu_security" sequence="5"/>
-        <menuitem action="ir_access_act" id="menu_ir_access_act" parent="menu_security_access"/>
+      <menuitem action="ir_access_act" id="menu_ir_access_act" parent="base.menu_security"/>
 
         <!-- Rules -->
 
@@ -1796,9 +1758,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Record rules">
-                    <field name="model_id"/>
-                    <field name="global"/>
-                    <field name="groups"/>
+                	<group>
+                        <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                        <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
+                        <filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="model_id"/>
+	                    <field name="global"/>
+	                    <field name="groups"/>
+	                </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                	</group>
                 </search>
             </field>
         </record>
@@ -1943,15 +1917,7 @@
             <field name="search_view_id" ref="view_server_action_search"/>
             <field name="context">{'key':'server_action'}</field>
         </record>
-        <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
-
-        <record model="ir.actions.act_window" id="action_model_grid_security">
-            <field name="name">Access Controls Grid</field>
-            <field name="res_model">ir.model.grid</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem action="action_model_grid_security" id="menu_ir_access_grid" parent="menu_security_access"/>
+        <menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
 
         <record id="ir_actions_todo_tree" model="ir.ui.view">
             <field name="model">ir.actions.todo</field>
@@ -1961,10 +1927,11 @@
                 <tree editable="bottom" string="Config Wizard Steps">
                     <field name="sequence"/>
                     <field name="action_id"/>
-                    <field name="restart"/>
                     <field name="state" readonly="1"/>
-                    <button name="action_open" states="cancel,skip,done" string="Set as todo" type="object" icon="gtk-convert"/>
-                    <button name="action_launch" states="open" string="Launch this wizard" type="object" icon="gtk-execute"/>
+                    <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
+                    <button name="action_open" states="cancel,skip,done"
+                            string="Todo" type="object" help="Set as Todo"
+                            icon="gtk-convert"/>
                 </tree>
             </field>
         </record>
@@ -1984,8 +1951,10 @@
                     <field name="groups_id" nolabel="1" colspan="4"/>
                     <group colspan="4" col="4">
                         <field name="state" colspan="2" readonly="1"/>
-                        <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch this wizard"/>
-                        <button name="action_open" states="cancel,skip,done" string="Set as todo" type="object" icon="gtk-convert"/>
+                        <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
+                        <button name="action_open" states="cancel,skip,done"
+                            string="Set as Todo" type="object"
+                            icon="gtk-convert"/>
                     </group>
                 </form>
             </field>
@@ -1999,8 +1968,8 @@
                 <search string="Search Actions">
                 	<filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
                 	<separator orientation="vertical"/>
-                	<field name="state"/>
-					<field name="restart"/>
+                    <field name="state"/>
+                    <field name="restart"/>
                 </search>
             </field>
         </record>
@@ -2013,8 +1982,14 @@
         </record>
         <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
 
+        <wizard id="wizard_configuration" model="ir.module.module" name="module.configuration" string="Start Configuration"/>
         <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
                 parent="next_id_11" groups="base.group_extended" sequence="20"/>
 
+        <menuitem
+            action="wizard_configuration" name="Start Configuration"
+            id="menu_configurator_module" parent="next_id_11"
+            type="wizard"/>
+
     </data>
 </openerp>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 27ccb9286ee..5410cba10a6 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -63,6 +63,7 @@ class ir_model(osv.osv):
         is_osv_mem = self._is_osv_memory(cr, uid, all_model_ids, 'osv_memory', arg=None, context=context)
         return [('id', 'in', [id for id in is_osv_mem if bool(is_osv_mem[id]) == value])]
 
+
     _columns = {
         'name': fields.char('Object Name', size=64, translate=True, required=True),
         'model': fields.char('Object', size=64, required=True, select=1),
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 8b4021347d4..9a66e5b111e 100644
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -23,10 +23,11 @@
             <field name="arch" type="xml">
                 <form string="Maintenance Contract">
                     <separator string="Information" colspan="4"/>
-                    <field name="name"/>
-                    <newline/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
+                    <group col="6" colspan="4">
+	                    <field name="name"/>
+	                    <field name="date_start"/>
+	                    <field name="date_stop"/>
+	                </group>
                     <separator string="Covered Modules" colspan="4"/>
                     <field name="module_ids" nolabel="1" colspan="4">
                         <tree string="Covered Modules">
@@ -89,8 +90,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Maintenance Contract" col="2">
-                    <image name="gtk-dialog-info" />
-                    <group col="1">
+                        <group col="1">
                         <separator string="Add Maintenance Contract" />
                         <group states="draft">
                             <field name="name" width="250" />
diff --git a/bin/addons/base/module/wizard/base_export_language_view.xml b/bin/addons/base/module/wizard/base_export_language_view.xml
index cae515425d5..99435be8736 100644
--- a/bin/addons/base/module/wizard/base_export_language_view.xml
+++ b/bin/addons/base/module/wizard/base_export_language_view.xml
@@ -7,38 +7,44 @@
             <field name="model">base.language.export</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Export language">
-                    <notebook>
-                        <page string="Export Data">
-                            <group colspan="4" states="choose">
-                                <separator colspan="4" string="Export translation file"/>
-                                <field name="lang" required="1"/>
-                                <field name="format" required="1"/>
-                                <field height="200" name="modules" nolabel="1" colspan="4"/>
-                                <field invisible="1" name="state"/>
-                            </group>
-                            <group colspan="4" states="get">
-                                <separator string="Export done" colspan="4"/>
-                                <field name="name" invisible="1" colspan="4"/>
-                                <field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
-                                <field height="80" name="advice" nolabel="1" colspan="4"/>
-                            </group>
-                            <separator string="" colspan="4"/>
-                                <group col="2" colspan="2">
-                                </group>
-                                <group col="2" colspan="2">
-                                    <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Cancel" type="object"/>
-                                    <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
-                                    <button icon="gtk-cancel" name="act_destroy" special="cancel" states="get" string="_Cancel" type="object"/>
-                                </group>
-                        </page>
-                        <page string="Help">
+                <form string="Export Translation File">
+                  <group colspan="3">
+                      <group colspan="1">
                             <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
+                            <label align="0.0" colspan="4" string=""/>
                             <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
+                            <label align="0.0" colspan="4" string=""/>
                             <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
                             <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
-                        </page>
-                    </notebook>
+                       </group>
+                       <group colspan="1">
+                       <separator orientation="vertical" rowspan="15"/>
+                       </group>
+  				       <group colspan="1">
+                          <group colspan="4" states="choose">
+                              <separator colspan="4" string="Export Translation File"/>
+                              <field name="lang" required="1"/>
+                              <field name="format" required="1"/>
+                              <field height="200" name="modules" nolabel="1" colspan="4"/>
+                              <field invisible="1" name="state"/>
+                          </group>
+                          <group colspan="4" states="get">
+                              <separator string="Export done" colspan="4"/>
+                              <field name="name" invisible="1" colspan="4"/>
+                              <field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
+                              <field height="80" name="advice" nolabel="1" colspan="4"/>
+                          </group>
+                           <separator string="" colspan="4"/>
+                    		<group colspan="2" col="2">
+                    		</group>
+                          <group col="2" colspan="2">
+                             <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Close" type="object"/>
+                             <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
+                             <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="_Close" type="object"/>
+                          </group>
+                        </group>
+                    </group>
+
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/bin/addons/base/module/wizard/base_import_language_view.xml
index eb73e8d4370..32c828ecd50 100644
--- a/bin/addons/base/module/wizard/base_import_language_view.xml
+++ b/bin/addons/base/module/wizard/base_import_language_view.xml
@@ -7,11 +7,21 @@
             <field name="model">base.language.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import language">
-            <notebook colspan="4">
-                <page string="Import Data">
+            <form string="Import Translation File">
+            <group colspan="3">
+                 <group colspan="1">
+                      <label string="You have to import a .CSV file which is encoded in UTF-8."/>
+                      <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
+                      <label string="type,name,res_id,src,value" colspan="4"/>
+                      <label string="module,type,name,res_id,src,value" colspan="4"/>
+                      <label string="You can also import .po files." colspan="4" align="0.0"/>
+                 </group>
+                 <group colspan="1">
+                      <separator orientation="vertical" rowspan="8"/>
+                 </group>
+                 <group colspan="1">
                     <group colspan="4" col="4">
-                        <separator string="Import New Language" colspan="4"/>
+                        <separator string="Import Translation File" colspan="4"/>
                         <field name="name" width="200"/>
                         <field name="code"/>
                         <field name="data" colspan="4"/>
@@ -20,19 +30,11 @@
                     <group colspan="2" col="2">
                     </group>
                     <group colspan="2" col="2">
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
                         <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
                     </group>
-                </page>
-                <page string="Help">
-                    <label string="You have to import a .CSV file which is encoded in UTF-8."/>
-                    <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
-                    <label string="type,name,res_id,src,value" colspan="4"/>
-                    <label string="module,type,name,res_id,src,value" colspan="4"/>
-                    <label string="You can also import .po files." colspan="4" align="0.0"/>
-                </page>
-            </notebook>
-
+                </group>
+			</group>
             </form>
             </field>
         </record>
diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py
index 500622489e7..79ec7c80997 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade.py
+++ b/bin/addons/base/module/wizard/base_module_upgrade.py
@@ -39,7 +39,7 @@ class base_module_upgrade(osv.osv_memory):
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
+         @param context: A standard dictionary
          @return: New arch of view.
         """
         res = super(base_module_upgrade, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
@@ -50,7 +50,7 @@ class base_module_upgrade(osv.osv_memory):
 
         ids = self.get_module_list(cr, uid, context=context)
         if not ids:
-            res['arch'] = '''<form string="System update done">
+            res['arch'] = '''<form string="Apply Scheduled Upgrades">
                                 <separator string="System update completed" colspan="4"/>
                                 <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
                                 <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>
diff --git a/bin/addons/base/res/res_log_view.xml b/bin/addons/base/res/res_log_view.xml
index 24857831bfc..59592fe9061 100644
--- a/bin/addons/base/res/res_log_view.xml
+++ b/bin/addons/base/res/res_log_view.xml
@@ -33,9 +33,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Logs">
-                 <field name="name" colspan="3"/>
-                 <newline/>
-                    <group colspan="4" col="8">
+                 <field name="name"/>
+                 <group colspan="4" col="8">
                         <field name="user_id" />
                         <field name="res_model"/>
                         <field name="res_id"/>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 9168d93078d..481007d52b2 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -8,12 +8,10 @@
 "access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
-"access_ir_model_grid_group_erp_manager","ir_model_access_grid_group_erp_manager","model_ir_model_grid","group_erp_manager",1,1,1,1
 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1
 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1
 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0
 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0
-"access_ir_model_grid_all","ir_model_access_grid_all","model_ir_model_grid",,0,0,0,0
 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0

From e02136b48c12ed6b859f8b7aeb5bb0565bde6cc5 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 17:00:40 +0530
Subject: [PATCH 159/632] [FIX]: base module :update workflow item to workflows

bzr revid: ron@tinyerp.com-20100929113040-o1vrs2v6tyn7j5lt
---
 bin/addons/base/base_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 3fe8e96a352..b69cc44857d 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -6,7 +6,7 @@
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
             groups="base.group_extended,base.group_no_one"  />
-        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
+        <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
             groups="base.group_extended"/>

From babd5d6703a6109ee7a75ad022c342cb6e734733 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 17:05:50 +0530
Subject: [PATCH 160/632] [Fix] hr : job position, problem in o2m of employee
 is fixed

bzr revid: vir@tinyerp.com-20100929113550-m3lw0br1q59d14e7
---
 addons/hr/hr.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9ce0b535401..11ad7bb279b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -138,10 +138,14 @@ class hr_employee(osv.osv):
         return {'value':{}}
 
     def onchange_department(self, cr, uid, ids, department_id, context=None):
-        manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id.id
-        return {'value': {'parent_id':manager or False}}
+        if not department_id:
+            return {'value':{'parent_id': False}}
+        manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id
+        return {'value': {'parent_id':manager and manager.id or False}}
 
     def onchange_user(self, cr, uid, ids, user_id, context=None):
+        if not user_id:
+            return {'value':{'work_email': False}}
         mail = self.pool.get('res.users').browse(cr,uid,user_id)
         return {'value': {'work_email':mail.user_email}}          
         

From 557a2af8f98a3dafc0f86a053c93034cb28d3d84 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 29 Sep 2010 17:19:56 +0530
Subject: [PATCH 161/632] [MOD/IMP] hr_timesheet_sheet : usability improvement

bzr revid: dbr@tinyerp.com-20100929114956-29nacii3mqgbb46i
---
 addons/hr_attendance/hr_attendance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 6afd783323c..969637fcd0d 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -150,7 +150,7 @@ class hr_employee(osv.osv):
             res = {'action': type, 'employee_id': emp['id']}
             if dt:
                 res['name'] = dt
-            id = obj_attendance.create(cr, uid, res, context=context)
+        id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
             return id

From d631de7a6865c5e21b21326b4b2cebcaa10e6f43 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Wed, 29 Sep 2010 17:37:21 +0530
Subject: [PATCH 162/632] [FIX] Import : multiple O2M import corrected

bzr revid: jvo@tinyerp.com-20100929120721-sptc54u3dhqr0fu1
---
 bin/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 1024136093f..44287a6d485 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -914,7 +914,7 @@ class orm_template(object):
                 nbrmax = max(nbrmax, max2)
                 warning = warning + w2
                 reduce(lambda x, y: x and y, newrow)
-                row[field] = (reduce(lambda x, y: x or y, newrow.values()) and \
+                row[field] = newrow and (reduce(lambda x, y: x or y, newrow.values()) and \
                         [(0, 0, newrow)]) or []
                 i = max2
                 while (position+i) < len(datas):
@@ -929,7 +929,7 @@ class orm_template(object):
                     (newrow, max2, w2, translate2, data_id2, data_res_id2) = process_liness(
                             self, datas, prefix+[field], current_module, relation_obj._name, newfd, position+i)
                     warning = warning + w2
-                    if reduce(lambda x, y: x or y, newrow.values()):
+                    if newrow and reduce(lambda x, y: x or y, newrow.values()):
                         row[field].append((0, 0, newrow))
                     i += max2
                     nbrmax = max(nbrmax, i)

From 95d032e5c90863b7d0e0c968da9297fa970ac135 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 29 Sep 2010 18:45:04 +0530
Subject: [PATCH 163/632] [ADD] hr_expense : onchange method on employee id

bzr revid: vir@tinyerp.com-20100929131504-s621aujpw7wpk570
---
 addons/hr_expense/hr_expense.py       | 7 +++++++
 addons/hr_expense/hr_expense_view.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4003cded168..e9e64f76c4e 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -97,6 +97,13 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+
+    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
+        if not employee_id:
+            return {'value':{'department_id': False}}
+        dept = self.pool.get('hr.employee').browse(cr, uid, employee_id).department_id
+        return {'value': {'department_id':dept and dept.id or False}}
+
     def expense_confirm(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'confirm',
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 79c0d5513f0..71ed5cc6e68 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,7 +67,7 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet">
                     <group colspan="4" col="6">
-                        <field name="employee_id"/>
+                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="name" select="1"/>
                         <field name="ref" groups="base.group_extended"/>
                         <field name="date" select="1"/>

From 47502593c67c2f0e03b66420e8c942c1d29f8e1f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 29 Sep 2010 18:48:42 +0530
Subject: [PATCH 164/632] [Fix] stock: Fix Error while opening dashboard for

bzr revid: sbh@tinyerp.com-20100929131842-ss1px9hwmmfr5gqt
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 571b9643129..d73266396ec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2595,7 +2595,7 @@ class report_products_to_received_planned(osv.osv):
         tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
         cr.execute("""
             create or replace view report_products_to_received_planned as (
-               select stock.create_date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
+               select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
                    from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'
@@ -2604,7 +2604,7 @@ class report_products_to_received_planned(osv.osv):
 
                     union
 
-               select stock.date, min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
+               select stock.date as date , min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
                     from stock_picking picking
                     inner join stock_move stock
                     on picking.id = stock.picking_id and picking.type = 'in'

From 68c21a84ab78c0f032b64a4349d145b1f80138f0 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 29 Sep 2010 18:52:25 +0530
Subject: [PATCH 165/632] [IMP]: base : Improvements in Low Level Objects Menu

bzr revid: jas@tinyerp.com-20100929132225-kzm2rzzqr808hpl2
---
 bin/addons/base/base_menu.xml | 2 +-
 bin/addons/base/ir/ir.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 3049fbb17b2..08d4832c0c8 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -6,7 +6,7 @@
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
             groups="base.group_extended"/>
-        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
+        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4" sequence="1"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
             groups="base.group_extended"/>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 0e88dfc6bce..ee8a21d2bb7 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -310,7 +310,7 @@
             <field name="view_id" ref="action_view_tree"/>
             <field name="search_view_id" ref="action_view_search"/>
         </record>
-        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
+        <menuitem id="next_id_6" name="Actions" parent="base.next_id_4" sequence="1"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
 
         <!--Filters form view-->

From 5d5fc92deac9f91c4e3332d13130c139c2201ff1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 29 Sep 2010 19:19:31 +0530
Subject: [PATCH 166/632] [FIX]: base module :Add Active Filter Button to Low
 Level object - Workflows Menu

bzr revid: ron@tinyerp.com-20100929134931-7f6xk18zkyynhpjv
---
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 3fb98efb8f9..322859c3db1 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -299,6 +299,8 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Instances">
+          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <separator orientation="vertical"/>
           <field name="wkf_id"/>
           <field name="uid"/>
           <field name="res_id"/>
@@ -355,6 +357,8 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Workitems">
+          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <separator orientation="vertical"/>
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>

From 2bfcc53250ed9d9bee38220b177d83e436e3ab07 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 30 Sep 2010 04:38:08 +0000
Subject: [PATCH 167/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20100930043808-6b9xdye93e67rvvc
---
 bin/addons/base/i18n/bs.po    | 6 +++---
 bin/addons/base/i18n/en_GB.po | 6 +++---
 bin/addons/base/i18n/et.po    | 6 +++---
 bin/addons/base/i18n/fr.po    | 6 +++---
 bin/addons/base/i18n/it.po    | 6 +++---
 bin/addons/base/i18n/mn.po    | 4 ++--
 bin/addons/base/i18n/pl.po    | 6 +++---
 bin/addons/base/i18n/pt_BR.po | 4 ++--
 bin/addons/base/i18n/sv.po    | 6 +++---
 debian/po/ko.po               | 6 +++---
 debian/po/mn.po               | 4 ++--
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index af99a2b5185..5eace0482b4 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-12 21:46+0000\n"
-"Last-Translator: Bojan Markovic <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 0e2166dc01f..098e3d1129a 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-11 15:00+0000\n"
-"Last-Translator: Martin Hood <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 0814b45f278..2d639fd8d86 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-21 14:25+0000\n"
-"Last-Translator: Tanel Kurvits <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 07:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 49ba7240160..d3bbc43f35c 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-16 19:03+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:01+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 75981ae4507..a43aa4a42de 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-19 17:45+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 521063fcfbe..247e7f202fe 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-13 08:00+0000\n"
+"PO-Revision-Date: 2010-09-29 08:13+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index e9604cd0de8..eca6c8a4393 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-26 10:02+0000\n"
-"Last-Translator: Michał Węgrzynek <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 9bae937bb20..01a30d302a4 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:12+0000\n"
+"PO-Revision-Date: 2010-09-29 08:12+0000\n"
 "Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index ed47e2be7c6..657c35a352f 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-27 12:19+0000\n"
-"Last-Translator: Daniel Stenlöv (XCLUDE) <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:22+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 5218c4ce019..155d2266c9a 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-09-15 02:58+0000\n"
-"Last-Translator: barge <Unknown>\n"
+"PO-Revision-Date: 2010-09-29 08:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Korean <ko@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: 2010-09-29 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/mn.po b/debian/po/mn.po
index 6d686d6e110..47a4d6a3e6c 100644
--- a/debian/po/mn.po
+++ b/debian/po/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2010-09-10 03:13+0000\n"
+"PO-Revision-Date: 2010-09-29 08:02+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string

From 684200414f20bfce1753150317fc50a7377341bd Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 30 Sep 2010 11:05:50 +0530
Subject: [PATCH 168/632] [IMP]: Project Dashboard.

bzr revid: rch_open_erp-20100930053550-hf13ox5pvqrt4itt
---
 addons/project/board_project_view.xml         |  8 ++--
 addons/project/report/project_report_view.xml | 10 ++---
 .../board_project_issue_view.xml              | 44 +++++++++++++++++++
 .../board_project_scrum_view.xml              | 36 +++++++++++++++
 4 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index c3b4b0c8000..75a1dfa478d 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -86,16 +86,16 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4"  name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
-                            <action colspan="4"  name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
+                            <action colspan="4"  height="100" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
+                            <action colspan="4"  height="100" name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
                    		</child1>
                         <child2>
                         <vpaned>
                         	<child1>
-                        		<action colspan="4"  name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
+                        		<action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
                         	</child1>
                         	<child2>
-                        		<action colspan="4"  name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned Vs Total Hours" />
+                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
                         	</child2>
                         </vpaned>
                         </child2>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 1ae5adc489a..7f315ce92c9 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -186,13 +186,13 @@
     </record>
 
 	<record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
+            <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
             <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
    </record>
    <record id="open_view_project_vs_remaining_hours_graph" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
+            <field eval="1" name="sequence"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
             <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
@@ -262,7 +262,7 @@
     </record>
 
     <record id="action_project_vs_planned_total_hours_graph" model="ir.actions.act_window">
-        <field name="name">My projects: Planned Vs Total hours</field>
+        <field name="name">My projects: Planned vs Total hours</field>
         <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -271,13 +271,13 @@
     </record>
 
 	<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
+            <field eval="2" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
             <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
     </record>
     <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
+            <field eval="1" name="sequence"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
             <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 30b6815e450..9b5dfeb4d08 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -88,5 +88,49 @@
         <menuitem id="menu_deshboard_project_issue" name="Project Issue Dashboard" parent="project.next_id_86"
          	icon="terp-graph"
             action="open_board_project_issue"/>
+
+    <!-- For Project Dashboard -->
+        <record id="action_view_my_project_issue_tree" model="ir.actions.act_window">
+            <field name="name">My Project Issues</field>
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">['|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
+        </record>
+         <record id="view_my_open_project_issue_graph" model="ir.ui.view">
+            <field name="name">my.open.project.issue.graph</field>
+            <field name="model">project.issue.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="vertical" string="My Open Project Issue" type="bar">
+                    <field name="creation_date"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_my_open_project_issue_tree" model="ir.actions.act_window">
+            <field name="name">My Open Project issues</field>
+            <field name="res_model">project.issue.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','open'),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+           <field name="view_id" ref="view_my_open_project_issue_graph"/>
+        </record>
+       <record id="board_my_project_issue_form" model="ir.ui.view">
+            <field name="name">board.my.project.issue.form.inherit</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.board_project_form"/>
+            <field name="arch" type="xml">
+            	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
+						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
+            	</xpath>
+            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='Remaining Hours Per Project']" position="after">
+						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
+            	</xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 8b22233558b..76094000888 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -60,5 +60,41 @@
             name="Scrum Dashboard" parent="project.next_id_86"
             icon="terp-graph"
             action="open_board_project_scrum"/>
+
+    <!-- For Project Dashboard -->
+       <record id="view_scrum_sprint_project_dashboard_tree" model="ir.ui.view">
+            <field name="name">project.scrum.sprint.project.dashboard.tree</field>
+            <field name="model">project.scrum.sprint</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+            	 <tree string="Scrum Sprint">
+                    <field name="name"/>
+                    <field name="progress" widget="progressbar"/>
+                    <field name="effective_hours"  widget="float_time"/>
+                    <field name="expected_hours"  widget="float_time"/>
+                	<button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
+                                	string="Burndown Chart" type="action" icon="gtk-print"/>
+             	</tree>
+            </field>
+        </record>
+        <record id="action_view_my_scrum_sprint_tree" model="ir.actions.act_window">
+            <field name="name">My Sprint</field>
+            <field name="res_model">project.scrum.sprint</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">['|',('product_owner_id','=',uid),('scrum_master_id','=',uid)]</field>
+           <field name="view_id" ref="view_scrum_sprint_project_dashboard_tree"/>
+        </record>
+       <record id="board_my_scrum_sprint_form" model="ir.ui.view">
+            <field name="name">board.my.scrum.sprint.form.inherit</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.board_project_form"/>
+            <field name="arch" type="xml">
+            	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
+						<action colspan="4"  height="100" name="%(action_view_my_scrum_sprint_tree)d" string="My Sprint" />
+            	</xpath>
+            </field>
+        </record>
     </data>
 </openerp>

From 32847c3ebd4d684e2f4179c2029df2a648ad4638 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 30 Sep 2010 11:15:29 +0530
Subject: [PATCH 169/632] [FIX]: base module :Request menu - closed state (it
 desappears)

bzr revid: ron@tinyerp.com-20100930054529-a1e2cnlc27n4mdty
---
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++--
 bin/addons/base/res/res_request.py            | 8 ++++----
 bin/addons/base/res/res_request_view.xml      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 322859c3db1..3fab4388877 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -299,7 +299,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Instances">
-          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
           <separator orientation="vertical"/>
           <field name="wkf_id"/>
           <field name="uid"/>
@@ -357,7 +357,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Workitems">
-          <filter icon="terp-camera_test"  string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
           <separator orientation="vertical"/>
           <field name="act_id"/>
           <field name="subflow_id"/>
diff --git a/bin/addons/base/res/res_request.py b/bin/addons/base/res/res_request.py
index bdbc6c0bdac..eceb670d17f 100644
--- a/bin/addons/base/res/res_request.py
+++ b/bin/addons/base/res/res_request.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,7 +50,7 @@ class res_request(osv.osv):
         return True
 
     def request_close(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'closed', 'active':False})
+        self.write(cr, uid, ids, {'state':'closed'})
         return True
 
     def request_get(self, cr, uid):
@@ -113,7 +113,7 @@ class res_request_history(osv.osv):
         'name': lambda *a: 'NoName',
         'act_from': lambda obj,cr,uid,context={}: uid,
         'act_to': lambda obj,cr,uid,context={}: uid,
-        'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
+        'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 res_request_history()
 
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 2b1195df51c..53b7044f8ff 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -8,7 +8,7 @@
             <field name="model">res.request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Requests" colors="blue:state in ('draft');gray:state in ('closed')">
+                <tree string="Requests" colors="blue:state in ('waiting');gray:state in ('closed')">
                     <field name="create_date"/>
                     <field name="act_from"/>
                     <field name="act_to"/>

From 310b522ef9f60866a7830d9c2166451ddd37cadf Mon Sep 17 00:00:00 2001
From: "VRO(OpenERP)" <>
Date: Thu, 30 Sep 2010 11:35:51 +0530
Subject: [PATCH 170/632] [IMP]: Sale Manager Dashboard.

bzr revid: rch_open_erp-20100930060551-88qeytiivw3xjk61
---
 addons/sale/board_sale_view.xml         | 12 ++++++------
 addons/sale/report/sale_report_view.xml | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 6da7f9e312b..79bdf5d76b6 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -10,16 +10,16 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Manager board">
+                <form string="Sales Manager Dashboard">
                     <hpaned position="100">
                         <child1>
-                            <action  name="%(sale.action_quotation_for_sale)d" string="Top Quotations"/>
-                            <action width="510" name="%(sale.action_view_sales_by_month)d" string="Total Sales By Month"/>
+                            <action  name="%(sale.action_quotation_for_sale)d" string="Quotations"/>
+                            <action width="510" name="%(sale.action_view_sales_by_month)d" string="Sales By Month"/>
                         </child1>
                         <child2>
-                            <action  name="%(sale.action_sales_product_total_price)d" string="Sold products and Total Price"/>
-                            <action  name="%(sale.action_sales_by_partner)d" string="Sales By Partner"/>
                             <action  name="%(sale.action_sales_by_salesman)d" string="Sales By Salesman"/>
+                            <action  name="%(sale.action_sales_by_partner)d" string="Sales By Customer"/>
+                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product Category"/>
                         </child2>
                     </hpaned>
                 </form>
@@ -27,7 +27,7 @@
         </record>
 
         <record id="open_board_sales_manager" model="ir.actions.act_window">
-            <field name="name">Sales Dashboard</field>
+            <field name="name">Sales Manager Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index d796edd2d2c..ccdeabb1e17 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -226,7 +226,7 @@
         <field name="model">sale.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Sales by Products">
+            <tree string="Sales by Product Category">
                 <field name="product_id"/>
                 <field name="price_total"/>
             </tree>
@@ -238,15 +238,15 @@
          <field name="model">sale.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Sales by Products" type="bar">
-                 <field name="product_id" />
+             <graph string="Sales by Product Category" type="bar">
+                 <field name="categ_id" />
                  <field name="price_total" operator="+"/>
              </graph>
          </field>
     </record>
 
    <record id="action_sales_product_total_price" model="ir.actions.act_window">
-        <field name="name">Sales by Products</field>
+        <field name="name">Sales by Product Category</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -293,7 +293,7 @@
             <field name="model">sale.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Top Quotations">
+                <tree string="Quotations">
                     <field name="date_order"/>
                     <field name="name"/>
                     <field name="partner_id"/>
@@ -305,7 +305,7 @@
         </record>
 
     <record id="action_quotation_for_sale" model="ir.actions.act_window">
-        <field name="name">Top Quotations</field>
+        <field name="name">Quotations</field>
         <field name="res_model">sale.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>

From 8d0f0c90262fbe8d76ae896538bac87da6b1f016 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 30 Sep 2010 11:45:39 +0530
Subject: [PATCH 171/632] [IMP] hr_evaluation : search view improvement

bzr revid: vir@tinyerp.com-20100930061539-g4sb1offkra3xjc6
---
 addons/hr_expense/hr_expense_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 71ed5cc6e68..11e88bf361c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -136,11 +136,13 @@
                       <separator orientation="vertical"/>
                       <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
                         help="Confirmed Expense"/>
-                      <filter icon="terp-check" domain="[('state','=','accepted')]" string="To Pay"
+                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
+                      <separator orientation="vertical"/>
                       <filter icon="terp-go-month" string="This Month" name="this"
                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>                        
                       <separator orientation="vertical"/>
+                      <field name="employee_id" select='1'/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
                       <field name="user_id"  string="User" invisible="True">

From 6f2bb74f1519e7d0382e6ec1c4a25e47758f91b8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 30 Sep 2010 11:59:05 +0530
Subject: [PATCH 172/632] [Fix] stock: Fix the product_value function check the
 loc_id is exist or not

bzr revid: sbh@tinyerp.com-20100930062905-ata7ijvy6frdy76d
---
 addons/stock/stock.py | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 969c468c8d3..3a70b387d49 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -123,25 +123,24 @@ class stock_location(osv.osv):
         currency_obj = self.pool.get('res.currency')
         currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
         currency_obj.round(cr, uid, currency, 300)
-
         for loc_id, product_ids in products_by_location.items():
             c = (context or {}).copy()
-            c['location'] = loc_id
-            for prod in product_product_obj.browse(cr, uid, product_ids, context=c):
-                for f in field_names:
-                    if f == 'stock_real':
-                        result[loc_id][f] += prod.qty_available
-                    elif f == 'stock_virtual':
-                        result[loc_id][f] += prod.virtual_available
-                    elif f == 'stock_real_value':
-                        amount = prod.qty_available * prod.standard_price
-                        amount = currency_obj.round(cr, uid, currency, amount)
-                        result[loc_id][f] += amount
-                    elif f == 'stock_virtual_value':
-                        amount = prod.virtual_available * prod.standard_price
-                        amount = currency_obj.round(cr, uid, currency, amount)
-                        result[loc_id][f] += amount
-
+            if loc_id in ids:
+                c['location'] = loc_id
+                for prod in product_product_obj.browse(cr, uid, product_ids, context=c):
+                    for f in field_names:
+                        if f == 'stock_real':
+                            result[loc_id][f] += prod.qty_available
+                        elif f == 'stock_virtual':
+                            result[loc_id][f] += prod.virtual_available
+                        elif f == 'stock_real_value':
+                            amount = prod.qty_available * prod.standard_price
+                            amount = currency_obj.round(cr, uid, currency, amount)
+                            result[loc_id][f] += amount
+                        elif f == 'stock_virtual_value':
+                            amount = prod.virtual_available * prod.standard_price
+                            amount = currency_obj.round(cr, uid, currency, amount)
+                            result[loc_id][f] += amount
         return result
 
     _columns = {

From 77c3f0abbfba2ab7dfa3e35b2d19569cc819941f Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 30 Sep 2010 12:13:01 +0530
Subject: [PATCH 173/632] [FIX] Removed required property for home action (web
 client dashboard).

bzr revid: vda@tinyerp.com-20100930064301-9o44xig9wj15l9kt
---
 bin/addons/base/base_update.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 361bbfa67a0..4218d6ce278 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -123,7 +123,7 @@
                             <field name="user_email" widget="email"/>
                             <field name="context_lang"/>   
                             <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
-                            <field name="action_id" required="True"/>
+                            <field name="action_id"/>
 
 
                             <field name="context_tz"/>

From ac94e1a34d52e7b872a9e17dcc6e956ff425489b Mon Sep 17 00:00:00 2001
From: SAz <>
Date: Thu, 30 Sep 2010 12:28:27 +0530
Subject: [PATCH 174/632] [IMP]:improved

bzr revid: apa@tinyerp.com-20100930065827-l4a3ak55gd1wu6nf
---
 addons/account/test/account_report.yml                |  1 +
 addons/account/test/account_validate_account_move.yml | 10 ++++++++++
 addons/stock/test/stock_report.yml                    |  4 ++--
 addons/stock/test/stock_test.yml                      |  6 +++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 7e4295da45b..98d3aa591b3 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -30,6 +30,7 @@
 -
   !record {model: account.tax.code, id: account_tax_code_0}:
     name : Tax Code Test
+    sign : 1.00
 -
  Print Tax Code entries report
 - 
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 37d64ead528..9a733d8ad5f 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -1,3 +1,12 @@
+-
+  Demo data for Account tax code
+-
+  !record {model: account.tax.code, id: account_tax_code_0}:
+    name : Tax Code Test
+    sign : 1.00
+-
+
+
 -
   In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
 
@@ -20,6 +29,7 @@
       - journal_id: account.bank_journal
         period_id: account.period_6
         ref: '2010010'
+        tax_code_id: account_tax_code_0      
         tax_amount: 0.0
         account_id: account.a_recv
         amount_currency: 0.0
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index 491fd7fa9d7..3d31977f123 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -35,7 +35,7 @@
 - 
   !python {model: stock.picking}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.stock.picking.list').create(cr, uid, [ref('stock.stock_picking_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.stock.picking.list').create(cr, uid, [ref('stock.stock_picking_0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-picking_list'+format), 'wb+').write(data)
 -
@@ -45,4 +45,4 @@
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.product.history').create(cr, uid, [ref('product.product_product_pc1')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-product_stock_report.'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'stock-product_stock_report.'+format), 'wb+').write(data)
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 442cc8735b9..841f2750ca3 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -288,7 +288,7 @@
 - 
   !record {model: stock.picking, id: stock_picking_0}:
     name: test_picking
-    address_id: res_partner_address_0
+    address_id: base.res_partner_address_4
     company_id: base.main_company
     date: '2010-05-11 15:18:52'
     invoice_state: none
@@ -298,7 +298,7 @@
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers
-        product_id: stock.product_product_hpcdwriters0
+        product_id: product.product_product_pc1
         product_qty: 3.0
         product_uom: product.product_uom_unit
         date: '2010-05-11 15:18:57'
@@ -343,4 +343,4 @@
           'product_qty': move.product_qty,
           'product_uom': move.product_uom.id,
       } 
-   self.do_partial(cr, uid, [ref('stock_picking_0')],partial_datas)
\ No newline at end of file
+   self.do_partial(cr, uid, [ref('stock_picking_0')],partial_datas)

From ac7ec1748c09d72b170831ae67dbdae66b1f3000 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 30 Sep 2010 13:46:09 +0530
Subject: [PATCH 175/632] [FIX] Removed default for home action.

bzr revid: vda@tinyerp.com-20100930081609-5s4udd31is38ra9z
---
 bin/addons/base/res/res_user.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 3b25343d724..bfc60847eb2 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -357,7 +357,6 @@ class users(osv.osv):
         'context_lang': lambda *args: 'en_US',
         'active' : lambda *a: True,
         'menu_id': _get_menu,
-        'action_id': _get_menu,
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,

From 07d236876aee7ad60d82bbe4cb6f098ac37357cc Mon Sep 17 00:00:00 2001
From: "VRO(OpenERP)" <>
Date: Thu, 30 Sep 2010 13:49:08 +0530
Subject: [PATCH 176/632] [IMP]: Sales Dashboard.

bzr revid: rch_open_erp-20100930081908-62fhwt7et55shj85
---
 addons/crm/board_crm_view.xml           | 16 +++++++--------
 addons/sale_crm/board_sale_crm_view.xml | 26 ++++++++++++-------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 8aa1d96d403..c299741280a 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -17,7 +17,7 @@
                     </graph>
                </field>
           </record>
-          
+
         <record id="view_report_crm_oppor_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
@@ -29,7 +29,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="crm_case_my_open_oppor">
             <field name="name">Opportunities</field>
             <field name="model">crm.lead</field>
@@ -71,7 +71,7 @@
                <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
           </record>
-        
+
         <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
           <field name="sequence" eval="1"/>
           <field name="view_mode">tree</field>
@@ -111,11 +111,11 @@
           </record>
 
           <record model="ir.ui.view" id="board_crm_form">
-               <field name="name">CRM - Dashboard Form</field>
+               <field name="name">Sales Dashboard Form</field>
                <field name="model">board.board</field>
                <field name="type">form</field>
                <field name="arch" type="xml">
-                    <form string="Connecting Dashboard">
+                    <form string="Sales Dashboard">
                          <hpaned>
                               <child1>
                                    <action
@@ -145,7 +145,7 @@
             </field>
         </record>
         <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">CRM Dashboard</field>
+            <field name="name">Sales Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -154,10 +154,10 @@
         </record>
          <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
-            name="Connecting Dashboard" parent="board.menu_dasboard"
+            name="Sales Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
             sequence="1"
             id="menu_board_crm" icon="terp-graph"/>
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 83fa1ea583a..7d56779a613 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -16,7 +16,7 @@
 	        <field name="model">account.invoice.report</field>
 	        <field name="type">tree</field>
 	        <field name="arch" type="xml">
-	            <tree string="Turnover By Months">
+	            <tree string="Monthly Turnover">
 	                <field name="month"/>
 	                <field name="price_total"/>
 	            </tree>
@@ -28,7 +28,7 @@
 	        <field name="model">account.invoice.report</field>
 	        <field name="type">graph</field>
 	        <field name="arch" type="xml">
-	            <graph string="Turnover By Months" type="bar">
+	            <graph string="Monthly Turnover" type="bar">
 	                <field name="month"/>
 	                <field name="price_total" operator="+"/>
 	            </graph>
@@ -51,17 +51,17 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child1/action[@name='%(crm.act_my_meetings)d']" position="after">
+	            <xpath expr="/form/hpaned/child1/action[@name='%(crm.act_my_oppor)d']" position="after">
 		            <action
 		                string="My Quotations"
 		                name="%(action_quotation_for_sale_crm)d"
 		                colspan="4"
 		                height="150"
 		                width="510"/>
-	            </xpath>        
+	            </xpath>
             </field>
         </record>
-        
+
          <record model="ir.ui.view" id="board_crm_form_inherit_child2">
             <field name="name">board.crm.form.inherit.child2</field>
             <field name="model">board.board</field>
@@ -70,36 +70,36 @@
             <field name="arch" type="xml">
 	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="after">
 		            <action
-		                string="Turnover By Months"
+		                string="Monthly Turnover"
 		                name="%(action_turnover_by_month)d"
 		                colspan="4"/>
-	            </xpath>  
+	            </xpath>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
             <field name="name">board.crm.form.inherit.replace1</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="attributes">          
+	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="attributes">
 	                <attribute name="string">My Sales Pipeline</attribute>
 	            </xpath>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="board_crm_form_inherit_replace2">
             <field name="name">board.crm.form.inherit.replace2</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_my_oppor_stage)d']" position="attributes">          
-	                <attribute name="string">Revenue by stage</attribute>
+	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_my_oppor_stage)d']" position="attributes">
+	                <attribute name="string">Opportunities by Stage</attribute>
 	            </xpath>
             </field>
         </record>
-        
+
     </data>
 </openerp>
\ No newline at end of file

From d6a4bf08e5c2911f43be28cf224e90fbab1b41ff Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 30 Sep 2010 13:49:46 +0530
Subject: [PATCH 177/632] [REF]: base module :Reporting Menu

bzr revid: ron@tinyerp.com-20100930081946-zl5pkfsnja8n2rls
---
 bin/addons/base/base_menu.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index b69cc44857d..19b1bcd7e4a 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -22,7 +22,9 @@
             groups="base.group_extended"/>
         <menuitem id="menu_management" name="Modules Management" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
+<!--
         <menuitem icon="terp-graph" id="reporting_menu" name="Reporting" sequence="45"
             groups="group_extended"/>
+-->
     </data>
 </openerp>

From a8afde1945a730a275ddb45f7683ebdddb6fc358 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Thu, 30 Sep 2010 13:54:01 +0530
Subject: [PATCH 178/632] [IMP]: Project dashboard - chang label.

bzr revid: rch_open_erp-20100930082401-tixi8q0c3eqw892m
---
 addons/project/board_project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 75a1dfa478d..275a969cbe9 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -95,7 +95,7 @@
                         		<action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
                         	</child1>
                         	<child2>
-                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
+                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
                         	</child2>
                         </vpaned>
                         </child2>

From 73cee227e1fe2e83d04382ea401d3c3c222aedeb Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 30 Sep 2010 13:59:26 +0530
Subject: [PATCH 179/632] [FIX] Removed default for home action.

bzr revid: vda@tinyerp.com-20100930082926-13n8zl37zw8t3fro
---
 bin/addons/base/res/res_user.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index bfc60847eb2..c5e5e79a756 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -288,15 +288,7 @@ class users(osv.osv):
                 result = override_password(result)
             else:
                 result = map(override_password, result)
-
-        if isinstance(result, list):
-            for rec in result:
-                if not rec.get('action_id',True):
-                    rec['action_id'] = (self._get_menu(cr, uid),'Menu')
-        else:
-            if not result.get('action_id',True):
-                result['action_id'] = (self._get_menu(cr, uid),'Menu')
-
+                
         return result
 
 

From f05a5b8272c286ecec9cf7e04af57a7647783675 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 30 Sep 2010 14:11:47 +0530
Subject: [PATCH 180/632] [FIX]:Print screen should respect sort order

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

bzr revid: nch@tinyerp.com-20100930084147-hw4351m329tbrpnr
---
 bin/report/printscreen/ps_list.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 142cb41d447..aa95eedeff8 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -98,6 +98,7 @@ class report_printscreen_list(report_int):
                             continue
                         child_ids = model.search(cr, uid, inner_domain)
                         res = model.read(cr, uid, child_ids, result['fields'].keys(), context)
+                        res.sort(lambda x,y: cmp(ids.index(x['id']), ids.index(y['id'])))
                         rows.extend(res)
             dom = [('id','in',ids)]
             if self.groupby_no_leaf and len(ids) and not ids[0]:

From 109f51e125ad04ab6a96091e4a8b21af54115fa5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 30 Sep 2010 15:24:03 +0200
Subject: [PATCH 181/632] [ADD] osv: initial basic implementation of Query
 object: - added basic Query object to support more complex ORM use cases
 (LEFT OUTER JOINS at the moment) - added trivial unit tests for query object
 + run_test.py executable to launch them Warning: this is very basic and was
 only done as a low-risk fix to introduce support for OUTER joins in some
 cases. This will need to be improved and extended a lot to be really useful
 -> targeted for after v6.0...

bzr revid: odo@openerp.com-20100930132403-2dx0k9znzromsig7
---
 bin/addons/base/ir/ir_rule.py |   3 +-
 bin/osv/orm.py                | 204 ++++++++++++++--------------------
 bin/osv/query.py              | 116 +++++++++++++++++++
 bin/run_tests.py              |  27 +++++
 bin/test/__init__.py          |  22 ++++
 bin/test/test_osv.py          |  40 +++++++
 6 files changed, 293 insertions(+), 119 deletions(-)
 create mode 100644 bin/osv/query.py
 create mode 100644 bin/run_tests.py
 create mode 100644 bin/test/__init__.py
 create mode 100644 bin/test/test_osv.py

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 16c2c8275d9..799a411c15f 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -137,7 +137,8 @@ class ir_rule(osv.osv):
     def domain_get(self, cr, uid, model_name, mode='read', context={}):
         dom = self._compute_domain(cr, uid, model_name, mode=mode)
         if dom:
-            return self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
+            query = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
+            return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 1024136093f..d0d783dc144 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -54,6 +54,7 @@ from tools.config import config
 from tools.translate import _
 
 import fields
+from query import Query
 import tools
 from tools.safe_eval import safe_eval as eval
 
@@ -2203,35 +2204,15 @@ class orm(orm_template):
         if not fields:
             fields = self._columns.keys()
 
-        # compute the where, order by, limit and offset clauses
-        (where_clause, where_clause_params, tables) = self._where_calc(cr, uid, domain, context=context)
-
-        # apply direct ir.rules from current model
-        self._apply_ir_rules(cr, uid, where_clause, where_clause_params, tables, 'read', context=context)
-
-        # then apply the ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
-        for inherited_model in self._inherits:
-            previous_tables = list(tables)
-            if self._apply_ir_rules(cr, uid, where_clause, where_clause_params, tables, 'read', model_name=inherited_model, context=context):
-                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
-                # list of table in case the inherited table was not in the list before (as that means the corresponding
-                # JOIN(s) was(were) not present)
-                self._inherits_join_add(inherited_model, previous_tables, where_clause)
-                tables = list(set(tables).union(set(previous_tables)))
+        query = self._where_calc(cr, uid, domain, context=context)
+        self._apply_ir_rules(cr, uid, query, 'read', context=context)
 
         # Take care of adding join(s) if groupby is an '_inherits'ed field
         groupby_list = groupby
         if groupby:
             if isinstance(groupby, list):
                 groupby = groupby[0]
-            tables, where_clause, qfield = self._inherits_join_calc(groupby, tables, where_clause)
-
-        if len(where_clause):
-            where_clause = ' where ' + ' and '.join(where_clause)
-        else:
-            where_clause = ''
-        limit_str = limit and ' limit %d' % limit or ''
-        offset_str = offset and ' offset %d' % offset or ''
+            self._inherits_join_calc(groupby, query)
 
         assert not groupby or groupby in fields, "Fields in 'groupby' must appear in the list of fields to read (perhaps it's missing in the list view?)"
 
@@ -2263,8 +2244,13 @@ class orm(orm_template):
                     flist += ','
                 flist += operator+'('+f+') as '+f
 
-        gb = groupby and (' group by '+groupby) or ''
-        cr.execute('select min(%s.id) as id,' % self._table + flist + ' from ' + ','.join(tables) + where_clause + gb + limit_str + offset_str, where_clause_params)
+        gb = groupby and (' GROUP BY '+groupby) or ''
+
+        from_clause, where_clause, where_clause_params = query.get_sql()
+        where_clause = where_clause and ' WHERE ' + where_clause
+        limit_str = limit and ' limit %d' % limit or ''
+        offset_str = offset and ' offset %d' % offset or ''
+        cr.execute('SELECT min(%s.id) AS id,' % self._table + flist + ' FROM ' + from_clause + where_clause + gb + limit_str + offset_str, where_clause_params)
         alldata = {}
         groupby = group_by
         for r in cr.dictfetchall():
@@ -2303,43 +2289,37 @@ class orm(orm_template):
             del d['id']
         return data
 
-    def _inherits_join_add(self, parent_model_name, tables, where_clause):
+    def _inherits_join_add(self, parent_model_name, query):
         """
-        Add missing table SELECT and JOIN clause for reaching the parent table (no duplicates)
+        Add missing table SELECT and JOIN clause to ``query`` for reaching the parent table (no duplicates)
 
         :param parent_model_name: name of the parent model for which the clauses should be added
-        :param tables: list of table._table names enclosed in double quotes as returned
-                       by _where_calc()
-        :param where_clause: current list of WHERE clause params
+        :param query: query object on which the JOIN should be added 
         """
         inherits_field = self._inherits[parent_model_name]
         parent_model = self.pool.get(parent_model_name)
         parent_table_name = parent_model._table
         quoted_parent_table_name = '"%s"' % parent_table_name
-        if quoted_parent_table_name not in tables:
-            tables.append(quoted_parent_table_name)
-            where_clause.append('("%s".%s = %s.id)' % (self._table, inherits_field, parent_table_name))
-        return (tables, where_clause)
+        if quoted_parent_table_name not in query.tables:
+            query.tables.append(quoted_parent_table_name)
+            query.where_clause.append('("%s".%s = %s.id)' % (self._table, inherits_field, parent_table_name))
 
-    def _inherits_join_calc(self, field, tables, where_clause):
+    def _inherits_join_calc(self, field, query):
         """
-        Adds missing table select and join clause(s) for reaching
+        Adds missing table select and join clause(s) to ``query`` for reaching
         the field coming from an '_inherits' parent table (no duplicates).
 
-        :param tables: list of table._table names enclosed in double quotes as returned
-                        by _where_calc()
-        :param where_clause: current list of WHERE clause params
-        :return: (tables, where_clause, qualified_field) where ``tables`` and ``where_clause`` are the updated
-                 versions of the parameters, and ``qualified_field`` is the qualified name of ``field``
-                 in the form ``table.field``, to be referenced in queries.
+        :param field: name of inherited field to reach
+        :param query: query object on which the JOIN should be added
+        :return: qualified name of field, to be used in SELECT clause
         """
         current_table = self
         while field in current_table._inherit_fields and not field in current_table._columns:
             parent_model_name = current_table._inherit_fields[field][0]
             parent_table = self.pool.get(parent_model_name)
-            self._inherits_join_add(parent_model_name, tables, where_clause)
+            self._inherits_join_add(parent_model_name, query)
             current_table = parent_table
-        return (tables, where_clause, '"%s".%s' % (current_table._table, field))
+        return '"%s".%s' % (current_table._table, field)
 
     def _parent_store_compute(self, cr):
         if not self._parent_store:
@@ -3899,84 +3879,87 @@ class orm(orm_template):
         raise NotImplementedError(_('This method does not exist anymore'))
 
     # TODO: ameliorer avec NULL
-    def _where_calc(self, cr, user, args, active_test=True, context=None):
+    def _where_calc(self, cr, user, domain, active_test=True, context=None):
         """Computes the WHERE clause needed to implement an OpenERP domain.
-        :param args: the domain to compute
-        :type args: list
+        :param domain: the domain to compute
+        :type domain: list
         :param active_test: whether the default filtering of records with ``active``
                             field set to ``False`` should be applied.
-        :return: tuple with 3 elements: (where_clause, where_clause_params, tables) where
-                 ``where_clause`` contains a list of where clause elements (to be joined with 'AND'),
-                 ``where_clause_params`` is a list of parameters to be passed to the db layer
-                 for the where_clause expansion, and ``tables`` is the list of double-quoted
-                 table names that need to be included in the FROM clause.
-        :rtype: tuple
+        :return: the query expressing the given domain as provided in domain
+        :rtype: osv.query.Query
         """
         if not context:
             context = {}
-        args = args[:]
+        domain = domain[:]
         # if the object has a field named 'active', filter out all inactive
         # records unless they were explicitely asked for
         if 'active' in self._columns and (active_test and context.get('active_test', True)):
-            if args:
+            if domain:
                 active_in_args = False
-                for a in args:
+                for a in domain:
                     if a[0] == 'active':
                         active_in_args = True
                 if not active_in_args:
-                    args.insert(0, ('active', '=', 1))
+                    domain.insert(0, ('active', '=', 1))
             else:
-                args = [('active', '=', 1)]
+                domain = [('active', '=', 1)]
 
-        if args:
+        if domain:
             import expression
-            e = expression.expression(args)
+            e = expression.expression(domain)
             e.parse(cr, user, self, context)
             tables = e.get_tables()
-            qu1, qu2 = e.to_sql()
-            qu1 = qu1 and [qu1] or []
+            where_clause, where_params = e.to_sql()
+            where_clause = where_clause and [where_clause] or []
         else:
-            qu1, qu2, tables = [], [], ['"%s"' % self._table]
+            where_clause, where_params, tables = [], [], ['"%s"' % self._table]
 
-        return (qu1, qu2, tables)
+        return Query(tables, where_clause, where_params)
 
     def _check_qorder(self, word):
         if not regex_order.match(word):
             raise except_orm(_('AccessError'), _('Invalid "order" specified. A valid "order" specification is a comma-separated list of valid field names (optionally followed by asc/desc for the direction)'))
         return True
 
-    def _apply_ir_rules(self, cr, uid, where_clause, where_clause_params, tables, mode='read', model_name=None, context=None):
-        """Add what's missing in ``where_clause``, ``where_params``, ``tables`` to implement
-           all appropriate ir.rules (on the current object but also from it's _inherits parents)
+    def _apply_ir_rules(self, cr, uid, query, mode='read', context=None):
+        """Add what's missing in ``query`` to implement all appropriate ir.rules 
+          (using the ``model_name``'s rules or the current model's rules if ``model_name`` is None)
 
-           :param where_clause: list with current elements of the WHERE clause (strings)
-           :param where_clause_params: list with parameters for ``where_clause``
-           :param tables: list with double-quoted names of the tables that are joined
-                          in ``where_clause``
-           :param model_name: optional name of the model whose ir.rules should be applied (default:``self._name``)
-                              This could be useful for inheritance for example, but there is no provision to include
-                              the appropriate JOIN for linking the current model to the one referenced in model_name.
-           :return: True if additional clauses where applied.
+           :param query: the current query object
         """
-        added_clause, added_params, added_tables = self.pool.get('ir.rule').domain_get(cr, uid, model_name or self._name, mode, context=context)
-        if added_clause:
-            where_clause += added_clause
-            where_clause_params += added_params
-            for table in added_tables:
-                if table not in tables:
-                    tables.append(table)
-            return True
-        return False
+        def apply_rule(added_clause, added_params, added_tables):
+            if added_clause:
+                query.where_clause += added_clause
+                query.where_clause_params += added_params
+                for table in added_tables:
+                    if table not in query.tables:
+                        query.tables.append(table)
+                return True
+            return False
+        
+        # apply main rules on the object
+        rule_obj = self.pool.get('ir.rule')
+        apply_rule(*rule_obj.domain_get(cr, uid, self._name, mode, context=context))
 
-    def _generate_m2o_order_by(self, order_field, tables, where_clause):
+        # apply ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
+        for inherited_model in self._inherits:
+            if apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context)):
+                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
+                # list of table in case the inherited table was not in the list before (as that means the corresponding
+                # JOIN(s) was(were) not present)
+                self._inherits_join_add(inherited_model, query)
+
+    def _generate_m2o_order_by(self, order_field, query):
         """
-        Add possibly missing JOIN and generate the ORDER BY clause for m2o fields,
+        Add possibly missing JOIN to ``query`` and generate the ORDER BY clause for m2o fields,
         either native m2o fields or function/related fields that are stored, including
         intermediate JOINs for inheritance if required.
+        
+        :return: the qualified field name to use in an ORDER BY clause to sort by ``order_field``
         """
         if order_field not in self._columns and order_field in self._inherit_fields:
             # also add missing joins for reaching the table containing the m2o field
-            tables, where_clause, qualified_field = self._inherits_join_calc(order_field, tables, where_clause)
+            qualified_field = self._inherits_join_calc(order_field, query)
             order_field_column = self._inherit_fields[order_field][2]
         else:
             qualified_field = '"%s"."%s"' % (self._table, order_field)
@@ -3995,16 +3978,14 @@ class orm(orm_template):
             # extract the first field name, to be able to qualify it and add desc/asc
             m2o_order = m2o_order.split(",",1)[0].strip().split(" ",1)[0]
 
-        # the perhaps missing join:
-        quoted_model_table = '"%s"' % dest_model._table
-        if quoted_model_table not in tables:
-            tables.append(quoted_model_table)
-            where_clause.append('%s = %s.id' % (qualified_field, quoted_model_table))
-
-        return ('%s.%s' % (quoted_model_table, m2o_order), tables, where_clause)
+        # Join the dest m2o table if it's not joined yet. We use [LEFT] OUTER join here 
+        # as we don't want to exclude results that have NULL values for the m2o
+        src_table, src_field = qualified_field.replace('"','').split('.', 1)
+        query.join((src_table, dest_model._table, src_field, 'id'), outer=True)
+        return '"%s"."%s"' % (dest_model._table, m2o_order)
 
 
-    def _generate_order_by(self, order_spec, tables, where_clause):
+    def _generate_order_by(self, order_spec, query):
         """
         Attempt to consruct an appropriate ORDER BY clause based on order_spec, which must be
         a comma-separated list of valid field names, optionally followed by an ASC or DESC direction.
@@ -4024,16 +4005,16 @@ class orm(orm_template):
                     if order_column._classic_read:
                         order_by_clause = '"%s"."%s"' % (self._table, order_field)
                     elif order_column._type == 'many2one':
-                        order_by_clause, tables, where_clause = self._generate_m2o_order_by(order_field, tables, where_clause)
+                        order_by_clause = self._generate_m2o_order_by(order_field, query)
                     else:
                         continue # ignore non-readable or "non-joignable" fields
                 elif order_field in self._inherit_fields:
                     parent_obj = self.pool.get(self._inherit_fields[order_field][0])
                     order_column = parent_obj._columns[order_field]
                     if order_column._classic_read:
-                        tables, where_clause, order_by_clause = self._inherits_join_calc(order_field, tables, where_clause)
+                        order_by_clause = self._inherits_join_calc(order_field, query)
                     elif order_column._type == 'many2one':
-                        order_by_clause, tables, where_clause = self._generate_m2o_order_by(order_field, tables, where_clause)
+                        order_by_clause = self._generate_m2o_order_by(order_field, query)
                     else:
                         continue # ignore non-readable or "non-joignable" fields
                 order_by_elements.append("%s %s" % (order_by_clause, order_direction))
@@ -4054,34 +4035,21 @@ class orm(orm_template):
         if context is None:
             context = {}
         self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=context)
-        # compute the where, order by, limit and offset clauses
-        (where_clause, where_clause_params, tables) = self._where_calc(cr, user, args, context=context)
 
-        # apply direct ir.rules from current model
-        self._apply_ir_rules(cr, user, where_clause, where_clause_params, tables, 'read', context=context)
+        query = self._where_calc(cr, user, args, context=context)
+        self._apply_ir_rules(cr, user, query, 'read', context=context)
+        order_by = self._generate_order_by(order, query)
+        from_clause, where_clause, where_clause_params = query.get_sql()
 
-        # then apply the ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
-        for inherited_model in self._inherits:
-            previous_tables = list(tables)
-            if self._apply_ir_rules(cr, user, where_clause, where_clause_params, tables, 'read', model_name=inherited_model, context=context):
-                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
-                # list of table in case the inherited table was not in the list before (as that means the corresponding
-                # JOIN(s) was(were) not present)
-                self._inherits_join_add(inherited_model, previous_tables, where_clause)
-                tables = list(set(tables).union(set(previous_tables)))
-
-        where = where_clause
-        order_by = self._generate_order_by(order, tables, where_clause)
         limit_str = limit and ' limit %d' % limit or ''
         offset_str = offset and ' offset %d' % offset or ''
-        where_str = where and (" WHERE %s" % " AND ".join(where)) or ''
+        where_str = where_clause and (" WHERE %s" % where_clause) or ''
 
         if count:
-            cr.execute('select count(%s.id) from ' % self._table +
-                    ','.join(tables) + where_str + limit_str + offset_str, where_clause_params)
+            cr.execute('SELECT count("%s".id) FROM ' % self._table + from_clause + where_str + limit_str + offset_str, where_clause_params)
             res = cr.fetchall()
             return res[0][0]
-        cr.execute('select %s.id from ' % self._table + ','.join(tables) + where_str + order_by + limit_str+offset_str, where_clause_params)
+        cr.execute('SELECT "%s".id FROM ' % self._table + from_clause + where_str + order_by + limit_str + offset_str, where_clause_params)
         res = cr.fetchall()
         return [x[0] for x in res]
 
diff --git a/bin/osv/query.py b/bin/osv/query.py
new file mode 100644
index 00000000000..b04e536ad60
--- /dev/null
+++ b/bin/osv/query.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+def _quote(to_quote):
+    if '"' not in to_quote:
+        return '"%s"' % to_quote
+    return to_quote
+
+
+class Query(object):
+    """
+     Dumb implementation of a Query object, using 3 string lists so far
+     for backwards compatibility with the (table, where_clause, where_params) previously used.
+     
+     TODO: To be improved after v6.0 to rewrite part of the ORM and add support for:
+      - auto-generated multiple table aliases
+      - multiple joins to the same table with different conditions
+      - dynamic right-hand-side values in domains  (e.g. a.name = a.description)
+      - etc.
+    """
+
+    def __init__(self, tables=None, where_clause=None, where_clause_params=None, joins=None):
+
+        # holds the list of tables joined using default JOIN.
+        # the table names are stored double-quoted (backwards compatibility)
+        self.tables = tables or []
+
+        # holds the list of WHERE clause elements, to be joined with
+        # 'AND' when generating the final query 
+        self.where_clause = where_clause or []
+
+        # holds the parameters for the formatting of `where_clause`, to be
+        # passed to psycopg's execute method.
+        self.where_clause_params = where_clause_params or []
+
+        # holds table joins done explicitly, supporting outer joins. The JOIN
+        # condition should not be in `where_clause`. The dict is used as follows:
+        #   self.joins = {
+        #                    'table_a': [
+        #                                  ('table_b', 'table_a_col1', 'table_b_col', 'LEFT JOIN'),
+        #                                  ('table_c', 'table_a_col2', 'table_c_col', 'LEFT JOIN'),
+        #                                  ('table_d', 'table_a_col3', 'table_d_col', 'JOIN'),
+        #                               ]
+        #                 }
+        #   which should lead to the following SQL:
+        #       SELECT ... FROM "table_a" LEFT JOIN "table_b" ON ("table_a"."table_a_col1" = "table_b"."table_b_col")
+        #                                 LEFT JOIN "table_c" ON ("table_a"."table_a_col2" = "table_c"."table_c_col")
+        self.joins = joins or {}
+
+    def join(self, connection, outer=False):
+        """Adds the JOIN specified in ``connection``.
+
+        :param connection: a tuple ``(lhs, table, lhs_col, col)``. 
+                           The join corresponds to the SQL equivalent of::
+
+                                ``(lhs.lhs_col = table.col)``
+
+        :param outer: True if a LEFT OUTER JOIN should be used, if possible
+                      (no promotion to OUTER JOIN is supported in case the JOIN
+                       was already present in the query, as for the moment
+                       implicit INNER JOINs are only connected from NON-NULL 
+                       columns so it would not be correct (e.g. for 
+                       ``_inherits`` or when a domain criterion explicitly 
+                       adds filtering)
+        """
+        (lhs, table, lhs_col, col) = connection
+        lhs = _quote(lhs)
+        table = _quote(table)
+        assert lhs in self.tables, "Left-hand-side table must already be part of the query!"
+        if table in self.tables:
+            # already joined, must ignore (promotion to outer and multiple joins not supported yet)
+            pass
+        else:
+            # add JOIN
+            self.tables.append(table)
+            self.joins.setdefault(lhs, []).append((table, lhs_col, col, outer and 'LEFT JOIN' or 'JOIN'))
+        return self 
+
+    def get_sql(self):
+        """Returns (query_from, query_where, query_params)"""
+        query_from = ''
+        tables_to_process = list(self.tables)
+        for table in tables_to_process:
+            query_from += ' %s ' % table
+            if table in self.joins:
+                for (dest_table, lhs_col, col, join) in self.joins[table]:
+                    tables_to_process.remove(dest_table)
+                    query_from += '%s %s ON (%s."%s" = %s."%s")' % \
+                        (join, dest_table, table, lhs_col, dest_table, col)
+            query_from += ','
+        query_from = query_from[:-1] # drop last comma
+        return (query_from, " AND ".join(self.where_clause), self.where_clause_params)
+
+    def __str__(self):
+        return '<osv.Query: "SELECT ... FROM %s WHERE %s" with params: %r>' % self.get_sql()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/run_tests.py b/bin/run_tests.py
new file mode 100644
index 00000000000..5af29fdb3c5
--- /dev/null
+++ b/bin/run_tests.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import unittest
+
+import test
+ 
+if __name__ == '__main__':
+    unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test))
diff --git a/bin/test/__init__.py b/bin/test/__init__.py
new file mode 100644
index 00000000000..86872258874
--- /dev/null
+++ b/bin/test/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from test_osv import *
diff --git a/bin/test/test_osv.py b/bin/test/test_osv.py
new file mode 100644
index 00000000000..170aa47dc0f
--- /dev/null
+++ b/bin/test/test_osv.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import unittest
+from osv.query import Query
+
+class QueryTestCase(unittest.TestCase):
+
+    def test_basic_query(self):
+        query = Query()
+        query.tables.extend(['"product_product"','"product_template"'])
+        query.where_clause.append("product_product.template_id = product_template.id")
+        query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
+        query.join(("product_product", "res_user", "user_id", "id"), outer=True) # outer join
+        self.assertEquals(query.get_sql()[0].strip(), 
+            """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"), "product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip(), "Incorrect query")
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip(), "Incorrect where clause")
+
+    def test_raise_missing_lhs(self):
+        query = Query()
+        query.tables.append('"product_product"')
+        self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
\ No newline at end of file

From 588710ce9119e43f2ec48ecc4c7a159ca5b37ca9 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 11:53:53 +0530
Subject: [PATCH 182/632] [MOD] idea : small change in tooltip

bzr revid: vir@tinyerp.com-20101001062353-8q01xicpq3yprtyf
---
 addons/idea/report/report_vote_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 711d6c0d29f..b31a2075d20 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by opendate"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of opendate"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of opendate"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Open date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Open date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Open date"/>
                     </group>
                 </search>
             </field>

From 0cdeb89a5ed15b9f917ca03023afa96eba66622b Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 1 Oct 2010 13:06:35 +0530
Subject: [PATCH 183/632] [IMP]: Warehouse Dashboard.

bzr revid: rch_open_erp-20101001073635-ezt9nb1tkzwxpz1a
---
 addons/project/report/project_report_view.xml |  4 ++--
 addons/stock/board_warehouse_view.xml         |  4 ++--
 addons/stock/stock_view.xml                   | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 7f315ce92c9..b7caea037a0 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -240,7 +240,7 @@
         <field name="model">project.vs.hours</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Project Vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
+            <tree string="Project vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
                 <field name="project"/>
                 <field name="planned_hours"/>
                 <field name="total_hours"/>
@@ -253,7 +253,7 @@
          <field name="model">project.vs.hours</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Project Vs Planned and Total Hours" type="bar">
+             <graph string="Project vs Planned and Total Hours" type="bar">
                  <field name="project"/>
                  <field name="planned_hours" operator="+"/>
                  <field name="total_hours" operator="+"/>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 5704df7685b..8467688d994 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -27,8 +27,8 @@
                         </child1>
 
                         <child2>
-					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
-					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
+					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive vs planned" width="510"/>
+					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products vs Planned" width="510"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a7ef71c9acd..c4d10369ec4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -562,14 +562,14 @@
                </field>
         </record>
 
-      <act_window name="Unreceived Products"            
+      <act_window name="Unreceived Products"
             res_model="stock.picking.move.wizard"
             src_model="stock.picking"
             view_mode="form"
-            target="new"        
+            target="new"
             key2="client_action_multi"
-            id="act_stock_picking_move_wizard"/>        
-                
+            id="act_stock_picking_move_wizard"/>
+
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
             <field name="model">stock.picking</field>
@@ -633,7 +633,7 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" 
+                                        states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="picking_id"/>
@@ -819,7 +819,7 @@
                                    <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" 
+                                        states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
@@ -983,7 +983,7 @@
         </record>
         <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="7"/>
 
-        <!-- 
+        <!--
         #
         # Sending Products
         #
@@ -1123,7 +1123,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1250,7 +1250,7 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" 
+                                        states="draft,waiting,confirmed,assigned"
                                         groups="base.group_extended"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
@@ -1334,7 +1334,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>                                
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1919,7 +1919,7 @@
         </record>
 
         <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-            <field name="name">Number of Products to receive Vs planned</field>
+            <field name="name">Number of Products to receive vs planned</field>
             <field name="res_model">report.products.to.received.planned</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1955,7 +1955,7 @@
         </record>
 
         <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-            <field name="name">Delivery Products Vs Planned</field>
+            <field name="name">Delivery Products vs Planned</field>
             <field name="res_model">report.delivery.products.planned</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From 807e733c398510d95decf473f0a4fcfb22ed06fb Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 1 Oct 2010 13:07:29 +0530
Subject: [PATCH 184/632] [IMP]: base : Improvements in the list view of the
 Users->Users

bzr revid: jas@tinyerp.com-20101001073729-jtdo3yd4yiuwkh7u
---
 bin/addons/base/base_update.xml | 1 +
 bin/addons/base/res/res_user.py | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index af6d4f59a22..f6af6d825be 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -167,6 +167,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="context_lang"/>
+                    <field name="date"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 3b25343d724..483ea1ed102 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -28,6 +28,7 @@ import pooler
 from tools.translate import _
 from service import security
 import netsvc
+import time
 
 class groups(osv.osv):
     _name = "res.groups"
@@ -265,7 +266,7 @@ class users(osv.osv):
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
         'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
         'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
-
+        'date': fields.datetime('Last Connection', readonly=True),
     }
 
     def on_change_company_id(self, cr, uid, ids, company_id):
@@ -445,12 +446,14 @@ class users(osv.osv):
         cr = pooler.get_db(db).cursor()
         cr.execute('select id from res_users where login=%s and password=%s and active', (tools.ustr(login), tools.ustr(password)))
         res = cr.fetchone()
-        cr.close()
+
         if res:
+            cr.execute("update res_users set date=%s where id=%s", (time.strftime('%Y-%m-%d %H:%M:%S'),res[0]))
+            cr.commit()
             return res[0]
         else:
             return False
-
+        cr.close()
     def check_super(self, passwd):
         if passwd == tools.config['admin_passwd']:
             return True

From 5607586667e3194a40628a99ca401c6a1d613bac Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 1 Oct 2010 08:47:23 +0000
Subject: [PATCH 185/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101001084723-t0gh6nh5alivjvig
---
 bin/addons/base/i18n/nl.po | 42 +++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 0e1b62fa594..af960dcbd5f 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 18:36+0000\n"
-"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
+"PO-Revision-Date: 2010-09-30 12:03+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -3366,7 +3366,7 @@ msgstr "U kunt het menu opnieuw laden met (Ctrl+t Ctrl+r)."
 #: view:ir.ui.view_sc:0
 #: field:res.partner.title,shortcut:0
 msgid "Shortcut"
-msgstr "Sneltoets"
+msgstr "Snelkoppeling"
 
 #. module: base
 #: field:ir.model.data,date_init:0
@@ -8109,34 +8109,35 @@ msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
+msgstr "Dit menu heeft al een snelkoppeling!"
 
 #. module: base
 #: sql_constraint:ir.model.data:0
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"U kunt niet meer records hebben met dezelfde id voor dezelfde module !"
 
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
+msgstr "Uw onderhoudscontract is al ingeschreven in het systeem !"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "De modulenaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.partner.function:0
@@ -8146,38 +8147,38 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
+msgstr "De relatienaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "De landnaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "De landcode moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
+msgstr "De taalnaam moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "De taalcode moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "De groepsnaam moet uniek zijn !"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Voorwaarde Fout"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8188,6 +8189,10 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"De bewerking kan niet worden afgerond, waarschijnlijk vanwege:\n"
+"- verwijdering: u probeert een record te verwijderen terwijl er nog door een "
+"ander aan wordt gerefereerd\n"
+"- maken/wijzigen: een verplicht veld is niet correct ingevuld"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8197,12 +8202,15 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[object met referentie: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Integriteit Fout"
 
 #~ msgid "Main Company"
 #~ msgstr "Moederorganisatie"

From 7daff00debee27abbd05c2be1d54b7523fa98665 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 14:27:54 +0530
Subject: [PATCH 186/632] [MOD] idea,survery : Small change

bzr revid: vir@tinyerp.com-20101001085754-hhi8akglto8slqz3
---
 addons/idea/report/report_vote_view.xml        | 8 ++++----
 addons/survey/wizard/survey_send_invitation.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index b31a2075d20..91564d4f786 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -64,7 +64,7 @@
                         <field name="user_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="10" col="12">
+                    <group expand="1" string="Group By..." colspan="10" col="12">
                         <filter string="Creator" icon="terp-personal" context="{'group_by':'creater_id'}"/>
                         <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Open date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Open date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Open date"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Open date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Open date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Open date"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index fd7a35bfa89..b9740fba6ba 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -50,8 +50,8 @@ class survey_send_invitation(osv.osv_memory):
     _defaults = {
         'send_mail': lambda *a: 1,
         'send_mail_existing': lambda *a: 1,
-        'mail_subject': lambda *a: "New user account.",
-        'mail_subject_existing': lambda *a: "User account info.",
+        'mail_subject': lambda *a: "Invitation",
+        'mail_subject_existing': lambda *a: "Invitation",
         'mail_from': lambda *a: tools.config['email_from']
     }
 

From e7e91db2be005db572f3d223293f0c7abb5af978 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 14:29:38 +0530
Subject: [PATCH 187/632] [MOD] idea : Small change

bzr revid: vir@tinyerp.com-20101001085938-ll4xjidy2p9fo0do
---
 addons/idea/report/report_vote_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 91564d4f786..8418377065c 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -74,9 +74,9 @@
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Open date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Open date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Open date"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Open Date"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Open Date"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Open Date"/>
                     </group>
                 </search>
             </field>

From dc984c48b6a628707aafbd5b10e569882e85ff52 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 1 Oct 2010 14:54:27 +0530
Subject: [PATCH 188/632] [IMP]: base : Improvements in Users->Users

bzr revid: jas@tinyerp.com-20101001092427-8v4dily9reejsvtc
---
 bin/addons/base/base_update.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index f6af6d825be..92ea504606e 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -168,7 +168,6 @@
                     <field name="login"/>
                     <field name="context_lang"/>
                     <field name="date"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>

From 34230abf26b0570018362826626f818a0cd7c4ff Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 1 Oct 2010 15:45:02 +0530
Subject: [PATCH 189/632] [IMP]: base module :Instatnt menu Active filter
 Button

bzr revid: ron@tinyerp.com-20101001101502-8evwjsuocdgmqryw
---
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 3fab4388877..986630db921 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -299,7 +299,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Instances">
-          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" context="{'search_default_active':1}"/>
           <separator orientation="vertical"/>
           <field name="wkf_id"/>
           <field name="uid"/>
@@ -357,7 +357,7 @@
       <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Workflow Workitems">
-          <filter icon="terp-camera_test" string="Active" domain="[]" context="{'search_default_active': 1}"/>
+          <filter icon="terp-camera_test" string="Active" domain="['state','=','active']" context="{'search_default_active':1}"/>
           <separator orientation="vertical"/>
           <field name="act_id"/>
           <field name="subflow_id"/>

From 45a9b6b703e44455099ef26f4b3e375833157909 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Fri, 1 Oct 2010 16:22:09 +0530
Subject: [PATCH 190/632] [IMP:] Put the Product Code alongwith the name in
 stock_lot_location

bzr revid: jni@tinyerp.com-20101001105209-th2h65t59y2l9q8d
---
 addons/stock/report/lot_location.rml | 32 ++++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml
index ecbe9fec9fa..76da9ec0480 100644
--- a/addons/stock/report/lot_location.rml
+++ b/addons/stock/report/lot_location.rml
@@ -52,16 +52,16 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -81,9 +81,9 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Times-Roman" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <section>
       <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
@@ -142,7 +142,7 @@
                 </para>
               </td>
               <td>
-                <para style="terp_default_9">[[ p['prod_name'] ]]</para>
+                <para style="terp_default_9">[ [[p['code'] ]] ] [[ p['prod_name'] ]]</para>
               </td>
               <td>
                 <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
@@ -171,7 +171,9 @@
               <para style="terp_tblheader_Details_Right">[[ ob['total'] ]]</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details">Units</para>
+              <para style="terp_tblheader_Details">
+                <font color="white"> </font>
+              </para>
             </td>
           </tr>
         </blockTable>
@@ -197,7 +199,9 @@
           <para style="terp_tblheader_Details_Right">[[ qty_total() ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Units</para>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>

From 77bc7579d3c60b9cd212a4ccd579380408866abe Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 1 Oct 2010 16:24:32 +0530
Subject: [PATCH 191/632] [IMP]: Accounting Dashboard.

bzr revid: rch_open_erp-20101001105432-ltkaq52n6clhq88b
---
 addons/account/account_view.xml               | 11 ++++++++++
 addons/account/board_account_view.xml         | 21 +++++++++++++++++--
 .../report/account_entries_report_view.xml    | 13 ++++++++++++
 .../board_account_report_view.xml             |  8 +++----
 .../board_hr_timesheet_invoice.xml            |  8 +++----
 5 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4aaac87a25b..af8d219d8e5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -236,6 +236,17 @@
                 </tree>
             </field>
         </record>
+        <record id="view_treasory_graph" model="ir.ui.view">
+         	<field name="name">account.treasory.graph</field>
+         	<field name="model">account.account</field>
+         	<field name="type">tree</field>
+         	<field name="arch" type="xml">
+             	<graph string="Treasory Analysis" type="bar">
+                	<field name="name"/>
+                	<field name="balance" operator="+"/>
+             	</graph>
+         </field>
+    	</record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index e8aecb2033c..581c3576894 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -20,7 +20,22 @@
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','income')]</field>
         </record>
-
+    	<record id="action_company_analysis_tree" model="ir.actions.act_window">
+        	<field name="name">Company Analysis</field>
+        	<field name="res_model">account.entries.report</field>
+        	<field name="view_type">form</field>
+        	<field name="view_mode">tree,graph</field>
+        	<field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="account.view_company_analysis_tree"/>
+    	</record>
+    	<record id="action_treasory_graph" model="ir.actions.act_window">
+        	<field name="name">Treasory Analysis</field>
+        	<field name="res_model">account.account</field>
+        	<field name="view_type">form</field>
+        	<field name="view_mode">graph,tree</field>
+            <field name="domain">[('type','=','liquidity')]</field>
+            <field name="view_id" ref="account.view_treasory_graph"/>
+    	</record>
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -30,10 +45,12 @@
                     <hpaned>
                         <child1>
                             <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
                             <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
-                            <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
+                            <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasory"/>
+                            <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 081328d89fb..45131718db9 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -48,6 +48,19 @@
              </graph>
          </field>
     </record>
+    <record id="view_company_analysis_tree" model="ir.ui.view">
+         <field name="name">account.company.analysis.tree</field>
+         <field name="model">account.entries.report</field>
+         <field name="type">tree</field>
+         <field name="arch" type="xml">
+             <tree string="Company Analysis" >
+                <field name="user_type"/>
+                <field name="debit" />
+                <field name="credit" />
+                <field name="balance" />
+             </tree>
+         </field>
+    </record>
     <record id="view_account_entries_report_search" model="ir.ui.view">
         <field name="name">account.entries.report.search</field>
         <field name="model">account.entries.report</field>
diff --git a/addons/account_report/board_account_report_view.xml b/addons/account_report/board_account_report_view.xml
index 0467db65cf1..633f4274f44 100644
--- a/addons/account_report/board_account_report_view.xml
+++ b/addons/account_report/board_account_report_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="board_account_report_form" model="ir.ui.view">
+        <!--  <record id="board_account_report_form" model="ir.ui.view">
             <field name="name">board.account.report.form</field>
             <field name="model">board.board</field>
-            <field name="inherit_id" ref="account.board_account_form"/>              
+            <field name="inherit_id" ref="account.board_account_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before"> 
+                <xpath expr="/form/hpaned/child2/action[@string='Aged receivables']" position="before">
                     <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
                 </xpath>
             </field>
-        </record>
+        </record>-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
index ff61617661c..792ea34ae53 100644
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
@@ -11,7 +11,7 @@
             <field name="view_mode">graph,tree</field>
         </record>
 
-        <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
+       <!--  <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
              <field name="type">form</field>
@@ -22,10 +22,10 @@
                     <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
                 </xpath>
             </field>
-        </record>
+        </record> -->
 
         <!-- Need to merge in above view -->
-        <record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
+        <!--<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
             <field name="name">board.hr.timesheet.invoice</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
@@ -35,7 +35,7 @@
                     <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
                 </xpath>
             </field>
-        </record>
+        </record> -->
 
         <record id="view_timesheet_uninvoiced_line_tree" model="ir.ui.view">
             <field name="name">timesheet.uninvoiced.line.tree</field>

From 6b19c649768918837036ca5df2966e1eb95478c0 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 1 Oct 2010 13:12:54 +0200
Subject: [PATCH 192/632] [IMP] report engine: try to compute float digits
 based on field and decimal_precision

bzr revid: olt@tinyerp.com-20101001111254-s2r33l07xz62fyf7
---
 bin/report/report_sxw.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index aeb04ed21b6..542dc9ece25 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -39,6 +39,7 @@ import tools
 import warnings
 import zipfile
 import common
+from osv.fields import float as float_class, function as function_class
 
 DT_FORMAT = '%Y-%m-%d'
 DHM_FORMAT = '%Y-%m-%d %H:%M:%S'
@@ -240,9 +241,32 @@ class rml_parse(object):
         self.default_lang[lang] = self.lang_dict.copy()
         return True
 
-    def formatLang(self, value, digits=2, date=False,date_time=False, grouping=True, monetary=False):
+    def digits_fmt(self, obj=None, f=None, dp=None):
+        digits = self.get_digits(obj, f, dp)
+        return "%%.%df" % (digits, )
+
+    def get_digits(self, obj=None, f=None, dp=None):
+        d = DEFAULT_DIGITS = 2
+        if dp:
+            decimal_precision_obj = self.pool.get('decimal.precision')
+            ids = decimal_precision_obj.search(self.cr, self.uid, [('name', '=', dp)])
+            if ids:
+                d = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
+        elif obj and f:
+            d = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))(self.cr)[1]
+        elif (hasattr(obj, '_field') and\
+                isinstance(obj._field, (float_class, function_class)) and\
+                obj._field.digits):
+                d = obj._field.digits[1] or DEFAULT_DIGITS
+        return d
+
+    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
+        if digits is None:
+            digits = self.get_digits(value)
+
         if isinstance(value, (str, unicode)) and not value:
             return ''
+
         if not self.lang_dict_called:
             self._get_lang_dict()
             self.lang_dict_called = True
@@ -250,6 +274,7 @@ class rml_parse(object):
         if date or date_time:
             if not str(value):
                 return ''
+
             date_format = self.lang_dict['date_format']
             parse_format = DT_FORMAT
             if date_time:
@@ -258,9 +283,11 @@ class rml_parse(object):
                 parse_format = DHM_FORMAT
             if not isinstance(value, time.struct_time):
                 return time.strftime(date_format, time.strptime(value, parse_format))
+
             else:
                 date = datetime(*value.timetuple()[:6])
             return date.strftime(date_format)
+
         return self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
 
     def repeatIn(self, lst, name,nodes_parent=False):
@@ -305,6 +332,8 @@ class rml_parse(object):
     def set_context(self, objects, data, ids, report_type = None):
         self.localcontext['data'] = data
         self.localcontext['objects'] = objects
+        self.localcontext['digits_fmt'] = self.digits_fmt
+        self.localcontext['get_digits'] = self.get_digits
         self.datas = data
         self.ids = ids
         self.objects = objects

From 9dc1071c82b49d0f3a1af1ee821d9e65b1a21697 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 16:56:52 +0530
Subject: [PATCH 193/632] [MOD] hr_expense : Improvements in expense analysis
 report

bzr revid: vir@tinyerp.com-20101001112652-mufn92jp5ex3hfxu
---
 addons/hr_expense/report/hr_expense_report_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0037831391a..a5043c90589 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -65,8 +65,8 @@
                   <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
-                    <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
-                      help = "Accepted Expenses"/>
+                    <filter string="Approved" icon="terp-camera_test" domain="[('state','=','accepted')]"
+                      help = "Approved Expenses"/>
                     <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
                       help = "Invoiced Expenses"/>
@@ -82,7 +82,7 @@
                 <separator orientation="vertical"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <newline/>
-                <field name="date"/>
+                <field name="date" string="Creation Date"/>
                 <field name="date_confirm"/>
                 <field name="date_valid"/>
             </group>
@@ -99,9 +99,9 @@
                 <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 <separator orientation="vertical"/>
-                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Create Date"/>
-                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Create Date"/>
-                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Create Date"/>
+                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
             </group>
             </search>
         </field>

From 5fce56cab36c661c2ed579cc56af64f74746eb83 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Fri, 1 Oct 2010 13:32:25 +0200
Subject: [PATCH 194/632] [FIX] report engine: fixed an error in 'get_digits'

bzr revid: olt@tinyerp.com-20101001113225-wpmxc31htrj02ssf
---
 bin/report/report_sxw.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 542dc9ece25..2c505e98622 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -253,7 +253,11 @@ class rml_parse(object):
             if ids:
                 d = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
         elif obj and f:
-            d = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))(self.cr)[1]
+            res_digits = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))
+            if isinstance(res_digits, tuple):
+                d = res_digits[1]
+            else:
+                d = res_digits(self.cr)[1]
         elif (hasattr(obj, '_field') and\
                 isinstance(obj._field, (float_class, function_class)) and\
                 obj._field.digits):

From cbc6d182c9f54048c8c98d21f381e44875ad3f98 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 13:25:52 +0200
Subject: [PATCH 195/632] [IMP] report: moved the register_all() function as a
 method of ir.actions.report.xml model, to make it easier to inherit/extend
 for additional report engines

bzr revid: odo@openerp.com-20101001112552-2br8ftpi94ootfrw
---
 bin/addons/base/ir/ir_actions.py | 28 ++++++++++++++++++++++++++--
 bin/pooler.py                    |  3 +--
 bin/report/interface.py          | 20 --------------------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 4b9d59743cb..65bff3f7adf 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -28,8 +28,9 @@ from tools.translate import _
 import netsvc
 import re
 import copy
-import sys
+import os
 from xml import dom
+from report.report_sxw import report_sxw, report_rml
 
 class actions(osv.osv):
     _name = 'ir.actions.actions'
@@ -89,6 +90,29 @@ class report_xml(osv.osv):
                 res[report.id] = False
         return res
 
+    def register_all(self, cr):
+        """Report registration handler that may be overridden by subclasses to
+           add their own kinds of report services.
+           Loads all reports with no manual loaders (auto==True) and
+           registers the appropriate services to implement them.
+        """
+        opj = os.path.join
+        cr.execute("SELECT * FROM ir_act_report_xml WHERE auto=%s ORDER BY id", (True,))
+        result = cr.dictfetchall()
+        svcs = netsvc.Service._services
+        import pdb
+        pdb.set_trace()
+        for r in result:
+            if svcs.has_key('report.'+r['report_name']):
+                continue
+            if r['report_rml'] or r['report_rml_content_data']:
+                report_sxw('report.'+r['report_name'], r['model'],
+                        opj('addons',r['report_rml'] or '/'), header=r['header'])
+            if r['report_xsl']:
+                report_rml('report.'+r['report_name'], r['model'],
+                        opj('addons',r['report_xml']),
+                        r['report_xsl'] and opj('addons',r['report_xsl']))
+
     _name = 'ir.actions.report.xml'
     _table = 'ir_act_report_xml'
     _sequence = 'ir_actions_id_seq'
@@ -98,7 +122,7 @@ class report_xml(osv.osv):
         'type': fields.char('Action Type', size=32, required=True),
         'report_name': fields.char('Service Name', size=64, required=True),
         'usage': fields.char('Action Usage', size=32),
-        'report_type': fields.selection([ ('pdf','pdf'), ('html','html'), ('raw','raw'), ('sxw','sxw'), ('txt','txt'), ('odt','odt'), ('html2html','HTML from HTML'), ('mako2html','HTML from Mako'), ], string='Report Type', required=True),
+        'report_type': fields.char('Report Type', size=32, required=True, help="Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."),
         'groups_id': fields.many2many('res.groups', 'res_groups_report_rel', 'uid', 'gid', 'Groups'),
         'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view."),
         'attachment': fields.char('Save As Attachment Prefix', size=128, help='This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables.'),
diff --git a/bin/pooler.py b/bin/pooler.py
index 7a572e71e0d..684bc6210d4 100644
--- a/bin/pooler.py
+++ b/bin/pooler.py
@@ -44,12 +44,11 @@ def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False,
         cr = db.cursor()
         try:
             pool.init_set(cr, False)
+            pool.get('ir.actions.report.xml').register_all(cr)
             cr.commit()
         finally:
             cr.close()
 
-        import report
-        report.interface.register_all(db)
         if pooljobs:
             pool.get('ir.cron').restart(db.dbname)
     return db, pool
diff --git a/bin/report/interface.py b/bin/report/interface.py
index 6aecfe66133..0ee9f432883 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -219,25 +219,5 @@ class report_rml(report_int):
         obj.render()
         return obj.get()
 
-from report_sxw import report_sxw
-
-def register_all(db):
-    opj = os.path.join
-    cr = db.cursor()
-    cr.execute("SELECT * FROM ir_act_report_xml WHERE auto=%s ORDER BY id", (True,))
-    result = cr.dictfetchall()
-    cr.close()
-    svcs = netsvc.Service._services
-    for r in result:
-        if svcs.has_key('report.'+r['report_name']):
-            continue
-        if r['report_rml'] or r['report_rml_content_data']:
-            report_sxw('report.'+r['report_name'], r['model'],
-                    opj('addons',r['report_rml'] or '/'), header=r['header'])
-        if r['report_xsl']:
-            report_rml('report.'+r['report_name'], r['model'],
-                    opj('addons',r['report_xml']),
-                    r['report_xsl'] and opj('addons',r['report_xsl']))
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 898705b2a36409798d5ca640ff8150d1d54129cd Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Fri, 1 Oct 2010 17:14:52 +0530
Subject: [PATCH 196/632] [IMP]: change string.

bzr revid: rch_open_erp-20101001114452-vy2wpa7e3c7cbgzn
---
 addons/account/account_view.xml         | 2 +-
 addons/account/board_account_view.xml   | 2 +-
 addons/sale/board_sale_view.xml         | 2 +-
 addons/sale/report/sale_report_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index af8d219d8e5..a643bd8ca89 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -239,7 +239,7 @@
         <record id="view_treasory_graph" model="ir.ui.view">
          	<field name="name">account.treasory.graph</field>
          	<field name="model">account.account</field>
-         	<field name="type">tree</field>
+         	<field name="type">graph</field>
          	<field name="arch" type="xml">
              	<graph string="Treasory Analysis" type="bar">
                 	<field name="name"/>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 581c3576894..cc6c6187a83 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -29,7 +29,7 @@
             <field name="view_id" ref="account.view_company_analysis_tree"/>
     	</record>
     	<record id="action_treasory_graph" model="ir.actions.act_window">
-        	<field name="name">Treasory Analysis</field>
+        	<field name="name">Treasory</field>
         	<field name="res_model">account.account</field>
         	<field name="view_type">form</field>
         	<field name="view_mode">graph,tree</field>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 79bdf5d76b6..a7c51d3acde 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -19,7 +19,7 @@
                         <child2>
                             <action  name="%(sale.action_sales_by_salesman)d" string="Sales By Salesman"/>
                             <action  name="%(sale.action_sales_by_partner)d" string="Sales By Customer"/>
-                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product Category"/>
+                            <action  name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index ccdeabb1e17..183a034f1d2 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -246,7 +246,7 @@
     </record>
 
    <record id="action_sales_product_total_price" model="ir.actions.act_window">
-        <field name="name">Sales by Product Category</field>
+        <field name="name">Sales by Product's Category</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>

From efdd499c787a23b407e8df82a217e57642bcf254 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 1 Oct 2010 17:18:42 +0530
Subject: [PATCH 197/632] [MOD/IMP] hr_evaluation : usability improvement

bzr revid: dbr@tinyerp.com-20101001114842-iff1syjh3i9dmu3e
---
 addons/hr_evaluation/hr_evaluation_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5dcc7b6f346..02f551a28b8 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -237,7 +237,7 @@
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/> 
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed Deadline"
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id" />
@@ -246,6 +246,7 @@
                     <newline/>
                     <group expand='0' string='Group by...'>
                     <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                    <separator orientation="vertical"/>
                     <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
                     <filter string='State' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                     <separator orientation="vertical"/>

From ab773ebb3f40826e7fb810bef45077c6bebdb4d6 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 1 Oct 2010 17:24:15 +0530
Subject: [PATCH 198/632] [IMP] base: * remove icon on reporting menu * add
 wkf_id related field in workitem * correct close button icon on request form

bzr revid: hmo@tinyerp.com-20101001115415-pbaj7bz46bkkf41l
---
 bin/addons/base/base_menu.xml                 | 2 +-
 bin/addons/base/ir/workflow/workflow.py       | 2 +-
 bin/addons/base/ir/workflow/workflow_view.xml | 8 ++++----
 bin/addons/base/res/res_request_view.xml      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index b37b78f6740..9aab35b5d81 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -21,7 +21,7 @@
             groups="base.group_extended"/>
         <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="10"
             groups="base.group_extended"/>
-        <menuitem icon="STOCK_OPEN" id="reporting_menu"
+        <menuitem id="reporting_menu"
             parent="base.menu_custom" name="Reporting" sequence="30"
              />
     </data>
diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 8074d784e3c..30fd666c03e 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -171,7 +171,6 @@ class wkf_instance(osv.osv):
     _log_access = False
     _columns = {
         'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True),
-        'uid': fields.integer('User ID'),
         'res_id': fields.integer('Resource ID', select=True),
         'res_type': fields.char('Resource Object', size=64, select=True),
         'state': fields.char('State', size=32, select=True),
@@ -194,6 +193,7 @@ class wkf_workitem(osv.osv):
     _rec_name = 'state'
     _columns = {
         'act_id': fields.many2one('workflow.activity', 'Activity', required=True, ondelete="cascade", select=True),
+        'wkf_id': fields.related('act_id','wkf_id', type='many2one', relation='workflow', string='Workflow'),
         'subflow_id': fields.many2one('workflow.instance', 'Subflow', ondelete="cascade", select=True),
         'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True),
         'state': fields.char('State', size=64, select=True),
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index c3e5c3f3c98..9adbec0fc56 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -272,7 +272,6 @@
       <field name="arch" type="xml">
         <form string="Workflow Instances">
           <field name="wkf_id" readonly="1"/>
-          <field name="uid" readonly="1"/>
           <field name="res_id" readonly="1"/>
           <field name="res_type" readonly="1"/>
           <field name="state" readonly="1"/>
@@ -286,7 +285,6 @@
       <field name="arch" type="xml">
         <tree string="Workflow Instances">
           <field name="wkf_id"/>
-          <field name="uid"/>
           <field name="res_id"/>
           <field name="res_type"/>
           <field name="state"/>
@@ -301,8 +299,7 @@
         <search string="Workflow Instances">
           <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
           <separator orientation="vertical"/>
-          <field name="wkf_id"/>
-          <field name="uid"/>
+          <field name="wkf_id" widget="selection"/>
           <field name="res_id"/>
           <field name="res_type"/>
           <field name="state"/>
@@ -332,6 +329,7 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow Workitems">
+          <field name="wkf_id" readonly="1"/>  
           <field name="act_id" readonly="1"/>
           <field name="subflow_id" readonly="1"/>
           <field name="inst_id" readonly="1"/>
@@ -345,6 +343,7 @@
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="Workflow Workitems">
+          <field name="wkf_id"/>  
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>
@@ -360,6 +359,7 @@
         <search string="Workflow Workitems">
           <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
           <separator orientation="vertical"/>
+          <field name="wkf_id" widget="selection"/>  
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 53b7044f8ff..7cec248b990 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -42,7 +42,7 @@
                             <field colspan="4" name="body" nolabel="1"/>
                             <group col="5" colspan="4">
                                 <field name="state"/>
-                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-stop"/>
+                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-close"/>
                                 <button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/>
                                 <button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
                             </group>

From ad114aa4bea3516c026f26693ef4f517ff7159eb Mon Sep 17 00:00:00 2001
From: "VRO(OpenERP)" <>
Date: Fri, 1 Oct 2010 17:51:35 +0530
Subject: [PATCH 199/632] [IMP]: Purchase Dashboard.

bzr revid: rch_open_erp-20101001122135-gt5spyszlo18tttp
---
 addons/account/board_account_view.xml     |  2 +-
 addons/purchase/board_purchase_view.xml   | 99 ++++++++++++++++++++++-
 addons/purchase/report/purchase_report.py |  3 +
 3 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index cc6c6187a83..9823960b0e2 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -48,8 +48,8 @@
                             <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
-                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
                             <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasory"/>
+                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
                             <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
                         </child2>
                     </hpaned>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index f5b131a69f5..6bbbe0e73e7 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -8,7 +8,7 @@
             parent="base.next_id_73" sequence="0"/>
 
         <record id="purchase_draft" model="ir.actions.act_window">
-            <field name="name">Draft Purchases</field>
+            <field name="name">Request for Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -17,7 +17,7 @@
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
         <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Quotation Request</field>
+            <field name="name">Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -26,6 +26,92 @@
             <field name="search_view_id" ref="purchase.purchase_order_tree"/>
         </record>
 
+		<record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
+            <field name="name">purchase.order.monthly.categ.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Monthly Purchase by Category">
+                    <field name="month"/>
+                    <field name="price_total"/>
+                    <field name="category_id"/>
+                </tree>
+            </field>
+        </record>
+    	<record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
+            <field name="name">purchase.order.monthly.categ.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Monthly Purchase by Category" type="bar">
+                    <field name="month"/>
+                    <field name="price_total" operator="+"/>
+                    <field name="category_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+	    <record id="action_purchase_order_monthly_categ_graph" model="ir.actions.act_window">
+	        <field name="name">Monthly Purchase by Category</field>
+	        <field name="res_model">purchase.report</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
+	    </record>
+	    <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_purchase_order_monthly_categ_tree"/>
+            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
+	    </record>
+	    <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
+	            <field eval="1" name="sequence"/>
+	            <field name="view_mode">graph</field>
+	            <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
+	            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
+	    </record>
+
+        <record model="ir.ui.view" id="view_negotiation_by_supplier_tree">
+            <field name="name">negotiation.by.supplier.tree</field>
+            <field name="model">purchase.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Negotiation by Supplier">
+                    <field name="partner_id"/>
+                    <field name="negociation"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_negotiation_by_supplier_graph">
+            <field name="name">negotiation.by.supplier.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Negotiation by Supplier" type="bar">
+                    <field name="partner_id"/>
+                    <field name="negociation"/>
+                </graph>
+            </field>
+        </record>
+		<record id="action_negotiation_by_supplier" model="ir.actions.act_window">
+	        <field name="name">Negotiation by Supplier</field>
+	        <field name="res_model">purchase.report</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">graph,tree</field>
+	        <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
+	    </record>
+	    <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_negotiation_by_supplier_tree"/>
+            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
+	    </record>
+	    <record id="open_view_negotiation_by_supplier_graph" model="ir.actions.act_window.view">
+	            <field eval="1" name="sequence"/>
+	            <field name="view_mode">graph</field>
+	            <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
+	            <field name="act_window_id" ref="action_negotiation_by_supplier"/>
+	    </record>
+
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
             <field name="model">board.board</field>
@@ -34,13 +120,22 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
+                        <!--
                             <action colspan="4" height="220" name="%(purchase.action_current_purchases)d" string="Current purchases"  width="510"/>
                             <action colspan="4" height="220" name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"  width="510"/>
+                        -->
+                        	<action colspan="4" height="220" name="%(purchase_draft)d" string="Request for Quotations"  width="510"/>
+                        	<action colspan="4" height="220" name="%(purchase_waiting)d" string="Waiting Approval"  width="510"/>
                         </child1>
                         <child2>
+                        	<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"  />
+                            <action colspan="4" height="220" name="%(action_negotiation_by_supplier)d" string="Negotiation by Supplier"  />
+                        <!--
                             <action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier"  />
                             <action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state"  />
                             <action colspan="4" height="220" name="%(purchase.action_qty_per_product)d" string="Total Quantity per product"  />
+                        -->
+
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 612ea134b4e..f30d65d8f28 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -65,6 +65,7 @@ class purchase_report(osv.osv):
         'nbr': fields.integer('# of Lines', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+        'category_id': fields.many2one('product.category', 'Category', readonly=True)
 
     }
     _order = 'name desc,price_total desc'
@@ -90,6 +91,7 @@ class purchase_report(osv.osv):
                     s.create_uid as user_id,
                     s.company_id as company_id,
                     l.product_id,
+                    t.categ_id as category_id,
                     l.product_uom as product_uom,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
@@ -123,6 +125,7 @@ class purchase_report(osv.osv):
                     s.validator,
                     s.dest_address_id,
                     l.product_id,
+                    t.categ_id,
                     s.date_order,
                     to_char(s.date_order, 'YYYY'),
                     to_char(s.date_order, 'MM'),

From 808d546b2ee634c28567a756c2e1cd6151f9cf1b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 1 Oct 2010 18:00:32 +0530
Subject: [PATCH 200/632] [MOD] hr_recruitment : Improvements in report

bzr revid: vir@tinyerp.com-20101001123032-l3i6o30chre0nx1j
---
 .../report/hr_recruitment_report_view.xml     | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index d1f06577fb2..2e1476b9de6 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -67,7 +67,7 @@
                     	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft recruitment"/>
-	                <filter string="Current"
+	                <filter string="In progress"
 	                	icon="terp-check"
 	                	domain="[('state', '=' ,'open')]"
 	                	help = "In progress recruitment"/>
@@ -91,36 +91,34 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="job_id" widget="selection"/>
-                    <field name="type_id" widget="selection"/>
+                    <field name="job_id" />
                     <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
-                    <field name="state"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date"/>
+                    <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By ...">
                    <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
                     <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <separator orientation="vertical"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
+            	   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
-            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
-            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
+            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
 
-                
+
                 </search>
         </field>
     </record>

From 05c30d29f42de9bf5fd27ba9beb576c419135a4a Mon Sep 17 00:00:00 2001
From: Ferdinand <>
Date: Fri, 1 Oct 2010 18:13:01 +0530
Subject: [PATCH 201/632] [IMP] Bank : If partner has an account number, he
 must have a bank linked and thus bank has to be a required field

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

bzr revid: jvo@tinyerp.com-20101001124301-7rruihe46ku5zezq
---
 bin/addons/base/res/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 466a8de0786..05630dea85b 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -392,7 +392,7 @@ class res_partner_bank(osv.osv):
     _columns = {
         'name': fields.char('Description', size=128),
         'acc_number': fields.char('Account Number', size=64, required=False),
-        'bank': fields.many2one('res.bank', 'Bank'),
+        'bank': fields.many2one('res.bank', 'Bank', required=True),
         'owner_name': fields.char('Account Owner', size=64),
         'street': fields.char('Street', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),

From 8f99c6ebcd536a72f1404a50f9664bed4b257141 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 14:51:34 +0200
Subject: [PATCH 202/632] [FIX] ir.actions: remove leftover debug breakpoint -
 sorry about it :-( - also note that previous commit changed the report_type
 field of ir.actions.report.xml from selection to char to be more easily
 extended

bzr revid: odo@openerp.com-20101001125134-b6dovx9vs12lcndy
---
 bin/addons/base/ir/ir_actions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 65bff3f7adf..27704687f93 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -100,8 +100,6 @@ class report_xml(osv.osv):
         cr.execute("SELECT * FROM ir_act_report_xml WHERE auto=%s ORDER BY id", (True,))
         result = cr.dictfetchall()
         svcs = netsvc.Service._services
-        import pdb
-        pdb.set_trace()
         for r in result:
             if svcs.has_key('report.'+r['report_name']):
                 continue

From 361005df7e43a70599c10440881a53cb6a6af461 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 1 Oct 2010 18:40:38 +0530
Subject: [PATCH 203/632] [IMP] account_budget: Rename files

bzr revid: psi@tinyerp.co.in-20101001131038-metbescbnv58qjmk
---
 addons/account_budget/__init__.py                         | 6 +++---
 addons/account_budget/__openerp__.py                      | 8 ++++----
 .../{crossovered_budget.py => account_budget.py}          | 0
 ...rossovered_budget_demo.xml => account_budget_demo.xml} | 0
 ...overed_budget_report.xml => account_budget_report.xml} | 0
 ...rossovered_budget_view.xml => account_budget_view.xml} | 0
 ...ed_budget_workflow.xml => account_budget_workflow.xml} | 0
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename addons/account_budget/{crossovered_budget.py => account_budget.py} (100%)
 rename addons/account_budget/{crossovered_budget_demo.xml => account_budget_demo.xml} (100%)
 rename addons/account_budget/{crossovered_budget_report.xml => account_budget_report.xml} (100%)
 rename addons/account_budget/{crossovered_budget_view.xml => account_budget_view.xml} (100%)
 rename addons/account_budget/{crossovered_budget_workflow.xml => account_budget_workflow.xml} (100%)

diff --git a/addons/account_budget/__init__.py b/addons/account_budget/__init__.py
index 4eea62cb2d8..56a00fb9ba4 100644
--- a/addons/account_budget/__init__.py
+++ b/addons/account_budget/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import crossovered_budget
+import account_budget
 import report
 import wizard
 
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index b023e7e1124..dfe1640a290 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -50,16 +50,16 @@ Three reports are available:
         'security/ir.model.access.csv',
         'security/account_budget_security.xml',
         'wizard/account_budget_spread_view.xml',
-        'crossovered_budget_view.xml',
-        'crossovered_budget_report.xml',
-        'crossovered_budget_workflow.xml',
+        'account_budget_view.xml',
+        'account_budget_report.xml',
+        'account_budget_workflow.xml',
         'wizard/account_budget_analytic_view.xml',
         'wizard/account_budget_report_view.xml',
         'wizard/account_budget_spread_view.xml',
         'wizard/account_budget_crossovered_summary_report_view.xml',
         'wizard/account_budget_crossovered_report_view.xml',
     ],
-    'demo_xml': ['crossovered_budget_demo.xml'],
+    'demo_xml': ['account_budget_demo.xml'],
     'test':[
             'test/account_budget.yml',
             'test/account_budget_report.yml',
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/account_budget.py
similarity index 100%
rename from addons/account_budget/crossovered_budget.py
rename to addons/account_budget/account_budget.py
diff --git a/addons/account_budget/crossovered_budget_demo.xml b/addons/account_budget/account_budget_demo.xml
similarity index 100%
rename from addons/account_budget/crossovered_budget_demo.xml
rename to addons/account_budget/account_budget_demo.xml
diff --git a/addons/account_budget/crossovered_budget_report.xml b/addons/account_budget/account_budget_report.xml
similarity index 100%
rename from addons/account_budget/crossovered_budget_report.xml
rename to addons/account_budget/account_budget_report.xml
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/account_budget_view.xml
similarity index 100%
rename from addons/account_budget/crossovered_budget_view.xml
rename to addons/account_budget/account_budget_view.xml
diff --git a/addons/account_budget/crossovered_budget_workflow.xml b/addons/account_budget/account_budget_workflow.xml
similarity index 100%
rename from addons/account_budget/crossovered_budget_workflow.xml
rename to addons/account_budget/account_budget_workflow.xml

From cd02d15c08e9b17785cbca6d508323db207f9a6e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 1 Oct 2010 18:47:02 +0530
Subject: [PATCH 204/632] [MOD/IMP] hr_* : usability improvement

bzr revid: dbr@tinyerp.com-20101001131702-a76c1fyi9nzsmr1r
---
 .../hr_evaluation/report/hr_evaluation_report_view.xml |  6 +++---
 addons/hr_holidays/report/hr_holidays_report_view.xml  | 10 +++++-----
 .../report/timesheet_report_view.xml                   |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index a8aaeb2ec93..f30e473d030 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -79,9 +79,9 @@
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create Date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Group by month of create Date"/>
-                    <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Group by year of create Date"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 89cdb6014bb..ab8afeae30b 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -75,7 +75,7 @@
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
                             help="Leaves by empolyee"/>
-                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                      <filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
@@ -85,16 +85,16 @@
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of create date"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of create date"/>
+                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id="action_hr_holidays_report_all" model="ir.actions.act_window">
-        <field name="name">Leaves</field>
+        <field name="name">Leaves Analysis</field>
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 08abc6db63b..a015ff933d2 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -34,11 +34,11 @@
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
+					<field name="total_attendance" sum="#Total Attendance"/>
+                    <field name="total_timesheet" sum="#Total Timesheet"/>
+                    <field name="total_diff" sum="#Total Diff"/>
                     <field name="quantity" sum="#Quantity"/>
                     <field name="cost" sum="#Cost"/>
-                    <field name="total_diff" sum="#Total Diff"/>
-                    <field name="total_timesheet" sum="#Total Timesheet"/>
-                    <field name="total_attendance" sum="#Total Attendance"/>
                 </tree>
             </field>
         </record>

From 48d9c128e050c9280df5c6c211fa558999889d8c Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 1 Oct 2010 19:23:58 +0530
Subject: [PATCH 205/632] [REM]:base:removed ir.actions.report.custom and
 ir.report.custom

bzr revid: jas@tinyerp.com-20101001135358-ndjdcdw9hojno9kh
---
 bin/addons/base/ir/ir.xml                    |  89 -------------
 bin/addons/base/ir/ir_actions.py             |  17 ---
 bin/addons/base/ir/ir_report_custom.py       | 127 ++-----------------
 bin/addons/base/ir/ir_ui_menu.py             |   2 -
 bin/addons/base/security/ir.model.access.csv |   3 -
 5 files changed, 12 insertions(+), 226 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index ee8a21d2bb7..9b4e0e3e38a 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -389,59 +389,6 @@
         <menuitem parent="base.next_id_6" name="Filters"
             id="menu_ir_filters" action="actions_ir_filters_view" />
 
-
-        <record id="act_report_custom_view" model="ir.ui.view">
-            <field name="name">ir.actions.report.custom</field>
-            <field name="model">ir.actions.report.custom</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Report custom">
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="report_id"/>
-                    <field name="usage"/>
-                </form>
-            </field>
-        </record>
-        <record id="act_report_custom_view_tree" model="ir.ui.view">
-            <field name="name">ir.actions.report.custom.tree</field>
-            <field name="model">ir.actions.report.custom</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Report custom">
-                    <field name="name"/>
-                    <field name="type"/>
-                </tree>
-            </field>
-        </record>
-        <record id="act_report_custom_search_view" model="ir.ui.view">
-            <field name="name">ir.actions.report.custom.search</field>
-            <field name="model">ir.actions.report.custom</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Report custom">
-                    <group colspan="4" col="10">
-                        <field name="name"/>
-                        <field name="type"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By" colspan="4">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                    </group>
-                </search>
-           </field>
-        </record>
-
-        <record id="ir_action_report_custom" model="ir.actions.act_window">
-            <field name="name">Report Custom</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">ir.actions.report.custom</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="act_report_custom_view_tree"/>
-            <field name="search_view_id" ref="act_report_custom_search_view"/>
-        </record>
-        <menuitem action="ir_action_report_custom" id="menu_ir_action_report_custom" parent="base.next_id_6"/>
-
         <record id="act_report_xml_view" model="ir.ui.view">
             <field name="name">ir.actions.report.xml</field>
             <field name="model">ir.actions.report.xml</field>
@@ -1067,42 +1014,6 @@
             </field>
         </record>
 
-        <record id="view_report_custom_form" model="ir.ui.view">
-            <field name="name">ir.report.custom</field>
-            <field name="model">ir.report.custom</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Custom Report">
-                    <field name="name" select="1"/>
-                    <field name="model_id" on_change="onchange_model_id(model_id)" select="1"/>
-                    <field name="title"/>
-                    <field name="type"/>
-                    <field name="print_format"/>
-                    <field name="print_orientation"/>
-                    <field name="repeat_header"/>
-                    <field name="footer"/>
-                    <field name="sortby"/>
-                    <field name="field_parent"/>
-                    <field name="frequency"/>
-                    <field name="limitt"/>
-                    <field name="menu_id"/>
-                    <field colspan="4" name="fields_child0" widget="one2many_list"/>
-                    <field name="state" readonly="1" select="1"/>
-                    <group col="2" colspan="2">
-                        <button name="subscribe" states="unsubscribed" string="Subscribe Report" type="object"/>
-                        <button name="unsubscribe" states="subscribed" string="Unsubscribe Report" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_report_custom" model="ir.actions.act_window">
-            <field name="name">Custom Report</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">ir.report.custom</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_report_custom_form"/>
-        </record>
-
         <!--
         <menuitem name="Administration/Report/Report Custom" action="action_report_custom"/>
         -->
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 4b9d59743cb..e956ee2bf59 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -44,23 +44,6 @@ class actions(osv.osv):
     }
 actions()
 
-class report_custom(osv.osv):
-    _name = 'ir.actions.report.custom'
-    _table = 'ir_act_report_custom'
-    _sequence = 'ir_actions_id_seq'
-    _columns = {
-        'name': fields.char('Report Name', size=64, required=True, translate=True),
-        'type': fields.char('Report Type', size=32, required=True),
-        'model':fields.char('Object', size=64, required=True),
-        'report_id': fields.integer('Report Ref.', required=True),
-        'usage': fields.char('Action Usage', size=32),
-        'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view.")
-    }
-    _defaults = {
-        'multi': lambda *a: False,
-        'type': lambda *a: 'ir.actions.report.custom',
-    }
-report_custom()
 
 class report_xml(osv.osv):
 
diff --git a/bin/addons/base/ir/ir_report_custom.py b/bin/addons/base/ir/ir_report_custom.py
index 3c7daa09d34..ff81e48ff53 100644
--- a/bin/addons/base/ir/ir_report_custom.py
+++ b/bin/addons/base/ir/ir_report_custom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,127 +27,24 @@ from tools.translate import _
 from tools.safe_eval import safe_eval as eval
 import netsvc
 
-class report_custom(osv.osv):
-    _name = 'ir.report.custom'
-    _columns = {
-        'name': fields.char('Report Name', size=64, required=True, translate=True),
-        'model_id': fields.many2one('ir.model','Object', required=True, change_default=True),
-        'type': fields.selection([('table','Tabular'),('pie','Pie Chart'),('bar','Bar Chart'),('line','Line Plot')], "Report Type", size=64, required='True'),
-        'title': fields.char("Report Title", size=64, required='True', translate=True),
-        'print_format': fields.selection((('A4','a4'),('A5','a5')), 'Print format', required=True),
-        'print_orientation': fields.selection((('landscape','Landscape'),('portrait','Portrait')), 'Print orientation', required=True, size=16),
-        'repeat_header': fields.boolean('Repeat Header'),
-        'footer': fields.char('Report Footer', size=64, required=True),
-        'sortby': fields.char('Sorted By', size=64),
-        'fields_child0': fields.one2many('ir.report.custom.fields', 'report_id','Fields', required=True),
-        'field_parent': fields.many2one('ir.model.fields','Child Field'),
-        'state': fields.selection([('unsubscribed','Unsubscribed'),('subscribed','Subscribed')], 'State', size=64),
-        'frequency': fields.selection([('Y','Yearly'),('M','Monthly'),('D','Daily')], 'Frequency', size=64),
-        'limitt': fields.char('Limit', size=9),
-        'menu_id': fields.many2one('ir.ui.menu', 'Menu')
-    }
-    _defaults = {
-        'print_format': lambda *a: 'A4',
-        'print_orientation': lambda *a: 'portrait',
-        'state': lambda *a: 'unsubscribed',
-        'type': lambda *a: 'table',
-        'footer': lambda *a: 'Generated by OpenERP'
-    }
-    
-    def onchange_model_id(self, cr, uid, ids, model_id):
-        if not(model_id):
-            return {}
-        return {'domain': {'field_parent': [('model_id','=',model_id)]}}
-
-    def unsubscribe(self, cr, uid, ids, context={}):
-#TODO: should delete the ir.actions.report.custom for these reports and do an ir_del
-        self.write(cr, uid, ids, {'state':'unsubscribed'})
-        return True
-
-    def subscribe(self, cr, uid, ids, context={}):
-        for report in self.browse(cr, uid, ids):
-            report.fields_child0.sort(lambda x,y : x.sequence - y.sequence)
-        
-            # required on field0 does not seem to work( cause we use o2m_l ?)
-            if not report.fields_child0:
-                raise osv.except_osv(_('Invalid operation'), _('Enter at least one field !'))
-            
-            if report.type in ['pie', 'bar', 'line'] and report.field_parent:
-                raise osv.except_osv(_('Invalid operation'), _('Tree can only be used in tabular reports'))
-            
-            # Otherwise it won't build a good tree. See level.pop in custom.py.
-            if report.type == 'table' and report.field_parent and report.fields_child0 and not report.fields_child0[0].groupby:
-                raise osv.except_osv('Invalid operation :', 'When creating tree (field child) report, data must be group by the first field')
-
-            if report.type == 'pie':
-                if len(report.fields_child0) != 2:
-                    raise osv.except_osv(_('Invalid operation'), _('Pie charts need exactly two fields'))
-                else:
-                    c_f = {}
-                    for i in range(2):
-                        c_f[i] = []
-                        tmp = report.fields_child0[i]
-                        for j in range(3):
-                            c_f[i].append((not isinstance(eval('tmp.field_child'+str(j),{},{'tmp':tmp}), browse_null) and eval('tmp.field_child'+str(j)+'.ttype',{},{'tmp':tmp})) or None)
-                    if not reduce(lambda x,y : x or y, map(lambda x: x in ['integer', 'float'], c_f[1])):
-                        raise osv.except_osv(_('Invalid operation'), _('Second field should be figures'))
-                    
-            if report.type == 'bar':
-                if len(report.fields_child0) < 2:
-                    raise osv.except_osv(_('Invalid operation'), _('Bar charts need at least two fields'))
-                else:
-                    c_f = {}
-                    for i in range(len(report.fields_child0)):
-                        c_f[i] = []
-                        tmp = report.fields_child0[i]
-                        for j in range(3):
-                            c_f[i].append((not isinstance(eval('tmp.field_child'+str(j),{},{'tmp':tmp}), browse_null) and eval('tmp.field_child'+str(j)+'.ttype',{},{'tmp':tmp})) or None)
-
-                        if i == 0:
-                            pass
-                        else:
-                            if not reduce(lambda x,y : x or y, map(lambda x: x in ['integer', 'float'], c_f[i])):
-                                raise osv.except_osv(_('Invalid operation'), _('Field %d should be a figure') %(i,))
-
-            if report.state=='subscribed':
-                continue
-
-            name = report.name
-            model = report.model_id.model
-
-            action_def = {'report_id':report.id, 'type':'ir.actions.report.custom', 'model':model, 'name':name}
-            id = self.pool.get('ir.actions.report.custom').create(cr, uid, action_def)
-            m_id = report.menu_id.id
-            action = "ir.actions.report.custom,%d" % (id,)
-            if not report.menu_id:
-                ir.ir_set(cr, uid, 'action', 'client_print_multi', name, [(model, False)], action, False, True)
-            else:
-                ir.ir_set(cr, uid, 'action', 'tree_but_open', 'Menuitem', [('ir.ui.menu', int(m_id))], action, False, True)
-
-            self.write(cr, uid, [report.id], {'state':'subscribed'}, context)
-        return True
-report_custom()
-
-
 class report_custom_fields(osv.osv):
     _name = 'ir.report.custom.fields'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'report_id': fields.many2one('ir.report.custom', 'Report Ref', select=True),
         'field_child0': fields.many2one('ir.model.fields', 'Field child0', required=True),
-        'fc0_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc0_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc0_condition': fields.char('Condition', size=64),
         'fc0_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'field_child1': fields.many2one('ir.model.fields', 'Field child1'),
-        'fc1_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc1_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc1_condition': fields.char('condition', size=64),
         'fc1_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'field_child2': fields.many2one('ir.model.fields', 'Field child2'),
-        'fc2_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc2_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc2_condition': fields.char('condition', size=64),
         'fc2_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'field_child3': fields.many2one('ir.model.fields', 'Field child3'),
-        'fc3_operande': fields.many2one('ir.model.fields', 'Constraint'), 
+        'fc3_operande': fields.many2one('ir.model.fields', 'Constraint'),
         'fc3_condition': fields.char('condition', size=64),
         'fc3_op': fields.selection((('>','>'),('<','<'),('==','='),('in','in'),('gety,==','(year)=')), 'Relation'),
         'alignment':  fields.selection((('left','left'),('right','right'),('center','center')), 'Alignment', required=True),
@@ -180,9 +77,9 @@ class report_custom_fields(osv.osv):
             if id:
                 return {
                     'domain': {
-                        next_level_field_name: [('model_id', '=', id)], 
+                        next_level_field_name: [('model_id', '=', id)],
                         next_level_operande: [('model_id', '=', id)]
-                    }, 
+                    },
                     'required': {
                         next_level_field_name: True
                     }
@@ -192,13 +89,13 @@ class report_custom_fields(osv.osv):
                 return {'required': {next_level_field_name: True}}
         else:
             return {'domain': {next_level_field_name: []}}
-            
+
     def get_field_child_onchange_method(level):
         return lambda self, cr, uid, ids, field_id: self.onchange_any_field_child(cr, uid, ids, field_id, level)
 
-    onchange_field_child0 = get_field_child_onchange_method(0)  
-    onchange_field_child1 = get_field_child_onchange_method(1)  
-    onchange_field_child2 = get_field_child_onchange_method(2)  
+    onchange_field_child0 = get_field_child_onchange_method(0)
+    onchange_field_child1 = get_field_child_onchange_method(1)
+    onchange_field_child2 = get_field_child_onchange_method(2)
 report_custom_fields()
 
 
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index d16b4554d41..6b4d98962b4 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -125,7 +125,6 @@ class ir_ui_menu(osv.osv):
                 data = menu.action
                 if data:
                     model_field = { 'ir.actions.act_window':    'res_model',
-                                    'ir.actions.report.custom': 'model',
                                     'ir.actions.report.xml':    'model',
                                     'ir.actions.wizard':        'model',
                                     'ir.actions.server':        'model_id',
@@ -272,7 +271,6 @@ class ir_ui_menu(osv.osv):
         'action': fields.function(_action, fnct_inv=_action_inv,
             method=True, type='reference', string='Action',
             selection=[
-                ('ir.actions.report.custom', 'ir.actions.report.custom'),
                 ('ir.actions.report.xml', 'ir.actions.report.xml'),
                 ('ir.actions.act_window', 'ir.actions.act_window'),
                 ('ir.actions.wizard', 'ir.actions.wizard'),
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 481007d52b2..d70c2b9bba6 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -19,7 +19,6 @@
 "access_ir_module_module_dependency_group_system","ir_module_module_dependency group_system","model_ir_module_module_dependency","group_system",1,1,1,1
 "access_ir_property_group_user","ir_property group_user","model_ir_property",,1,0,0,0
 "access_ir_property_group_user_manager","ir_property group_manager","model_ir_property","base.group_partner_manager",1,1,1,0
-"access_ir_report_custom_group_system","ir_report_custom group_system","model_ir_report_custom",,1,0,0,0
 "access_ir_report_custom_fields_group_system","ir_report_custom_fields group_system","model_ir_report_custom_fields",,1,0,0,0
 "access_ir_rule_group_user","ir_rule group_user","model_ir_rule",,1,0,0,0
 "access_ir_rule_group_erp_manager","ir_rule group_erp_manager","model_ir_rule","group_erp_manager",1,1,1,1
@@ -99,8 +98,6 @@
 "access_workflow_triggers_all","workflow_triggers_all","model_workflow_triggers",,1,0,0,0
 "access_workflow_triggers_group_system","workflow_triggers_group_system","model_workflow_triggers","group_system",1,1,1,1
 "access_workflow_workitem_all","workflow_workitem_all","model_workflow_workitem",,1,1,1,1
-"access_actions_report_custom_all","ir_actions_report_custom_all","model_ir_actions_report_custom",,1,0,0,0
-"access_actions_report_custom_group_system","ir_actions_report_custom_group_system","model_ir_actions_report_custom","group_system",1,1,1,1
 "access_ir_actions_act_window_view_all","ir_actions_act_window_view_all","model_ir_actions_act_window_view",,1,0,0,0
 "access_ir_actions_act_window_view_group_system","ir_actions_act_window_view_group_system","model_ir_actions_act_window_view","group_system",1,1,1,1
 "access_ir_actions_url_all","ir_actions_url_all","model_ir_actions_url",,1,0,0,0

From 6c505a4f582169a648625859f6713a56ae3391ff Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 1 Oct 2010 19:37:24 +0530
Subject: [PATCH 206/632] Improved Pagenumber and Pagecount.(need to more
 improved it..)

bzr revid: apa@tinyerp.com-20101001140724-qllak4zp967ke7dz
---
 bin/report/render/rml2pdf/trml2pdf.py | 56 ++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 848b0f29215..5ec38a405df 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -35,9 +35,58 @@ from lxml import etree
 import base64
 from reportlab.platypus.doctemplate import ActionFlowable
 from tools.safe_eval import safe_eval as eval
+from reportlab.lib.units import inch,cm,mm
 
 encoding = 'utf-8'
 
+class NumberedCanvas(canvas.Canvas):
+
+    def __init__(self, *args, **kwargs):
+        canvas.Canvas.__init__(self, *args, **kwargs)
+        self._codes = []
+        self._flag=False
+        self._pageCount=0
+        self.i =0
+        self.k=0
+        self.pages={}
+
+    def showPage(self):
+        self.i +=1
+        if not self._flag:
+           self._pageCount += 1
+        else:
+            self.pages.update({self.i:self._pageCount})
+        self._codes.append({'code': self._code, 'stack': self._codeStack})
+        self._startPage()
+        self._flag=False
+
+    def pageCount(self):
+        if self.pages.get(self.k,False):
+            self._pageNumber=0
+        self.k +=1
+        key=self.k
+        if not self.pages.get(key,False):
+            while not self.pages.get(key,False):
+                key = key + 1
+        self.setFont("Helvetica", 15)
+        self.drawRightString(200*mm, 20*mm,
+            "page %(this)i of %(total)i" % {
+               'this': self._pageNumber+1,
+               'total': self.pages.get(key,False),
+            }
+        )
+
+    def save(self):
+        """add page info to each page (page x of y)"""
+        # reset page counter
+        self._pageNumber = 0
+        for code in self._codes:
+            self._code = code['code']
+            self._codeStack = code['stack']
+            self.pageCount()
+            canvas.Canvas.showPage(self)
+        self._doc.SaveToFile(self._filename, self)
+
 class PageCount(platypus.Flowable):
     def draw(self):
         self.canv.beginForm("pageCount")
@@ -762,6 +811,9 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
         self.handle_frameBegin()
     def afterFlowable(self, flowable):
         if isinstance(flowable, PageReset):
+            self.canv._pageCount=self.page
+            self.page=0
+            self.canv._flag=True
             self.canv._pageNumber = 0
 
 class _rml_template(object):
@@ -808,13 +860,15 @@ class _rml_template(object):
         for node_story in node_stories:
             if story_cnt > 0:
                 fis.append(platypus.PageBreak())
+
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
+            self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())
-        self.doc_tmpl.build(fis)
+        self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
 
 def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):
     node = etree.XML(rml)

From 9454f780af6dbb141574d807a9947fc70494bbfe Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 16:36:42 +0200
Subject: [PATCH 207/632] [FIX] osv.query: improve support of chained explicit
 JOINs + corresponding tests

bzr revid: odo@openerp.com-20101001143642-z3ahichcj55csxib
---
 bin/osv/query.py     | 16 +++++++++++-----
 bin/test/test_osv.py | 30 +++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/bin/osv/query.py b/bin/osv/query.py
index b04e536ad60..5ba74e49a1c 100644
--- a/bin/osv/query.py
+++ b/bin/osv/query.py
@@ -99,13 +99,19 @@ class Query(object):
         """Returns (query_from, query_where, query_params)"""
         query_from = ''
         tables_to_process = list(self.tables)
+
+        def add_joins_for_table(table, query_from):
+            for (dest_table, lhs_col, col, join) in self.joins.get(table,[]):
+                tables_to_process.remove(dest_table)
+                query_from += ' %s %s ON (%s."%s" = %s."%s")' % \
+                    (join, dest_table, table, lhs_col, dest_table, col)
+                query_from = add_joins_for_table(dest_table, query_from)
+            return query_from
+
         for table in tables_to_process:
-            query_from += ' %s ' % table
+            query_from += table
             if table in self.joins:
-                for (dest_table, lhs_col, col, join) in self.joins[table]:
-                    tables_to_process.remove(dest_table)
-                    query_from += '%s %s ON (%s."%s" = %s."%s")' % \
-                        (join, dest_table, table, lhs_col, dest_table, col)
+                query_from = add_joins_for_table(table, query_from)
             query_from += ','
         query_from = query_from[:-1] # drop last comma
         return (query_from, " AND ".join(self.where_clause), self.where_clause_params)
diff --git a/bin/test/test_osv.py b/bin/test/test_osv.py
index 170aa47dc0f..6e9f9c1e173 100644
--- a/bin/test/test_osv.py
+++ b/bin/test/test_osv.py
@@ -31,10 +31,34 @@ class QueryTestCase(unittest.TestCase):
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_product", "res_user", "user_id", "id"), outer=True) # outer join
         self.assertEquals(query.get_sql()[0].strip(), 
-            """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"), "product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip(), "Incorrect query")
-        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip(), "Incorrect where clause")
+            """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"),"product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip())
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
+
+    def test_query_chained_explicit_joins(self):
+        query = Query()
+        query.tables.extend(['"product_product"','"product_template"'])
+        query.where_clause.append("product_product.template_id = product_template.id")
+        query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
+        query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
+        self.assertEquals(query.get_sql()[0].strip(), 
+            """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id")""".strip())
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
+
+    def test_mixed_query_chained_explicit_implicit_joins(self):
+        query = Query()
+        query.tables.extend(['"product_product"','"product_template"'])
+        query.where_clause.append("product_product.template_id = product_template.id")
+        query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
+        query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
+        query.tables.append('"account.account"')
+        query.where_clause.append("product_category.expense_account_id = account_account.id") # additional implicit join 
+        self.assertEquals(query.get_sql()[0].strip(), 
+            """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id"),"account.account" """.strip())
+        self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id AND product_category.expense_account_id = account_account.id""".strip())
+
 
     def test_raise_missing_lhs(self):
         query = Query()
         query.tables.append('"product_product"')
-        self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
\ No newline at end of file
+        self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
+

From d9c2e1a2e8db5f397123fcc4108f9fddc7c92ae8 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 1 Oct 2010 17:24:03 +0200
Subject: [PATCH 208/632] [FIX] account: typo in query_get + fix in common
 wizard report + [REF] account: query_get removal of period_manner in context

bzr revid: qdp-launchpad@tinyerp.com-20101001152403-7yy1l7sy0kdq728l
---
 addons/account/account_move_line.py           | 38 +------------------
 .../account/wizard/account_report_common.py   |  3 +-
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 42efd14aa97..ec2b23ff07b 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -56,7 +56,7 @@ class account_move_line(osv.osv):
         where_move_lines_by_date = ''
 
         if context.get('date_from', False) and context.get('date_to', False):
-            if initital_bal:
+            if initial_bal:
                 where_move_lines_by_date = " AND " +obj+".move_id in ( select id from account_move  where date < '"+context['date_from']+"')"
             else:
                 where_move_lines_by_date = " AND " +obj+".move_id in ( select id from account_move  where date >= '" +context['date_from']+"' AND date <= '"+context['date_to']+"')"
@@ -88,42 +88,6 @@ class account_move_line(osv.osv):
 
         query += company_clause
 
-        if context.get('period_manner','') == 'created':
-            #the query have to be build with no reference to periods but thanks to the creation date
-            if context.get('periods',False):
-                #if one or more period are given, use them
-                fiscalperiod_ids = fiscalperiod_obj.search(cr, uid, [('id','in',context['periods'])])
-            else:
-                fiscalperiod_ids = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id','in',fiscalyear_ids)])
-
-
-
-            #remove from the old query the clause related to the period selection
-            res = ''
-            count = 1
-            clause_list = query.split('AND')
-            ref_string = ' '+obj+'.period_id in'
-            for clause in clause_list:
-                if count != 1 and not clause.startswith(ref_string):
-                    res += "AND"
-                if not clause.startswith(ref_string):
-                    res += clause
-                    count += 1
-
-            #add to 'res' a new clause containing the creation date criterion
-            count = 1
-            res += " AND ("
-            periods = self.pool.get('account.period').read(cr, uid, p_ids, ['date_start','date_stop'])
-            for period in periods:
-                if count != 1:
-                    res += " OR "
-                #creation date criterion: the creation date of the move_line has to be
-                # between the date_start and the date_stop of the selected periods
-                res += "("+obj+".create_date between to_date('" + period['date_start']  + "','yyyy-mm-dd') and to_date('" + period['date_stop']  + "','yyyy-mm-dd'))"
-                count += 1
-            res += ")"
-            return res
-
         return query
 
     def default_get(self, cr, uid, fields, context={}):
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index ed5e5b144ef..b02b017be55 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -118,7 +118,8 @@ class account_common_report(osv.osv_memory):
         elif data['form']['filter'] == 'filter_period':
             if not data['form']['period_from'] or not data['form']['period_to']:
                 raise osv.except_osv(_('Error'),_('Select a starting and an ending period'))
-            result['periods'] = period_obj.build_ctx_periods(cr, uid, data['form']['period_from'], data['form']['period_to'])
+            result['period_from'] = data['form']['period_from']
+            result['period_to'] = data['form']['period_to']
         return result
 
     def _print_report(self, cr, uid, ids, data, context=None):

From 8d2d7639aaf54c5277d5d41be5e8622a33fa43d1 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 1 Oct 2010 18:08:03 +0200
Subject: [PATCH 209/632] [FIX] account: removed stupid displaying of currency
 code in aged partner report

bzr revid: qdp-launchpad@tinyerp.com-20101001160803-tztq9g3zbq8zbhtr
---
 .../account/report/account_aged_partner_balance.rml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index 7f90ae0983b..143fbe0133e 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -168,22 +168,22 @@
           <para style="terp_tblheader_Details">Partners</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['3']['name'] ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['2']['name'] ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['1']['name'] ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]<font size="8.0">([[ company.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details_Right">[[ data['form']['0']['name'] ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Total</para>

From 037d12f3fa54464065acd0d10e10d2efde1c0c82 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 18:37:17 +0200
Subject: [PATCH 210/632] [IMP] base: completely remove default value for
 action_id of res.users + cleanup + tooltips

bzr revid: odo@openerp.com-20101001163717-bf1xnz6qm76y4s7h
---
 bin/addons/base/base.sql        |  3 +--
 bin/addons/base/base_data.xml   |  2 --
 bin/addons/base/base_demo.xml   |  2 --
 bin/addons/base/res/res_user.py | 17 ++++++-----------
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 84676a7f59b..eb9eb5b9d75 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -148,7 +148,6 @@ CREATE TABLE res_users (
     context_lang varchar(64) default '',
     -- No FK references below, will be added later by ORM
     -- (when the destination rows exist)
-    action_id int,
     company_id int,
     primary key(id)
 );
@@ -345,7 +344,7 @@ CREATE TABLE ir_model_data (
 -- Users
 ---------------------------------
 
-insert into res_users (id,login,password,name,action_id,active,company_id) values (1,'admin','admin','Administrator',NULL,True,1);
+insert into res_users (id,login,password,name,active,company_id) values (1,'admin','admin','Administrator',True,1);
 insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
 
 -- Compatibility purpose, to remove V6.0
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 5082adfbfe0..6625d84402b 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1053,8 +1053,6 @@
             <field name="address_id" ref="main_address"/>
             <field name="company_id" ref="main_company"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
-            <field name="action_id" ref="action_menu_admin"/>
-            <field name="menu_id" ref="action_menu_admin"/>
         </record>
 
         <record id="main_partner" model="res.partner">
diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index 235e7e77b75..7779171fe08 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -6,8 +6,6 @@
             <field name="password">demo</field>
             <field name="name">Demo User</field>
             <field name="signature">Mr Demo</field>
-            <field name="action_id" ref="action_menu_admin"/>
-            <field name="menu_id" ref="action_menu_admin"/>
             <field name="address_id" ref="main_address"/>
             <field name="company_id" ref="main_company"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/> 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index c5e5e79a756..e310f5716b8 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -242,8 +242,8 @@ class users(osv.osv):
         'signature': fields.text('Signature', size=64),
         'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
-        'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
+        'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
 
@@ -288,7 +288,6 @@ class users(osv.osv):
                 result = override_password(result)
             else:
                 result = map(override_password, result)
-                
         return result
 
 
@@ -319,10 +318,6 @@ class users(osv.osv):
             self.__admin_ids[cr.dbname] = ir_model_data_obj.read(cr, 1, [mdid], ['res_id'])[0]['res_id']
         return self.__admin_ids[cr.dbname]
 
-    def _get_action(self,cr, uid, context={}):
-        ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
-        return ids and ids[0] or False
-
     def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
             uid2 = uid
@@ -336,12 +331,12 @@ class users(osv.osv):
             return [c]
         return False
 
-    def _get_menu(self,cr, uid, context={}):
-        ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
+    def _get_menu(self,cr, uid, context=None):
+        ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')], context=context)
         return ids and ids[0] or False
 
-    def _get_group(self,cr, uid, context={}):
-        ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')])
+    def _get_group(self,cr, uid, context=None):
+        ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')], context=context)
         return ids or False
 
     _defaults = {

From 8e317c082bf71ddd10c1da380c77e156e030b226 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Oct 2010 18:54:11 +0200
Subject: [PATCH 211/632] [IMP] osv.query,orm: removed trailing whitespace
 introduced by previous commits

bzr revid: odo@openerp.com-20101001165411-cid1ut6rmf7m826n
---
 bin/osv/orm.py       |  6 +++---
 bin/osv/query.py     | 14 +++++++-------
 bin/run_tests.py     |  2 +-
 bin/test/test_osv.py |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index d0d783dc144..4836bf2916e 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2294,7 +2294,7 @@ class orm(orm_template):
         Add missing table SELECT and JOIN clause to ``query`` for reaching the parent table (no duplicates)
 
         :param parent_model_name: name of the parent model for which the clauses should be added
-        :param query: query object on which the JOIN should be added 
+        :param query: query object on which the JOIN should be added
         """
         inherits_field = self._inherits[parent_model_name]
         parent_model = self.pool.get(parent_model_name)
@@ -3936,7 +3936,7 @@ class orm(orm_template):
                         query.tables.append(table)
                 return True
             return False
-        
+
         # apply main rules on the object
         rule_obj = self.pool.get('ir.rule')
         apply_rule(*rule_obj.domain_get(cr, uid, self._name, mode, context=context))
@@ -3954,7 +3954,7 @@ class orm(orm_template):
         Add possibly missing JOIN to ``query`` and generate the ORDER BY clause for m2o fields,
         either native m2o fields or function/related fields that are stored, including
         intermediate JOINs for inheritance if required.
-        
+
         :return: the qualified field name to use in an ORDER BY clause to sort by ``order_field``
         """
         if order_field not in self._columns and order_field in self._inherit_fields:
diff --git a/bin/osv/query.py b/bin/osv/query.py
index 5ba74e49a1c..ab4f4143634 100644
--- a/bin/osv/query.py
+++ b/bin/osv/query.py
@@ -30,7 +30,7 @@ class Query(object):
     """
      Dumb implementation of a Query object, using 3 string lists so far
      for backwards compatibility with the (table, where_clause, where_params) previously used.
-     
+
      TODO: To be improved after v6.0 to rewrite part of the ORM and add support for:
       - auto-generated multiple table aliases
       - multiple joins to the same table with different conditions
@@ -45,7 +45,7 @@ class Query(object):
         self.tables = tables or []
 
         # holds the list of WHERE clause elements, to be joined with
-        # 'AND' when generating the final query 
+        # 'AND' when generating the final query
         self.where_clause = where_clause or []
 
         # holds the parameters for the formatting of `where_clause`, to be
@@ -69,7 +69,7 @@ class Query(object):
     def join(self, connection, outer=False):
         """Adds the JOIN specified in ``connection``.
 
-        :param connection: a tuple ``(lhs, table, lhs_col, col)``. 
+        :param connection: a tuple ``(lhs, table, lhs_col, col)``.
                            The join corresponds to the SQL equivalent of::
 
                                 ``(lhs.lhs_col = table.col)``
@@ -77,9 +77,9 @@ class Query(object):
         :param outer: True if a LEFT OUTER JOIN should be used, if possible
                       (no promotion to OUTER JOIN is supported in case the JOIN
                        was already present in the query, as for the moment
-                       implicit INNER JOINs are only connected from NON-NULL 
-                       columns so it would not be correct (e.g. for 
-                       ``_inherits`` or when a domain criterion explicitly 
+                       implicit INNER JOINs are only connected from NON-NULL
+                       columns so it would not be correct (e.g. for
+                       ``_inherits`` or when a domain criterion explicitly
                        adds filtering)
         """
         (lhs, table, lhs_col, col) = connection
@@ -93,7 +93,7 @@ class Query(object):
             # add JOIN
             self.tables.append(table)
             self.joins.setdefault(lhs, []).append((table, lhs_col, col, outer and 'LEFT JOIN' or 'JOIN'))
-        return self 
+        return self
 
     def get_sql(self):
         """Returns (query_from, query_where, query_params)"""
diff --git a/bin/run_tests.py b/bin/run_tests.py
index 5af29fdb3c5..7c0ee2a2431 100644
--- a/bin/run_tests.py
+++ b/bin/run_tests.py
@@ -22,6 +22,6 @@
 import unittest
 
 import test
- 
+
 if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(unittest.defaultTestLoader.loadTestsFromModule(test))
diff --git a/bin/test/test_osv.py b/bin/test/test_osv.py
index 6e9f9c1e173..191ca792a2f 100644
--- a/bin/test/test_osv.py
+++ b/bin/test/test_osv.py
@@ -30,7 +30,7 @@ class QueryTestCase(unittest.TestCase):
         query.where_clause.append("product_product.template_id = product_template.id")
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_product", "res_user", "user_id", "id"), outer=True) # outer join
-        self.assertEquals(query.get_sql()[0].strip(), 
+        self.assertEquals(query.get_sql()[0].strip(),
             """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"),"product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
 
@@ -40,7 +40,7 @@ class QueryTestCase(unittest.TestCase):
         query.where_clause.append("product_product.template_id = product_template.id")
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
-        self.assertEquals(query.get_sql()[0].strip(), 
+        self.assertEquals(query.get_sql()[0].strip(),
             """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id")""".strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
 
@@ -51,8 +51,8 @@ class QueryTestCase(unittest.TestCase):
         query.join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
         query.join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
         query.tables.append('"account.account"')
-        query.where_clause.append("product_category.expense_account_id = account_account.id") # additional implicit join 
-        self.assertEquals(query.get_sql()[0].strip(), 
+        query.where_clause.append("product_category.expense_account_id = account_account.id") # additional implicit join
+        self.assertEquals(query.get_sql()[0].strip(),
             """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id"),"account.account" """.strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id AND product_category.expense_account_id = account_account.id""".strip())
 

From 50c925d6ae17c9143a624bce5c3295d8b16fab43 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 2 Oct 2010 05:05:25 +0000
Subject: [PATCH 212/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101002050525-csd5qr5dfb8deam5
---
 bin/addons/base/i18n/nl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index af960dcbd5f..534a06b7f62 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-30 12:03+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-01 11:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From f69cf2457e527c9bf8bc270e4e16dd9d9d9bf5e7 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 4 Oct 2010 12:40:36 +0530
Subject: [PATCH 213/632] [FIX] mrp_operations,mrp_repair, stock: Fixed errors.

bzr revid: uco@tinyerp.com-20101004071036-3kah01azasv4k86o
---
 addons/mrp_operations/mrp_operations.py |  2 +-
 addons/mrp_repair/mrp_repair.py         |  2 +-
 addons/stock/stock.py                   | 25 +++++++++++++------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 4ab3bf90956..36f4b18cddb 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -68,7 +68,7 @@ class mrp_production_workcenter_line(osv.osv):
         @return: Dictionary of values.
         """
         ops = self.browse(cr, uid, ids, context=context)
-        date_and_hours_by_cal = [(op.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops]
+        date_and_hours_by_cal = [(op.production_id.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops]
         intervals = self.pool.get('resource.calendar').interval_get_multi(cr, uid, date_and_hours_by_cal)
 
         res = {}
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index af88c32f42a..4689295f53f 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -687,7 +687,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         if type == 'add':
             stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
             to_invoice = False
-            if guarantee_limit and date.today() > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
+            if guarantee_limit and datetime.today() > datetime.strptime(guarantee_limit, '%Y-%m-%d'):
                 to_invoice=True
             return {'value': {
                         'to_invoice': to_invoice,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d73a842bedd..c57ce030bf1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -128,18 +128,19 @@ class stock_location(osv.osv):
             c['location'] = loc_id
             for prod in product_product_obj.browse(cr, uid, product_ids, context=c):
                 for f in field_names:
-                    if f == 'stock_real':
-                        result[loc_id][f] += prod.qty_available
-                    elif f == 'stock_virtual':
-                        result[loc_id][f] += prod.virtual_available
-                    elif f == 'stock_real_value':
-                        amount = prod.qty_available * prod.standard_price
-                        amount = currency_obj.round(cr, uid, currency, amount)
-                        result[loc_id][f] += amount
-                    elif f == 'stock_virtual_value':
-                        amount = prod.virtual_available * prod.standard_price
-                        amount = currency_obj.round(cr, uid, currency, amount)
-                        result[loc_id][f] += amount
+                    if loc_id in result.keys():
+                        if f == 'stock_real':
+                            result[loc_id][f] += prod.qty_available
+                        elif f == 'stock_virtual':
+                            result[loc_id][f] += prod.virtual_available
+                        elif f == 'stock_real_value':
+                            amount = prod.qty_available * prod.standard_price
+                            amount = currency_obj.round(cr, uid, currency, amount)
+                            result[loc_id][f] += amount
+                        elif f == 'stock_virtual_value':
+                            amount = prod.virtual_available * prod.standard_price
+                            amount = currency_obj.round(cr, uid, currency, amount)
+                            result[loc_id][f] += amount
 
         return result
 

From f881f95bfe14d636766f9cad8e3940eaffcbcbe0 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 4 Oct 2010 12:55:32 +0530
Subject: [PATCH 214/632] [FIX] point_of_sale: Typo error corrected.

bzr revid: uco@tinyerp.com-20101004072532-33yw0bs97in3jsgq
---
 addons/point_of_sale/wizard/pos_return.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 4b975b820cb..6d926c8d408 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -123,7 +123,7 @@ class pos_return(osv.osv_memory):
                    <button icon='gtk-cancel' special="cancel"
                                string="Cancel" />
                                    <button icon='gtk-ok' name= "create_returns"
-                       string="Return with Echange" type="object"/>
+                       string="Return with Exchange" type="object"/>
                                    <button icon='gtk-ok' name="create_returns2"
                         string="Refund Without Exchange" type="object"/>
                 </form>"""

From 29f101668dae52eba19a58e9f1a35634488c9edd Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 12:56:06 +0530
Subject: [PATCH 215/632] [Fix] stock: fix the graph view of  Moves
 Analysis,remove all views and code that are used  dashboard

bzr revid: sbh@tinyerp.com-20101004072606-n7n3q0dmi4kmxmll
---
 addons/stock/board_warehouse_view.xml         |  4 +-
 .../stock/report/report_stock_move_view.xml   |  2 +-
 addons/stock/security/ir.model.access.csv     |  2 -
 addons/stock/stock.py                         | 68 ------------------
 addons/stock/stock_view.xml                   | 72 -------------------
 5 files changed, 2 insertions(+), 146 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 20a99f0ab6a..04e4b592aef 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -40,9 +40,7 @@
 
                         <child2>
 						                        
-					    	<action colspan="4" name="%(stock.action_move_graph_reception_picking)d" string="Number of Products to receive Vs planned" width="510"/>
-<!--					    	<action colspan="4" name="%(stock.action_move_delivery_products_planned)d" string="Delivery Products Vs Planned" width="510"/>
--->                        </child2>
+                        </child2>
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 12a43a5abbe..df91f1f7737 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -45,7 +45,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="product_id"/>
-                 <field name="day_diff2" operator="avg"/>
+                 <field name="day_diff2" operator="+"/>
              </graph>
          </field>
     </record>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 285eebccde5..e879a03e9e1 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -32,8 +32,6 @@
 "access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
 "access_stock_lines_date_system","report.stock.lines.date system","model_report_stock_lines_date","base.group_system",1,0,0,0
 "access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
-"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,1,1,1
-"access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,1,1,1
 "access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0
 "access_report_stock_move_system","report.stock.move system","model_report_stock_move","base.group_system",1,0,0,0
 "access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3a70b387d49..bdad93d7e5e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2561,73 +2561,5 @@ class stock_picking_move_wizard(osv.osv_memory):
 
 stock_picking_move_wizard()
 
-class report_products_to_received_planned(osv.osv):
-    _name = "report.products.to.received.planned"
-    _description = "Received Products vs Planned"
-    _auto = False
-    _columns = {
-        'date':fields.date('Date'),
-        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
-        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
-
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_products_to_received_planned')
-        cr.execute("""
-            create or replace view report_products_to_received_planned as (
-               select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
-                   from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.create_date
-
-                    union
-
-               select stock.date as date , min(stock.id) as id, 0 as actual_qty, sum(stock.product_qty) as planned_qty
-                    from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'in'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-        group by stock.date
-                )
-        """)
-
-report_products_to_received_planned()
-
-class report_delivery_products_planned(osv.osv):
-    _name = "report.delivery.products.planned"
-    _description = "Delivered products vs Planned"
-    _auto = False
-    _columns = {
-        'date':fields.date('Date'),
-        'qty': fields.float('Actual Qty', digits_compute=dp.get_precision('Product UoM')),
-        'planned_qty': fields.float('Planned Qty', digits_compute=dp.get_precision('Product UoM')),
-
-    }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_delivery_products_planned')
-        cr.execute("""
-            create or replace view report_delivery_products_planned as (
-                select stock.create_date as date, min(stock.id) as id, sum(stock.product_qty) as qty, 0 as planned_qty
-                   from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.create_date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.create_date
-
-                    union
-
-               select stock.date as date, min(stock.id), 0 as actual_qty, sum(stock.product_qty) as planned_qty
-                    from stock_picking picking
-                    inner join stock_move stock
-                    on picking.id = stock.picking_id and picking.type = 'out'
-                    where stock.date between (select cast(date_trunc('week', current_date) as date)) and (select cast(date_trunc('week', current_date) as date) + 7)
-                    group by stock.date
-                )
-        """)
-
-report_delivery_products_planned()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cd2c6439326..1a8a13c0f7b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1953,78 +1953,6 @@
             <field eval="True" name="object"/>
         </record>
 
-        <!-- Graph Views -->
-        <!--  Products To Received Vs Planned -->
-        <record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
-            <field name="name">Products To Received</field>
-            <field name="model">report.products.to.received.planned</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Products To Received" >
-                    <field name="qty" />
-                    <field name="planned_qty" />
-                    <field name="date"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_move_graph_reception_picking">
-            <field name="name">Products To Received</field>
-            <field name="model">report.products.to.received.planned</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-            <graph string="Products To Received" type="bar" orientation="vertical">
-                <field name="date"/>
-                <field name="qty" operator="+"/>
-                <field name="planned_qty" operator="+"/>
-            </graph>
-            </field>
-        </record>
-
-        <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-            <field name="name">Number of Products to receive Vs planned</field>
-            <field name="res_model">report.products.to.received.planned</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_move_graph_reception_picking"/>
-        </record>
-
-        <!--  Delivery Product Vs Planned -->
-        <record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
-            <field name="name">Delivery Products</field>
-            <field name="model">report.delivery.products.planned</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Products To Received" >
-                    <field name="qty" />
-                    <field name="planned_qty" />
-                    <field name="date"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
-            <field name="name">Delivery Products</field>
-            <field name="model">report.delivery.products.planned</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-            <graph string="Products To Received" type="bar" orientation="vertical">
-                <field name="date"/>
-                <field name="qty" operator="+"/>
-                <field name="planned_qty" operator="+"/>
-            </graph>
-            </field>
-        </record>
-
-        <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-            <field name="name">Delivery Products Vs Planned</field>
-            <field name="res_model">report.delivery.products.planned</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
-        </record>
 
         <record id="action_picking_tree_out" model="ir.actions.act_window">
             <field name="name">Customers Packings</field>

From 05f53b95f109f912f65d03c41b2bae9573540e46 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 13:01:13 +0530
Subject: [PATCH 216/632] [FIX] Account: Residual amount is not update updated
 properly with voucher payment

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

bzr revid: mra@mra-laptop-20101004073113-x70oe0fsnlt3dqjy
---
 addons/account/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 1aa4e30d95d..71d37cd25ad 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -148,7 +148,7 @@ class account_invoice(osv.osv):
             res[id] = []
             if not invoice.move_id:
                 continue
-            data_lines = invoice.move_id.line_id
+            data_lines = [x for x in invoice.move_id.line_id if x.account_id.id == invoice.account_id.id]
             partial_ids = []
             for line in data_lines:
                 ids_line = []

From 709ff19f2a1e429e71f2d9bb89bc8feb5c49f2f2 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 4 Oct 2010 14:04:03 +0530
Subject: [PATCH 217/632] [FIX] base: res.bank demo data added

bzr revid: ach@tinyerp.com-20101004083403-pz54686nngv27w6g
---
 bin/addons/base/base_data.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 6625d84402b..9597ac83f92 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1373,6 +1373,9 @@
             <field name="currency_id" ref="UAH"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-
+        <record id="res_bank_1" model="res.bank">
+            <field name="name">Reserve</field>
+            <field name="code">RSV</field>
+        </record>
     </data>
 </openerp>

From 810351b16ad5cbb482b01d1c8f1f3eb3e38add7c Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Mon, 4 Oct 2010 14:19:09 +0530
Subject: [PATCH 218/632] [IMP]:Changes in Account and hr_holidays reports

bzr revid: jni@tinyerp.com-20101004084909-anda3v1tymjkh5v1
---
 addons/account/account_unit_test.xml            |  9 ++++++++-
 addons/account/test/account_report.yml          |  5 +++--
 .../test/account_budget_report.yml              |  6 +++---
 .../1.5/post-01-convert-limits-into-requests.py | 17 +++++++++--------
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index 97fba380214..e4178517361 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -14,6 +14,13 @@
             <field name="name">Test invoice 1</field>
             <field name="address_contact_id" ref="base.res_partner_address_tang"/>
         </record>
+        <record id="test_tax_line" model="account.invoice.tax">
+            <field name="name">Test Tax</field>
+            <field name="base">5.00</field>
+            <field name="amount">100.00</field>
+            <field name="account_id" ref="account.ova"/>
+            <field name="invoice_id" ref="test_invoice_1"/>            
+        </record>            
         <record id="test_invoice_1_line_1" model="account.invoice.line">
             <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
             <field name="invoice_id" ref="test_invoice_1"/>
@@ -27,7 +34,7 @@
             <field name="price_unit">800</field>
             <field name="quantity">2</field>
             <field name="account_id" ref="account.a_sale"/>
-        </record>
+        </record>        
         
         <assert id="test_invoice_1" model="account.invoice" string="The currency unit of Test invoice 1 is EUR">
             <test expr="currency_id.code">EUR</test>
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 98d3aa591b3..79fa915d8d6 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -30,7 +30,7 @@
 -
   !record {model: account.tax.code, id: account_tax_code_0}:
     name : Tax Code Test
-    sign : 1.00
+    sign : 10.00
 -
  Print Tax Code entries report
 - 
@@ -40,13 +40,14 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
 
+
 -
   Print Vat Declaration Report
 -
    !python {model: account.tax.code}: |
     import netsvc, tools, os
     data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
-    (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_tax_code_0")], data_dict, {})
+    (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_move_0")], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
 
diff --git a/addons/account_budget/test/account_budget_report.yml b/addons/account_budget/test/account_budget_report.yml
index 2115341c1a1..d0766e31196 100644
--- a/addons/account_budget/test/account_budget_report.yml
+++ b/addons/account_budget/test/account_budget_report.yml
@@ -3,7 +3,7 @@
 -
   !python {model: account.analytic.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
+    data_dict = {'model': 'account.analytic.account', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
     (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account.analytic_root')], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account_budget-analytic_budget_report.'+format), 'wb+').write(data)
@@ -12,7 +12,7 @@
 -
   !python {model: account.budget.post}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.budget.post', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
+    data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
     (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account_budget.account_budget_post_sales0')], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account_budget-budget_report.'+format), 'wb+').write(data)
@@ -24,4 +24,4 @@
     data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'report':'analytic-full','id':ref('account_budget.crossovered_budget_budgetoptimistic0'),'context':{}}}
     (data, format) = netsvc.LocalService('report.crossovered.budget.report').create(cr, uid, [ref('account_budget.crossovered_budget_budgetoptimistic0')], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
diff --git a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
index 5ee6e894cf5..a59dbbf85eb 100644
--- a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
+++ b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
@@ -21,14 +21,15 @@
 __name__ = "Convert the Holidays Per User limits into positive leave request"
 
 def migrate(cr, version):
-    cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
-                    FROM hr_holidays_per_user;""")
-    for record in cr.fetchall():
-        cr.execute("""INSERT INTO hr_holidays 
-            (employee_id, type, allocation_type, name, holiday_status_id, 
-            state, number_of_days, notes, manager_id) VALUES
-            (%s, 'add', 'company', 'imported holiday_per_user', %s,
-            'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
+#    cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
+#                    FROM hr_holidays_per_user;""")
+#    for record in cr.fetchall():
+#        cr.execute("""INSERT INTO hr_holidays 
+#            (employee_id, type, allocation_type, name, holiday_status_id, 
+#            state, number_of_days, notes, manager_id) VALUES
+#            (%s, 'add', 'company', 'imported holiday_per_user', %s,
+#            'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
+    return {}
         
 
 

From 1b8aa2b44a3ac6389cc22442956f2cf8009b575d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 4 Oct 2010 11:28:52 +0200
Subject: [PATCH 219/632] [FIX] ir.module.module needs to be readable by all so
 web modules can work correctly

bzr revid: xmo@openerp.com-20101004092852-je0xiz3dzdll5g7f
---
 bin/addons/base/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 9168d93078d..67c79c552c1 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -18,6 +18,7 @@
 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0
 "access_ir_module_module_group_user","ir_module_module group_user","model_ir_module_module","group_system",1,1,1,1
+"access_ir_module_module_user","ir_module_module user","model_ir_module_module",,1,0,0,0
 "access_ir_module_module_dependency_group_system","ir_module_module_dependency group_system","model_ir_module_module_dependency","group_system",1,1,1,1
 "access_ir_property_group_user","ir_property group_user","model_ir_property",,1,0,0,0
 "access_ir_property_group_user_manager","ir_property group_manager","model_ir_property","base.group_partner_manager",1,1,1,0

From 6826c05e3b7708f075889dc8e58fe8e6a1ca0dde Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 15:13:20 +0530
Subject: [PATCH 220/632] [ADD] Account: common report wizard (target move
 added) [IMP] Account: General ledger report remove target move will use from
 common

bzr revid: mra@mra-laptop-20101004094320-kzqipqkl7jomuydw
---
 addons/account/wizard/account_report_common.py            | 8 ++++++--
 addons/account/wizard/account_report_common_view.xml      | 1 +
 addons/account/wizard/account_report_general_ledger.py    | 5 +----
 .../account/wizard/account_report_general_ledger_view.xml | 3 +--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index b02b017be55..038973c4ed8 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -40,7 +40,10 @@ class account_common_report(osv.osv_memory):
         'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
         'date_from': fields.date("Start Date"),
         'date_to': fields.date("End Date"),
-                }
+        'target_move': fields.selection([('all', 'All Entries'),
+                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+
+        }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')
@@ -101,6 +104,7 @@ class account_common_report(osv.osv_memory):
             'journal_ids': _get_all_journal,
             'filter': 'filter_no',
             'chart_account_id': _get_account,
+            'target_move': 'all',
     }
 
     def _build_contexts(self, cr, uid, ids, data, context=None):
@@ -132,7 +136,7 @@ class account_common_report(osv.osv_memory):
         data = {}
         data['ids'] = context.get('active_ids', [])
         data['model'] = context.get('active_model', 'ir.ui.menu')
-        data['form'] = self.read(cr, uid, ids, ['date_from',  'date_to',  'fiscalyear_id', 'journal_ids', 'period_from', 'period_to',  'filter',  'chart_account_id'])[0]
+        data['form'] = self.read(cr, uid, ids, ['date_from',  'date_to',  'fiscalyear_id', 'journal_ids', 'period_from', 'period_to',  'filter',  'chart_account_id', 'target_move'])[0]
         used_context = self._build_contexts(cr, uid, ids, data, context=context)
         data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
         data['form']['used_context'] = used_context
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index ec3aa6b227b..b9c629acf28 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -10,6 +10,7 @@
             <form string="Report Options">
                    <field name="chart_account_id" widget='selection'/>
                    <field name="fiscalyear_id"/>
+                   <field name="target_move"/>
                        <notebook tabpos="up" colspan="4">
                             <page string="Filters" name="filters">
                                 <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/>
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index 37ac27bc2ec..c08894bfadd 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -32,15 +32,12 @@ class account_report_general_ledger(osv.osv_memory):
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
         'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
     _defaults = {
         'landscape': True,
         'amount_currency': True,
         'sortby': 'sort_date',
         'initial_balance': False,
-        'target_move': 'all',
     }
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False, context=None):
@@ -53,7 +50,7 @@ class account_report_general_ledger(osv.osv_memory):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby'])[0])
         if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
             data['form'].update({'initial_balance': False})
         if data['form']['landscape']:
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 42256912add..b251252851c 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -8,9 +8,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
+               <field name="target_move" position="after">
                    <field name="display_account"/>
-                   <field name="target_move"/>
                    <field name="sortby"/>
                    <field name="landscape"/>
                    <field name="initial_balance" attrs="{'readonly':[('fiscalyear_id','=', False)]}"/>

From 2b30cec9accaa90c46792e8c891e8028dbc141ac Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 15:22:23 +0530
Subject: [PATCH 221/632] [REM] Account: Account balance => remove target move
 used from common wizard

bzr revid: mra@mra-laptop-20101004095223-6m542eu7esgf3h6q
---
 addons/account/wizard/account_report_account_balance.py  | 9 +--------
 .../wizard/account_report_account_balance_view.xml       | 3 +--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 475a7da5a74..6b8c4371dd2 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -21,21 +21,15 @@
 
 from lxml import etree
 
-from osv import osv, fields
+from osv import osv
 
 class account_balance_report(osv.osv_memory):
     _inherit = "account.common.account.report"
     _name = 'account.balance.report'
     _description = 'Trial Balance Report'
 
-    _columns = {
-       'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
-    }
-
     _defaults = {
         'journal_ids': [],
-        'target_move': 'all'
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -51,7 +45,6 @@ class account_balance_report(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['target_move'])[0])
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}
 
 account_balance_report()
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index 8c09e954dbf..eb31f4e20f0 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -9,9 +9,8 @@
           <field name="type">form</field>
           <field name="inherit_id" ref="account_common_report_view" />
           <field name="arch" type="xml">
-              <field name="fiscalyear_id" position="after">
+              <field name="target_move" position="after">
                   <field name="display_account"/>
-                  <field name="target_move"/>
                   <newline/>
               </field>
           </field>

From c3b171c7e71a768f3d5f2e5a52036f4143a682e1 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 15:24:10 +0530
Subject: [PATCH 222/632] [REM] Account: balnace sheet => remove target move
 used from common wizard

bzr revid: mra@mra-laptop-20101004095410-4kgzirij3adourlg
---
 addons/account/wizard/account_report_balance_sheet.py       | 5 +----
 addons/account/wizard/account_report_balance_sheet_view.xml | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index df6d58c9ae7..a4ad0c58524 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -36,14 +36,11 @@ class account_bs_report(osv.osv_memory):
         'display_type': fields.boolean("Landscape Mode"),
         'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
                                       help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
 
     _defaults={
         'display_type': True,
         'journal_ids': [],
-        'target_move': 'all',
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -65,7 +62,7 @@ class account_bs_report(osv.osv_memory):
         if not account.company_id.property_reserve_and_surplus_account:
             raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
         data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
-        data['form'].update(self.read(cr, uid, ids, ['display_type','target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
         if data['form']['display_type']:
             return {
                 'type': 'ir.actions.report.xml',
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index f0a943fd050..f1c5ef35de9 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -8,9 +8,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
+               <field name="target_move" position="after">
                     <field name="display_account"/>
-                    <field name="target_move"/>
                     <field name="display_type"/>
                     <field name="reserve_account_id" required="0" invisible="1"/>
                     <newline/>

From 96ad74ccc0b5983e806e162dc3dba0d3478215c0 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 15:28:59 +0530
Subject: [PATCH 223/632] [REM] Account: p&l => target move set to readonly for
 nw

bzr revid: mra@mra-laptop-20101004095859-2y9zmj0mzvkzq3x6
---
 addons/account/wizard/account_report_profit_loss.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index bc36e233685..94487c4f567 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -37,6 +37,7 @@ class account_pl_report(osv.osv_memory):
     _defaults = {
         'display_type': True,
         'journal_ids': [],
+        'target_move': False
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -44,6 +45,10 @@ class account_pl_report(osv.osv_memory):
         res = super(account_pl_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='journal_ids']")
+        for node in nodes:
+            node.set('readonly', '1')
+            node.set('required', '0')
+        nodes = doc.xpath("//field[@name='target_move']")
         for node in nodes:
             node.set('readonly', '1')
             node.set('required', '0')

From d2f2e832afde128c2e515dc3cb1569d27474a124 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 15:35:21 +0530
Subject: [PATCH 224/632] [REM] Account: general journal and central journal
 with target moves

bzr revid: mra@mra-laptop-20101004100521-ixj77ede6yq12l7o
---
 .../account/wizard/account_report_central_journal_view.xml   | 2 +-
 .../account/wizard/account_report_general_journal_view.xml   | 2 +-
 addons/account/wizard/account_report_print_journal.py        | 5 +----
 addons/account/wizard/account_report_print_journal_view.xml  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 3e24510a470..ca7103c685e 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="fiscalyear_id" position="after">
+                <field name="target_move" position="after">
                     <field name="amount_currency"/>
                     <newline/>
                 </field>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 5bc339202e5..eababa83982 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-                <field name="fiscalyear_id" position="after">
+                <field name="target_move" position="after">
 	                <field name="amount_currency"/>
 	                <newline/>
                 </field>
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index f264524dc4b..6256cca8ab6 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -30,19 +30,16 @@ class account_print_journal(osv.osv_memory):
         'sort_selection': fields.selection([('date', 'Date'),
                                             ('ref', 'Reference Number'),],
                                             'Entries Sorted By', required=True),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True)
     }
     _defaults = {
         'sort_selection': 'date',
-        'target_move': 'all'
     }
 
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['sort_selection','target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data}
 
 account_print_journal()
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index 2b4a597b87b..eb3e5063361 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -8,9 +8,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
+               <field name="target_move" position="after">
                    <field name="sort_selection"/>
-                   <field name="target_move"/>
                    <field name="amount_currency"/>
                    <newline/>
                </field>

From f835b84d8b2f2c1b54893701c1411bdbfaaa9365 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 15:39:43 +0530
Subject: [PATCH 225/632] [IMP] Account: Partner accounts reports target move
 changes move to common wizard so

bzr revid: mra@mra-laptop-20101004100943-lkfeoa5ai8o4p82q
---
 .../wizard/account_report_aged_partner_balance_view.xml      | 1 -
 addons/account/wizard/account_report_common_partner.py       | 5 +----
 .../account/wizard/account_report_partner_balance_view.xml   | 4 +---
 addons/account/wizard/account_report_partner_ledger_view.xml | 3 +--
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 9f894f0f670..ad9c90b2e36 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -17,7 +17,6 @@
                     <newline/>
                     <field name="result_selection"/>
                     <field name="direction_selection"/>
-                    <field name="target_move"/>
                     <field name="journal_ids"/>
                     <newline/>
                     <separator colspan="4"/>
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index 35ece1c0b02..d9f3934d9a4 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -30,19 +30,16 @@ class account_common_partner_report(osv.osv_memory):
                                               ('supplier','Payable Accounts'),
                                               ('customer_supplier' ,'Receivable and Payable Accounts')],
                                               "Partner's", required=True),
-        'target_move': fields.selection([('all', 'All Entries'),
-                                        ('posted', 'All Posted Entries')], 'Target Moves', required=True),
     }
 
     _defaults = {
         'result_selection': 'customer',
-        'target_move': 'all'
     }
 
     def pre_print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
-        data['form'].update(self.read(cr, uid, ids, ['result_selection', 'target_move'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['result_selection'])[0])
         return data
 
 account_common_partner_report()
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index 2b970b45f93..bf08dd806de 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -8,11 +8,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
+               <field name="target_move" position="after">
                     <field name="result_selection"/>
-                 <!--    <field name="initial_balance"/> -->
                     <field name="display_partner"/>
-                    <field name="target_move"/>
                     <newline/>
                </field>
             </field>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index f4cb72abe55..33f8e765387 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -8,9 +8,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
-               <field name="fiscalyear_id" position="after">
+               <field name="target_move" position="after">
                     <field name="result_selection"/>
-                    <field name="target_move"/>
                     <field name="initial_balance"/>
                     <field name="reconcil"/>
                     <field name="amount_currency"/>

From 3f5c0315a0774ab14213b9dd8679cd945508b55d Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 15:54:31 +0530
Subject: [PATCH 226/632] [MOD] hr : imprvements in onchange method

bzr revid: vir@tinyerp.com-20101004102431-mmmtnwlshcyrfilq
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 11ad7bb279b..03af527359d 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -135,7 +135,7 @@ class hr_employee(osv.osv):
         company_id = self.pool.get('res.company').browse(cr,uid,company)
         for address in company_id.partner_id.address:
             return {'value': {'address_id': address.id}}
-        return {'value':{}}
+        return {'value':{'address_id':False}}
 
     def onchange_department(self, cr, uid, ids, department_id, context=None):
         if not department_id:

From fc8f5385d627e82fbca9d27f60177952ea07c7f8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 16:02:32 +0530
Subject: [PATCH 227/632] [Fix] stock: Fix the buildbot-bug for stock_planing
 yml

bzr revid: sbh@tinyerp.com-20101004103232-1gsxkqkwjogm8df2
---
 addons/stock/product.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index bdaec60832e..e1d4c71b46c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -233,9 +233,11 @@ class product_product(osv.osv):
         to_date = context.get('to_date',False)
         date_str = False
         date_values = False
+        where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
         if from_date and to_date:
             date_str = "date>=%s and date<=%s"
-            date_values = [from_date, to_date]
+            where.append(tuple([from_date]))
+            where.append(tuple([to_date]))
         elif from_date:
             date_str = "date>=%s"
             date_values = [from_date] 
@@ -243,7 +245,7 @@ class product_product(osv.osv):
             date_str = "date<=%s"
             date_values = [to_date]
 
-        where = [tuple(location_ids),tuple(location_ids),tuple(ids),tuple(states)]
+       
         if date_values:
             where.append(tuple(date_values))
         if 'in' in what:

From 315e8acd928e2a9df1da8682b3cd141eee204f08 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 16:17:35 +0530
Subject: [PATCH 228/632] [MOD] hr_timesheet : employee timesheet report and
 wizard, instead of selecting user, from employee report is generated

bzr revid: vir@tinyerp.com-20101004104735-hlo0co1gt7z3rx7i
---
 addons/hr_timesheet/report/user_timesheet.py      |  4 ++--
 .../wizard/hr_timesheet_print_employee.py         | 15 +++++++++++----
 .../wizard/hr_timesheet_print_employee_view.xml   |  5 ++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index dc048748f46..93c425af995 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -63,7 +63,7 @@ class report_custom(report_rml):
             "and product_uom_id = unit.id "\
             "and line.user_id=%s and line.date >= %s and line.date < %s "
             "order by line.date",
-            (data['form']['user_id'], som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
+            (uid, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
 
         # Sum attendence by account, then by day
         accounts = {}
@@ -97,7 +97,7 @@ class report_custom(report_rml):
             account_xml.append('</account>')
 
         # Computing the employee
-        cr.execute("select name from res_users where id=%s", (data['form']['user_id'],))
+        cr.execute("select name from res_users where id=%s", (str(uid)))
         emp = cr.fetchone()[0]
 
         # Computing the xml
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 4bcdb614e2f..2983166ad56 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -21,6 +21,7 @@
 import datetime
 
 from osv import osv, fields
+from tools.translate import _
 
 class analytical_timesheet_employee(osv.osv_memory):
     _name = 'hr.analytical.timesheet.employee'
@@ -29,18 +30,24 @@ class analytical_timesheet_employee(osv.osv_memory):
         'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
-        'user_id': fields.many2one('res.users', 'User', required=True)
+        'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
+    
                 }
 
     def _get_user(self, cr, uid, context=None):
+
+        emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        return uid
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if not emp_id:
+            raise osv.except_osv(_("Warning"), _("No employee defined for this user"))
+        return emp_id and emp_id[0] or False
 
     _defaults = {
          'month': datetime.date.today().month,
          'year': datetime.date.today().year,
-         'user_id': _get_user
+         'employee_id': _get_user
              }
 
     def print_report(self, cr, uid, ids, context=None):
@@ -59,4 +66,4 @@ class analytical_timesheet_employee(osv.osv_memory):
             }
 analytical_timesheet_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 3b110b52f1d..63e493cfab7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,12 +8,11 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Employee Timesheet">
+				<form string="Monthly Employee Timesheet">
 					<group colspan="4">
-					<separator string="This wizard will print monthly timesheet of employee" colspan="4"/>
 						<field name="month"/>
 						<field name="year"/>
-						<field name="user_id" colspan="3"/>
+						<field name="employee_id" colspan="3"/>
 					</group>
 					<separator colspan="4"/>
                     <group colspan="4" col="6">

From 0f71e3f1004b80a4332234b066a94a7b406d15e8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 4 Oct 2010 16:28:37 +0530
Subject: [PATCH 229/632] [MOD/IMP] hr_* : usability improvement

bzr revid: dbr@tinyerp.com-20101004105837-4572nv8w947docei
---
 addons/hr_attendance/hr_attendance_view.xml   |  2 +-
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation.py         |  2 +-
 .../hr_holidays/report/available_holidays.py  |  6 +++++
 .../report/available_holidays_view.xml        | 26 ++++++++++++-------
 .../wizard/hr_holidays_summary_department.py  |  6 ++++-
 .../hr_holidays_summary_department_view.xml   | 18 ++++++-------
 7 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 9339bf72939..c49c25cd5fc 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -116,7 +116,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Time Tracking" />
+        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances" />
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ea8b2f4e79a..0f38a783d73 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -224,7 +224,7 @@
         </record>
 
         <record id="action_hr_contract" model="ir.actions.act_window">
-            <field name="name">Contract</field>
+            <field name="name">Contracts</field>
             <field name="res_model">hr.contract</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 263b34322b9..752028be527 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -33,7 +33,7 @@ class hr_evaluation_plan(osv.osv):
         'name': fields.char("Evaluation Plan", size=64, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
-        'month_first': fields.integer('First Evaluation After'),
+        'month_first': fields.integer('Next Evaluation After'),
         'month_next': fields.integer('After the Date of Start'),
         'active': fields.boolean('Active')
     }
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 8ab371c67d7..8d91e0d02e4 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -40,6 +40,12 @@ class available_holidays_report(osv.osv):
         'remaining_leave': fields.float('Remaining Leaves', readonly=True),
         'department_id': fields.many2one('hr.department', 'Department', readonly=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
+        'state': fields.selection([('draft', 'Draft'),
+                                   ('confirm', 'Waiting Validation'),
+                                   ('refuse', 'Refused'),
+                                   ('validate', 'Validated'),
+                                   ('cancel', 'Cancelled')]
+                                   ,'State', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'available_holidays_report')
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 372d9158599..b4cb2a99b7a 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -11,6 +11,7 @@
             <field name="arch" type="xml">
                <tree string="Available Holidays">
                     <field name="employee_id" invisible="1"/>
+					<field name="user_id" invisible="1"/>
                     <field name="category_id" invisible="1"/>
                     <field name="holiday_status_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -18,6 +19,7 @@
                     <field name="month" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="date" invisible="1"/>
+                    <field name="state" invisible="1"/>
                     <field name="max_leave" sum="Allocated Leaves"/>
                     <field name="taken_leaves" sum="Taken Leaves"/>
                     <field name="remaining_leave" sum="Remaining Leaves"/>
@@ -48,13 +50,11 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-		            	<filter icon="terp-go-year" string="This Year"
-			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-			                    help="Leaves in this year"/>
-		                <filter icon="terp-go-month" string="This Month" name="month"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this month"/>
-			            <filter icon="terp-go-week" string="    7 Days    " separator="1"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
+						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
+						<filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Available Leaves of current month"/>
+						<filter icon="terp-go-month" string="    Month-1    " separator="1" domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Available Leaves of last month"/>
+						<separator orientation="vertical"/>
+						<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"/>
 		                <separator orientation="vertical"/>
                     <field name="employee_id"/>
 		            </group>
@@ -65,13 +65,19 @@
 	                </group>
 	                <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                        <filter icon="terp-personal" string="Employee"
+						<filter icon="terp-personal" string="Employee"
                           name="user" context="{'group_by':'employee_id'}"
                           help="Leaves by employee"/>
-                        <separator orientation="vertical"/>
+						<filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+		                <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                       <separator orientation="vertical"/>
+                    	<filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
+                            help="Leaves by category"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
                         <separator orientation="vertical"/>
+                    	<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                   		<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 9a99d9eff63..d6a5fd1ecb9 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -29,8 +29,9 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _description = 'HR Holidays Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
+        'date_to': fields.date('To', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
+        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
     }
 
     _defaults = {
@@ -42,6 +43,8 @@ class hr_holidays_summary_dept(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
+        print context
+        print data
         if not data['depts']:
             raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again'))
         datas = {
@@ -49,6 +52,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
              'model': 'ir.ui.menu',
              'form': data
             }
+        print datas
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'holidays.summary',
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 01d3f4372ce..ca8e7e75dcf 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,16 +9,16 @@
             <field name="arch" type="xml">
 			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
-				    <field name="date_from"/>
+				    <field name="date_from" />
+				    <field name="date_to" />
 				    <newline/>
-				    <field name="holiday_type"/>
+				    <field name="holiday_type" colspan="4"/>
 				    <newline/>
-				    <field name="depts"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+				    <field name="depts" colspan="4"/>
+					<separator colspan="4"/>
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-print" name="print_report" string="Print" type="object"/>
 				</group>
 			</form>
             </field>
@@ -42,4 +42,4 @@
 	        icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>

From c791e55ef612f42c8a255623cd4fd0e683f89983 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 4 Oct 2010 16:43:44 +0530
Subject: [PATCH 230/632] [IMP] Account: Access rights for Analytic Account
 (Add analytic group on all modules) where this field appear

bzr revid: ara@tinyerp.com-20101004111344-8rx877ce28g5eigv
---
 addons/account/account_view.xml               |  4 +-
 .../report/account_analytic_entries_report.py |  2 +-
 .../account_analytic_entries_report_view.xml  |  8 +-
 .../account_analytic_default_view.xml         |  8 +-
 .../account_analytic_plans.py                 |  2 +-
 .../account_analytic_plans_view.xml           |  8 +-
 .../wizard/account_crossovered_analytic.py    |  2 +-
 .../account_crossovered_analytic_view.xml     |  2 +-
 addons/account_budget/account_budget.py       |  2 +-
 addons/account_budget/account_budget_view.xml | 14 ++--
 addons/auction/auction.py                     | 20 ++---
 addons/auction/auction_view.xml               |  2 +-
 addons/hr_expense/hr_expense_view.xml         | 14 ++--
 .../report/hr_expense_report_view.xml         |  8 +-
 addons/hr_payroll/hr_payroll_view.xml         |  6 +-
 .../wizard/hr_timesheet_sign_in_out.py        |  2 +-
 .../wizard/hr_timesheet_sign_in_out_view.xml  |  2 +-
 .../hr_timesheet_invoice_report_view.xml      | 74 +++++++++----------
 .../report/report_analytic_view.xml           | 20 ++---
 .../hr_timesheet_invoice_create_view.xml      |  2 +-
 .../hr_timesheet_sheet_view.xml               | 30 ++++----
 .../report/hr_timesheet_report_view.xml       | 12 +--
 .../report/timesheet_report_view.xml          |  6 +-
 addons/mrp/mrp_view.xml                       |  2 +-
 addons/project_planning/project_planning.py   |  4 +-
 .../project_planning_view.xml                 | 20 ++---
 addons/purchase/purchase_view.xml             | 10 +--
 addons/sale/report/sale_report_view.xml       |  8 +-
 addons/sale/sale_view.xml                     | 32 ++++----
 addons/sale_crm/wizard/crm_make_sale_view.xml |  2 +-
 30 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8fca640bdf7..bd07994bf29 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1568,7 +1568,7 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="account_id"/>
-                    <field name="analytic_account_id"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit"/>
                     <field name="credit"/>
@@ -1587,7 +1587,7 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="sequence"/>
                     <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    <field name="analytic_account_id"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit" select="1"/>
                     <field name="credit" select="1"/>
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index ec813b8ecd8..aa0c5b3ba99 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -38,7 +38,7 @@ class analytic_entries_report(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Account', required=False),
         'general_account_id': fields.many2one('account.account', 'General Account', required=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True),
         'move_id': fields.many2one('account.move.line', 'Move', required=True),
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index da08d56af0d..a131400948b 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -16,7 +16,7 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="currency_id" invisible="1"/>
-                <field name="account_id" invisible="1"/>
+                <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="general_account_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
@@ -49,7 +49,7 @@
                             help="Analytic Entries during last 7 days"/>
                     <separator orientation="vertical"/>
                     <field name="date" />
-                    <field name="account_id" />
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
                     <field name="user_id">
                     <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
@@ -63,7 +63,7 @@
                     <field name="journal_id" widget="selection"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
@@ -72,7 +72,7 @@
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                    <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                     <filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 95a39eb11e6..179c9da45ec 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="Analytic Defaults">
                     <field name="sequence"/>
-                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
+                    <field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -25,7 +25,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults">
-                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
+                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="sequence"/>
                     <separator string="Conditions" colspan="4"/>
                     <field name="product_id"/>
@@ -44,7 +44,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <field name="analytic_id"/>
+                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -68,7 +68,7 @@
             src_model="account.account"
             context="{'search_default_account_id': [active_id]}"
             />
-            
+
 
         <act_window
             name="Analytic Rules"
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 67640c98b99..d7b4532b6e8 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -64,7 +64,7 @@ class account_analytic_plan_line(osv.osv):
         'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
         'sequence':fields.integer('Sequence'),
-        'root_analytic_id': fields.many2one('account.analytic.account','Root Account',help="Root account of this plan.",required=True),
+        'root_analytic_id': fields.many2one('account.analytic.account','Root Account',help="Root account of this plan.",required=False),
         'min_required': fields.float('Minimum Allowed (%)'),
         'max_required': fields.float('Maximum Allowed (%)'),
     }
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index e732b483730..1b3a6c8987a 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -140,7 +140,7 @@
         <field name="arch" type="xml">
             <form string="Analytic Distribution Line">
                 <field name="plan_id"/>
-                <field name="analytic_account_id" groups="base.group_extended"/>
+                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="rate"/>
             </form>
         </field>
@@ -153,7 +153,7 @@
         <field name="arch" type="xml">
             <tree string="Analytic Distribution Lines">
                 <field name="plan_id" select="1"/>
-                <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                 <field name="rate"/>
             </tree>
         </field>
@@ -210,7 +210,7 @@
             <form string="Analytic Plan Line">
                 <field name="name"/>
                 <field name="sequence"/>
-                <field name="root_analytic_id"/>
+                <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
                 <newline/>
                 <field name="min_required"/>
                 <field name="max_required"/>
@@ -226,7 +226,7 @@
             <tree string="Analytic Plan Lines">
                 <field name="name" select="1"/>
                 <field name="sequence"/>
-                <field name="root_analytic_id"/>
+                <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
                 <field name="min_required"/>
                 <field name="max_required"/>
             </tree>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 2429650a800..97df80e23fc 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -30,7 +30,7 @@ class account_crossovered_analytic(osv.osv_memory):
         'date1': fields.date('Start Date', required=True),
         'date2': fields.date('End Date', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic Journal'),
-        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=True),
+        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=False),
         'empty_line': fields.boolean('Dont show empty lines'),
                 }
     _defaults = {
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index bdf915d9f98..6c496e18267 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -12,7 +12,7 @@
 				    <group col="4" colspan="6">
 					    <field name="date1"/>
 					    <field name="date2"/>
-					    <field name="ref"/>
+					    <field name="ref" groups="analytic.group_analytic_accounting"/>
 					    <field name="empty_line"/>
 					    <separator colspan="4" string="Analytic Journal"/>
 					    <field name="journal_ids" colspan="4" nolabel="1"/>
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 99c90badf60..74bc4dba3a2 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -238,7 +238,7 @@ class crossovered_budget_lines(osv.osv):
     _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=False),
         'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position',required=True),
         'date_from': fields.date('Start Date', required=True),
         'date_to': fields.date('End Date', required=True),
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 99083d097b6..d6c4b82e960 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -77,13 +77,13 @@
                         <page string="Budget Lines">
                             <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
                                 <graph type="bar" string="Lines">
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="planned_amount" operator="+"/>
                                     <field group="True" name="general_budget_id"/>
                                 </graph>
                                 <tree string="Budget Lines"  editable="top">
                                     <field name="crossovered_budget_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                                     <field name="date_from"/>
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
@@ -94,7 +94,7 @@
                                 </tree>
                                 <form string="Budget Lines">
                                     <field name="crossovered_budget_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                                     <field name="date_from"/>
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
@@ -125,7 +125,7 @@
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
                                 <tree string="Budget Lines">
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="general_budget_id"/>
                                     <field name="date_from"/>
                                     <field name="date_to"/>
@@ -136,7 +136,7 @@
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
-                                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                                     <field name="general_budget_id" select="1"/>
                                     <field name="date_from"/>
                                     <field name="date_to"/>
@@ -213,7 +213,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Budget Lines">
-                    <field name="analytic_account_id" groups="base.group_extended"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="general_budget_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
@@ -232,7 +232,7 @@
             <field name="arch" type="xml">
                 <form string="Budget Lines">
                     <field name="crossovered_budget_id"/>
-                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_budget_id" select="1"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 834e7e9b150..c5d1c0fa89f 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -64,7 +64,7 @@ class auction_dates(osv.osv):
         reads = self.read(cr, uid, ids, ['name', 'auction1'], context)
         name = [(r['id'], '['+r['auction1']+'] '+ r['name']) for r in reads]
         return name
-    
+
     def _get_invoice(self, cr, uid, ids, name, arg, context={}):
         lots_obj = self.pool.get('auction.lots')
         result = {}
@@ -100,7 +100,7 @@ class auction_dates(osv.osv):
         'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
         'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
                                   help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
-        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Buyer Invoice", type='many2many', multi=True),
         'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Seller Invoice", type='many2many', multi=True),
     }
@@ -621,14 +621,14 @@ class auction_lots(osv.osv):
                     taxes.append(lot.author_right.id)
 
                 inv_line= {
-                    'invoice_id': inv_id, 
-                    'quantity': 1, 
-                    'product_id': lot.product_id.id, 
-                    'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name, 
-                    'invoice_line_tax_id': [(6, 0, taxes)], 
-                    'account_analytic_id': lot.auction_id.account_analytic_id.id, 
-                    'account_id': lot.auction_id.acc_income.id, 
-                    'price_unit': lot.obj_price, 
+                    'invoice_id': inv_id,
+                    'quantity': 1,
+                    'product_id': lot.product_id.id,
+                    'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name,
+                    'invoice_line_tax_id': [(6, 0, taxes)],
+                    'account_analytic_id': lot.auction_id.account_analytic_id.id,
+                    'account_id': lot.auction_id.acc_income.id,
+                    'price_unit': lot.obj_price,
                 }
                 inv_line_obj.create(cr, uid, inv_line, context)
             inv_ref.button_compute(cr, uid, invoices.values())
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index c3068753a6e..3c8cb5c0278 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -134,7 +134,7 @@
 		                        <separator string="Analytic" colspan="4"/>
 		                        <field name="journal_id"/>
 		                        <field name="journal_seller_id"/>
-		                        <field name="account_analytic_id" groups="base.group_extended"/>
+		                        <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
 		                    </group>
                         </group>
                     </page>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 79c0d5513f0..41f87a991c3 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -13,7 +13,7 @@
                     <field name="date_value"/>
                     <field name="name"/>
                     <field name="ref"/>
-                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
+                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                     <field name="unit_amount"/>
                     <field name="unit_quantity"/>
                     <field name="total_amount"/>
@@ -30,8 +30,8 @@
                     <field name="employee_id"/>
                     <field name="user_id" invisible="1"/>
                     <field name="department_id" groups="base.group_extended"/>
-                    <field name="name"/> 
-                    <field name="date"/>                                       
+                    <field name="name"/>
+                    <field name="date"/>
                     <field name="ref"/>
                     <field name="amount"/>
                     <field name="state"/>
@@ -98,7 +98,7 @@
                             <group col="6" colspan="2">
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
                                 <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
-                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>                                                                
+                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
                                 <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
                                 <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
@@ -139,7 +139,7 @@
                       <filter icon="terp-check" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
                       <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>                        
+                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
@@ -151,8 +151,8 @@
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
-                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>                                    
-                    <separator orientation="vertical"/>                    
+                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0037831391a..9549e6df576 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -15,7 +15,7 @@
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="invoice_id" invisible="1"/>
-                <field name="analytic_account" invisible="1"/>
+                <field name="analytic_account" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
@@ -93,9 +93,9 @@
                 <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                 <separator orientation="vertical"/>
                 <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                <separator orientation="vertical"/>
-                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
-                <separator orientation="vertical"/>
+                <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+                <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                 <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 <separator orientation="vertical"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 468fa0cee98..ab9c16a45b5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -296,7 +296,7 @@
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="account_id" select="1" groups="base.group_extended"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                         <field name="company_id"/>
                     </group>
                     <notebook colspan="4">
@@ -361,7 +361,7 @@
                     <field name="amount_type"/>
                     <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
                     <field name="account_id"/>
-                    <field name="analytic_account_id" groups="base.group_extended"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 </tree>
             </field>
         </record>
@@ -389,7 +389,7 @@
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Accounting Informations"/>
                         <field name="account_id"/>
-                        <field name="analytic_account_id" groups="base.group_extended"/>
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                         <separator colspan="4" string="Company contribution"/>
                         <field name="company_contrib"/>
                     </group>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index b308aa69cc8..9b990556218 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -27,7 +27,7 @@ class hr_so_project(osv.osv_memory):
     _name = 'hr.sign.out.project'
     _description = 'Sign Out By Project'
     _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','=','normal')]),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('type','=','normal')]),
         'info': fields.char('Work Description', size=256, required=True),
         'date_start': fields.datetime('Starting Date', readonly=True),
         'date': fields.datetime('Closing Date'),
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 73c01c9c54f..99d9230a188 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -70,7 +70,7 @@
                         <field name="date_start"/>
                         <field name="server_date"/>
                         <separator string="Work done in the last period" colspan="4" />
-                        <field name="account_id" colspan="2"/>
+                        <field name="account_id" colspan="2" groups="analytic.group_analytic_accounting"/>
                         <field name="info" colspan="2"/>
                         <field name="date"/>
                         <label string="(Keep empty for current_time)" colspan="2"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index c0f82b0475b..33b92d09241 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -13,7 +13,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet Line" type="bar">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="quantity" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -33,7 +33,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="account_id" invisible="1"/>
+                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" invisible="1"/>
                     <field name="invoice_id" invisible="1"/>
                 </tree>
@@ -66,7 +66,7 @@
                               help="Non Assigned timesheets to users"
                               domain="[('user_id','=',False)]"/>
                       </field>
-                      <field name="account_id"/>
+                      <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
@@ -192,7 +192,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet by invoice">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="amount_invoice" operator="+"/>
                 </graph>
             </field>
@@ -204,7 +204,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by invoice">
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id" select="1"/>
                     <field name="user_id" select="1"/>
                 </form>
@@ -218,7 +218,7 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
                     <separator orientation="vertical"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id" select="1"/>
                     <field name="user_id" select="1"/>
                 </search>
@@ -232,7 +232,7 @@
             <field name="arch" type="xml">
                 <tree string="Timesheets to invoice">
                     <field name="user_id"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id"/>
                     <field name="quantity"/>
                     <field name="amount_invoice"/>
@@ -259,7 +259,7 @@
                 <tree string="Daily timesheet per account">
                     <field name="name"/>
                     <field name="month" select="1"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
                     <field name="quantity"/>
                 </tree>
@@ -271,7 +271,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Daily timesheet per account">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="quantity" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -286,7 +286,7 @@
                 <form string="Daily timesheet by account">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id" select="1"/>
                     <field name="quantity"/>
                 </form>
@@ -306,7 +306,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id" select="1"/>
                     </group>
                 </search>
@@ -332,7 +332,7 @@
                 <tree string="Timesheet per account">
                     <field name="name"/>
                     <field name="month" />
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
                     <field name="quantity"/>
                 </tree>
@@ -344,7 +344,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet per account">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="quantity" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -359,7 +359,7 @@
                 <form string="Timesheet by account">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id" select="1"/>
                     <field name="quantity"/>
                 </form>
@@ -379,7 +379,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id" select="1"/>
                     </group>
                 </form>
@@ -395,33 +395,33 @@
             <field name="search_view_id" ref="view_timesheet_account_search"/>
         </record>
 
-        <act_window 
+        <act_window
         context="{'search_default_user_id': [active_id]}"
-        id="act_res_users_2_report_timesheet_user" 
-        name="Timesheets per day" 
-        res_model="report_timesheet.user" 
-        src_model="res.users"/>
-        
-
-        <act_window 
-        context="{'search_default_user_id': [active_id]}"
-        id="act_res_users_2_report_timehsheet_account" 
-        name="Timesheets per account" 
-        res_model="report_timesheet.account" 
+        id="act_res_users_2_report_timesheet_user"
+        name="Timesheets per day"
+        res_model="report_timesheet.user"
         src_model="res.users"/>
 
-        <act_window 
+
+        <act_window
+        context="{'search_default_user_id': [active_id]}"
+        id="act_res_users_2_report_timehsheet_account"
+        name="Timesheets per account"
+        res_model="report_timesheet.account"
+        src_model="res.users"/>
+
+        <act_window
         context="{'search_default_account_id': [active_id]}"
-        id="act_account_analytic_account_2_report_timehsheet_account" 
-        name="Timesheets" 
-        res_model="report_timesheet.account" 
+        id="act_account_analytic_account_2_report_timehsheet_account"
+        name="Timesheets"
+        res_model="report_timesheet.account"
         src_model="account.analytic.account"/>
 
-        <act_window 
+        <act_window
         context="{'search_default_manager_id': [active_id]}"
-        id="act_res_users_2_report_timesheet_invoice" 
-        name="Costs to invoice" 
-        res_model="report_timesheet.invoice" 
+        id="act_res_users_2_report_timesheet_invoice"
+        name="Costs to invoice"
+        res_model="report_timesheet.invoice"
         src_model="res.users"/>
 
 
@@ -433,7 +433,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Random Timesheets">
-                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="name" select="1"/>
                     <field name="quantity" select="2" />
                     <field name="date" select="1"/>
@@ -486,7 +486,7 @@
                     <field name="name" select="1"/>
                     <field name="quantity" />
                     <field name="product_id" select="1"/>
-                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="uom_id" />
                     <field name="amount" />
                     <field name="to_invoice" select="1"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index f5573a394ef..6b06ce4fcde 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Expired analytic accounts">
-                    <field name="name" select="1"/>
+                    <field name="name" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id" select="1"/>
                     <field name="quantity" select="1"/>
                     <field name="state" select="1"/>
@@ -26,7 +26,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Expired analytic accounts">
-                    <field name="name"/>
+                    <field name="name" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="state"/>
                     <field name="quantity"/>
@@ -66,7 +66,7 @@
                 <form string="Analytic Lines to Invoice">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <newline/>
                     <field name="product_id" select="1"/>
                     <field name="product_uom_id"/>
@@ -86,7 +86,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="product_id"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="amount"/>
                     <field name="sale_price"/>
                     <field name="unit_amount"/>
@@ -120,7 +120,7 @@
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
                         <field name="product_id" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                    </group>
                </search>
             </field>
@@ -134,12 +134,12 @@
             <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
         </record>
 
-        <act_window 
+        <act_window
         domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
-        context="{'search_default_account_id': [active_id]}" 
-        id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" 
-        name="Lines to Invoice" 
-        res_model="account.analytic.line" 
+        context="{'search_default_account_id': [active_id]}"
+        id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
+        name="Lines to Invoice"
+        res_model="account.analytic.line"
         src_model="account.analytic.account"/>
 
     </data>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index d71b385c1f8..a0b20e5ff97 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -20,7 +20,7 @@
 				            <separator string="Force to use a specific product" colspan="4"/>
 				            <field name="product"/>
 				        </page>
-				        <page string="Filter on Accounts" groups="base.group_extended">
+				        <page string="Filter on Accounts" groups="analytic.group_analytic_accounting">
 				            <separator string="Choose accounts you want to invoice" colspan="4"/>
 				            <field name="accounts" colspan="4" nolabel="1"/>
 				        </page>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f078be2dbe1..42f09e22648 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -39,7 +39,7 @@
             <field name="arch" type="xml">
                 <form string="Timesheet by Accounts">
                     <field name="sheet_id" select="1"/>
-                    <field name="name" select="1" groups="base.group_extended"/>
+                    <field name="name" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="total" sum="Total"/>
                     <field name="invoice_rate"/>
                 </form>
@@ -53,7 +53,7 @@
             <field name="arch" type="xml">
                 <tree string="Timesheet by Accounts">
                     <field name="sheet_id"/>
-                    <field name="name" groups="base.group_extended"/>
+                    <field name="name" groups="analytic.group_analytic_accounting"/>
                     <field name="total" sum="Total"/>
                     <field name="invoice_rate"/>
                 </tree>
@@ -290,26 +290,26 @@
             </field>
         </record>
 
-        <act_window 
+        <act_window
         context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_by_day" 
-        name="Timesheet by Account" 
-        res_model="hr_timesheet_sheet.sheet.account" 
+        id="act_hr_timesheet_sheet_sheet_by_day"
+        name="Timesheet by Account"
+        res_model="hr_timesheet_sheet.sheet.account"
         src_model="hr_timesheet_sheet.sheet"/>
 
-        <act_window 
+        <act_window
         context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" 
-        name="Timesheet Lines" 
-        res_model="hr.analytic.timesheet" 
+        id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet"
+        name="Timesheet Lines"
+        res_model="hr.analytic.timesheet"
         src_model="hr_timesheet_sheet.sheet"/>
-        
 
-        <act_window 
+
+        <act_window
         context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_2_hr_attendance" 
-        name="Attendances" 
-        res_model="hr.attendance" 
+        id="act_hr_timesheet_sheet_sheet_2_hr_attendance"
+        name="Attendances"
+        res_model="hr.attendance"
         src_model="hr_timesheet_sheet.sheet"/>
 
         <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 9c0588f618e..05cba7f1e49 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -26,7 +26,7 @@
                     <field name="company_id" invisible="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
-                    <field name="account_id" invisible="1"/>
+                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_account_id" invisible="1"/>
 
                     <field name="quantity" sum="Hours"/>
@@ -54,8 +54,8 @@
                             domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet of last month"/>
                         <separator orientation="vertical"/>
-                            <field name="account_id"/>
-                            <field name="user_id" />
+                            <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                            <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -71,8 +71,8 @@
                     <group expand="1" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                        <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>
@@ -80,7 +80,7 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-                    
+
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 08abc6db63b..ce317f948e5 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -29,7 +29,7 @@
                     <field name="company_id" invisible="1"/>
                     <field name="to_invoice" invisible="1"/>
                     <field name="product_id" invisible="1"/>
-                    <field name="account_id" invisible="1"/>
+                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_account_id" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -71,7 +71,7 @@
                                     string="Done"
                                     domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
-                        <field name="account_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
                       <field name="user_id" />
                     </group>
                     <newline/>
@@ -97,7 +97,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 615b5cee009..39ecec5ad95 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -163,7 +163,7 @@
                                 <field name="time_stop" widget="float_time"/>
                             </group>
                         </page>
-                        <page string="Analytic Accounting" groups="base.group_extended">
+                        <page string="Analytic Accounting" groups="analytic.group_analytic_accounting">
                             <field name="costs_hour"/>
                             <field name="costs_hour_account_id"/>
                             <field name="costs_cycle"/>
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 729a8ee6bbb..cf22a90aceb 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -215,7 +215,7 @@ class report_account_analytic_planning_line(osv.osv):
         return result
 
     _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic account'),
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
         'user_id': fields.many2one('res.users', 'User'),
         'amount': fields.float('Quantity', required=True),
@@ -577,7 +577,7 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'user_id': fields.many2one('res.users', 'User'),
         'manager_id': fields.many2one('res.users', 'Manager'),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Account'),
         'sum_amount': fields.float('Planned Days', required=True),
         'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
         'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 9363413e4a2..ff354c69ccd 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -54,7 +54,7 @@
                         <field colspan="4" name="planning_account"
                                 nolabel="1" widget="one2many_list" readonly="1">
                             <tree string="Planning By Account (in Days)">
-                                <field name="account_id" groups="base.group_extended"/>
+                                <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                 <field name="tasks" sum="Total Remaining Tasks"/>
                                 <field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
                                 <field name="plan_open" sum="Total Time Allocation without Tasks"/>
@@ -68,7 +68,7 @@
                                 <tree editable="bottom"
                                     string="Planning Lines">
                                     <field name="user_id"/>
-                                    <field name="account_id" groups="base.group_extended"/>
+                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />
                                     <field name="task_ids" />
@@ -78,7 +78,7 @@
                                 </tree>
                                 <form string="Planning Lines">
                                     <field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
-                                    <field name="account_id" groups="base.group_extended"/>
+                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />
                                        <field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
@@ -180,7 +180,7 @@
                 <tree string="Planning Line">
                     <field name="planning_id"/>
                     <field name="user_id"/>
-                    <field name="account_id" groups="base.group_extended"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="amount" />
                     <field name="amount_unit" />
                     <field name="note" select="1"/>
@@ -197,7 +197,7 @@
                 <form string="Planning Line">
                     <field name="planning_id" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="account_id" select="1" groups="base.group_extended"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="amount" />
                     <field name="amount_unit" />
                     <separator string="Notes" colspan="4" />
@@ -233,7 +233,7 @@
                 <form string="Planning statistics">
                     <field name="planning_id" select="1" />
                     <field name="user_id" select="1" />
-                    <field name="account_id" select="1" groups="base.group_extended"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                 </form>
             </field>
         </record>
@@ -248,7 +248,7 @@
                     <field name="planning_id" />
                     <field name="user_id" />
                     <field name="manager_id" />
-                    <field name="account_id" groups="base.group_extended"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="sum_amount" />
                     <field name="sum_amount_real" />
                     <field name="sum_amount_tasks" />
@@ -262,7 +262,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Planning statistics" type="bar">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="sum_amount" operator="+" />
                     <field name="sum_amount_real" operator="+" />
                     <field name="sum_amount_tasks" operator="+" />
@@ -281,7 +281,7 @@
                         <separator orientation="vertical"/>
                         <field name="planning_id" select="1"/>
                         <field name="user_id" select="1"/>
-                        <field name="account_id" select="1" groups="base.group_extended"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     </group>
                 </search>
             </field>
@@ -324,7 +324,7 @@
                             <tree editable="bottom"
                                     string="Planning Lines">
                                     <field name="user_id"/>
-                                    <field name="account_id" groups="base.group_extended"/>
+                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />
                                     <field name="task_ids" />
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e151cdc56f9..c85088c9b53 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -190,7 +190,7 @@
                      <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                    
+
                 </group>
               </search>
             </field>
@@ -257,7 +257,7 @@
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
+                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
@@ -276,7 +276,7 @@
                         <page string="History" groups="base.group_extended">
                                <separator colspan="4" string="Stock Moves"/>
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>                        
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -319,7 +319,7 @@
                             <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
+                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
@@ -338,7 +338,7 @@
                         <page string="History" groups="base.group_extended">
                                <separator colspan="4" string="Stock Moves"/>
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>                        
+                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index b914e2b2d4b..aaf4cd3e69c 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -26,7 +26,7 @@
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
                 <field name="state" invisible="1"/>
-                <field name="analytic_account_id" invisible="1" groups="base.group_extended"/>
+                <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
             </tree>
         </field>
     </record>
@@ -101,9 +101,9 @@
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
-                    <separator orientation="vertical"/>
+                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
+                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index be0d254debd..db1818602ce 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -19,7 +19,7 @@
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
                     <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
-                    <field name="project_id" select="1"/>
+                    <field name="project_id" select="1" groups="analytic.group_analytic_accounting"/>
                 </form>
             </field>
         </record>
@@ -32,7 +32,7 @@
                     <field name="name"/>
                     <field name="warehouse_id"/>
                     <field name="pricelist_id"/>
-                    <field name="project_id"/>
+                    <field name="project_id" groups="analytic.group_analytic_accounting"/>
                 </tree>
             </field>
         </record>
@@ -115,7 +115,7 @@
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="project_id"
                                 context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
-                                groups="base.group_extended" domain="[('parent_id','!=',False)]" />
+                                groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
@@ -451,7 +451,7 @@ to your configuration: from the sales order, from the pickings, etc.
                         name="sale order"
                         help="Confirmed Sale Order Lines"
                         />
-                    <separator orientation="vertical"/>    
+                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
@@ -501,19 +501,19 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="filter" eval="True"/>
         </record>
 
-        <act_window 
-        context="{'search_default_partner_id': [active_id]}" 
-        id="act_res_partner_2_sale_order" 
-        name="Sales" 
-        res_model="sale.order" 
+        <act_window
+        context="{'search_default_partner_id': [active_id]}"
+        id="act_res_partner_2_sale_order"
+        name="Sales"
+        res_model="sale.order"
         src_model="res.partner"/>
 
-        <act_window 
-        context="{'search_default_product_id': [active_id]}" 
-        id="action_order_line_product_tree" 
-        name="Product sales" 
-        res_model="sale.order.line" 
-        src_model="product.product" 
+        <act_window
+        context="{'search_default_product_id': [active_id]}"
+        id="action_order_line_product_tree"
+        name="Product sales"
+        res_model="sale.order.line"
+        src_model="product.product"
         groups="base.group_extended"/>
 
         <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
@@ -549,7 +549,7 @@ to your configuration: from the sales order, from the pickings, etc.
                   <field name="step"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
-               
+
               </data>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index c6b589145c7..d6de441f582 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -13,7 +13,7 @@
                     <group colspan="4">
                         <field name="partner_id" required="1"/>
                         <field name="shop_id" required="1" widget="selection"/>
-                        <field name="analytic_account" domain="[('parent_id','!=',False)]" />
+                        <field name="analytic_account" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting" />
                         <field name="close" required="1"/>
                     	</group>
                             <field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">

From 12dad77b6ab2ad66fc6b63decc2dc21389146c91 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 4 Oct 2010 16:44:42 +0530
Subject: [PATCH 231/632] [MOD] usability improvement

bzr revid: amp@tinyerp.com-20101004111442-njhnokcljhulji4g
---
 addons/hr_evaluation/report/hr_evaluation_report_view.xml   | 3 ---
 addons/hr_holidays/wizard/hr_holidays_summary_department.py | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index f30e473d030..84ebf598e9d 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -22,7 +22,6 @@
                 <field name="progress_bar" widget="progressbar"/>
                 <field name="delay_date"/>
                 <field name="overpass_delay"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -77,8 +76,6 @@
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
                     <filter string="Appreciation" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
                     <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index d6a5fd1ecb9..a7c0d274194 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -43,8 +43,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
-        print context
-        print data
         if not data['depts']:
             raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again'))
         datas = {
@@ -52,7 +50,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
              'model': 'ir.ui.menu',
              'form': data
             }
-        print datas
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'holidays.summary',

From 3a03070a9e7eefeea7b5492cab84f59e9984dcd2 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 4 Oct 2010 16:48:01 +0530
Subject: [PATCH 232/632] [REM] Analytic: Remove access rights from analytic
 group

bzr revid: ara@tinyerp.com-20101004111801-o8dw16eiiprukkou
---
 addons/account/security/ir.model.access.csv  | 5 -----
 addons/analytic/security/ir.model.access.csv | 2 --
 2 files changed, 7 deletions(-)

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index f7b62aa164f..0402088a502 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -149,8 +149,3 @@
 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
-"access_account_analytic_journal_analytic_accounting","account.analytic.journal","model_account_analytic_journal","analytic.group_analytic_accounting",1,1,1,1
-"access_account_account_analytic_accounting","account.account","model_account_account","analytic.group_analytic_accounting",1,0,0,0
-"access_product_product_analytic_accounting","product.product","product.model_product_product","analytic.group_analytic_accounting",1,0,0,0
-"access_product_category_analytic_accounting","product.category","product.model_product_category","analytic.group_analytic_accounting",1,0,0,0
-"access_product_template_analytic_accounting","product.template","product.model_product_template","analytic.group_analytic_accounting",1,0,0,0
diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv
index 6be5774177c..0a6c192eb56 100644
--- a/addons/analytic/security/ir.model.access.csv
+++ b/addons/analytic/security/ir.model.access.csv
@@ -1,4 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_analytic_line_analytic_accounting","account.analytic.line","analytic.model_account_analytic_line","analytic.group_analytic_accounting",1,1,1,1
-"access_account_analytic_account_analytic_accounting","account.analytic.account","analytic.model_account_analytic_account","analytic.group_analytic_accounting",1,1,1,1
 

From 1a088c5b6187ea0746fde20983f2dac9d700345e Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Mon, 4 Oct 2010 17:01:09 +0530
Subject: [PATCH 233/632] [ADD] accounts: added account move target move in all
 related account reports.

bzr revid: vra@tinyerp.com-20101004113109-vca9ihk5d22hgl8m
---
 .../report/account_aged_partner_balance.py    |  1 +
 .../report/account_aged_partner_balance.rml   |  4 +-
 addons/account/report/account_balance.py      |  1 +
 addons/account/report/account_balance.rml     |  4 +-
 .../account/report/account_balance_sheet.py   |  2 +-
 .../account/report/account_balance_sheet.rml  |  4 +-
 .../account_balance_sheet_horizontal.rml      |  4 +-
 .../account/report/account_central_journal.py | 11 +++++-
 .../report/account_central_journal.rml        |  4 +-
 .../account/report/account_general_journal.py | 38 +++++++++++++------
 .../report/account_general_journal.rml        |  4 +-
 .../account/report/account_general_ledger.py  |  1 +
 .../account/report/account_general_ledger.rml |  4 +-
 .../account_general_ledger_landscape.rml      |  4 +-
 addons/account/report/account_journal.py      |  1 +
 addons/account/report/account_journal.rml     |  4 +-
 .../account/report/account_partner_balance.py |  1 +
 .../report/account_partner_balance.rml        |  4 +-
 .../account/report/account_partner_ledger.py  |  1 +
 .../account/report/account_partner_ledger.rml |  4 +-
 .../report/account_partner_ledger_other.rml   |  4 +-
 .../report/account_profit_horizontal.rml      |  4 +-
 addons/account/report/account_profit_loss.py  |  1 +
 addons/account/report/account_profit_loss.rml |  4 +-
 addons/account/report/common_report_header.py |  7 ++++
 25 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 21aa455b9c2..5a1b8ac868b 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -43,6 +43,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
             'get_partners':self._get_partners,
             'get_account': self._get_account,
             'get_fiscalyear': self._get_fiscalyear,
+            'get_target_move': self._get_target_move,
         })
 
     def set_context(self, objects, data, ids, report_type=None):
diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index 143fbe0133e..8b8336d1c06 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -132,7 +132,7 @@
           <para style="terp_tblheader_General_Centre">Analysis Direction</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Printing Date</para>
+          <para style="terp_tblheader_General_Centre">Target Moves</para>
         </td>
       </tr>
         <tr>
@@ -155,7 +155,7 @@
           <para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True)]]</para>
+          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
         </td>
       </tr>
       </blockTable>
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 5ada9adc4d8..236433819c5 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -47,6 +47,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
             'get_journal': self._get_journal,
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
+            'get_target_move': self._get_target_move,
         })
         self.context = context
 
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 45385827d96..277d568330c 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -223,7 +223,7 @@
           <para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and get_filter(data) ]]</font> </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Printing Date</para>
+          <para style="terp_tblheader_General_Centre">Target Moves</para>
         </td>
       </tr>
       <tr>
@@ -273,7 +273,7 @@
           </blockTable>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True)]]</para>
+          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 9f6b924f4e0..5b612a4af53 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -56,7 +56,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'get_company':self._get_company,
-
+            'get_target_move': self._get_target_move,
         })
         self.context = context
 
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 8887fa49808..076de7bdcd4 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -159,7 +159,7 @@
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font></para></td>
     <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
   <tr>
      <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -187,7 +187,7 @@
            </blockTable>
           </td>
     <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-    <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+    <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
   </tr>
   </blockTable>
       <para style="Standard">
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index a1f7b25d379..08b9030a968 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -158,7 +158,7 @@
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
     <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
   <tr>
      <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -186,7 +186,7 @@
            </blockTable>
           </td>
     <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-    <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+    <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
   </tr>
   </blockTable>
       <para style="Standard">
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index 36af31da363..bf5164253cc 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -48,12 +48,14 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'display_currency':self._display_currency,
+            'get_target_move': self._get_target_move,
         })
 
     def set_context(self, objects, data, ids, report_type=None):
         obj_move = self.pool.get('account.move.line')
         new_ids = ids
         self.query_get_clause = ''
+        self.target_move = data['form'].get('target_move', 'all')
         if (data['model'] == 'ir.ui.menu'):
             new_ids = 'active_ids' in data['form'] and data['form']['active_ids'] or []
             self.query_get_clause = 'AND '
@@ -66,7 +68,14 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         return super(journal_print, self).set_context(objects, data, ids, report_type=report_type)
 
     def lines(self, period_id, journal_id):
-        self.cr.execute('SELECT a.currency_id ,a.code, a.name, c.code AS currency_code,l.currency_id ,l.amount_currency ,SUM(debit) AS debit, SUM(credit) AS credit from account_move_line l LEFT JOIN account_account a ON (l.account_id=a.id)  LEFT JOIN res_currency c on (l.currency_id=c.id)WHERE l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.code , a.currency_id,l.currency_id', (period_id, journal_id))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+        self.cr.execute('SELECT a.currency_id ,a.code, a.name, c.code AS currency_code,l.currency_id ,l.amount_currency ,SUM(debit) AS debit, SUM(credit) AS credit  \
+                        from account_move_line l  \
+                        LEFT JOIN account_move am ON (l.move_id=am.id) \
+                        LEFT JOIN account_account a ON (l.account_id=a.id) \
+                        LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.code , a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):
diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 4bf23b3d4b6..1045470b2f2 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -240,7 +240,7 @@
 	        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
 			<td><para style="terp_tblheader_General_Centre">Journal</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Filter By  [[get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
-	        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+	        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
 	<tr>
 		<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -268,7 +268,7 @@
 	        	</tr>
         	 </blockTable>
         	</td>
-	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+	<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
 	</tr>
 	</blockTable>
     <para style="P9">
diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index e38f32ac217..e81bd994c0a 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -49,13 +49,15 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             'get_journal': self._get_journal,
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
-            'display_currency':self._display_currency
+            'display_currency':self._display_currency,
+            'get_target_move': self._get_target_move,
         })
 
     def set_context(self, objects, data, ids, report_type=None):
         obj_move = self.pool.get('account.move.line')
         new_ids = ids
         self.query_get_clause = ''
+        self.target_move = data['form'].get('target_move', 'all')
         if (data['model'] == 'ir.ui.menu'):
             new_ids = 'active_ids' in data['form'] and data['form']['active_ids'] or []
             self.query_get_clause = 'AND '
@@ -82,14 +84,18 @@ class journal_print(report_sxw.rml_parse, common_report_header):
     def lines(self, period_id):
         if not self.journal_ids:
             return []
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
         self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.code AS currency_code,l.currency_id , '
                         'SUM(l.debit) AS debit, SUM(l.credit) AS credit '
                         'FROM account_move_line l '
+                        'LEFT JOIN account_move am ON (l.move_id=am.id) '
                         'LEFT JOIN account_journal j ON (l.journal_id=j.id) '
                         'LEFT JOIN res_currency c on (l.currency_id=c.id)'
-                        'WHERE period_id=%s AND journal_id IN %s ' + self.query_get_clause + ' '
-                        'GROUP BY j.id, j.code, j.name, l.amount_currency,c.code, l.currency_id ',
-                        (period_id, tuple(self.journal_ids)))
+                        'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' '
+                        'GROUP BY j.id, j.code, j.name, l.amount_currency, c.code, l.currency_id ',
+                        (tuple(move_state), period_id, tuple(self.journal_ids)))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):
@@ -124,10 +130,14 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             journals = self.journal_ids
         if not journals:
             return 0.0
-        self.cr.execute('SELECT SUM(debit) FROM account_move_line l '
-                        'WHERE period_id=%s AND journal_id IN %s ' + self.query_get_clause + ' ' \
-                        'AND state<>\'draft\'',
-                        (period_id, tuple(journals)))
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
+        self.cr.execute('SELECT SUM(l.debit) FROM account_move_line l '
+                        'LEFT JOIN account_move am ON (l.move_id=am.id) '
+                        'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ' \
+                        'AND l.state<>\'draft\'',
+                        (tuple(move_state), period_id, tuple(journals)))
         return self.cr.fetchone()[0] or 0.0
 
     def _sum_credit_period(self, period_id, journal_id=None):
@@ -135,12 +145,16 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             journals = [journal_id]
         else:
             journals = self.journal_ids
+        move_state = ['draft','posted']
+        if self.target_move == 'posted':
+            move_state = ['posted']
         if not journals:
             return 0.0
-        self.cr.execute('SELECT SUM(credit) FROM account_move_line l '
-                        'WHERE period_id=%s AND journal_id IN %s '+ self.query_get_clause + ' ' \
-                        'AND state<>\'draft\'',
-                        (period_id, tuple(journals)))
+        self.cr.execute('SELECT SUM(l.credit) FROM account_move_line l '
+                        'LEFT JOIN account_move am ON (l.move_id=am.id) '
+                        'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s '+ self.query_get_clause + ' ' \
+                        'AND l.state<>\'draft\'',
+                        (tuple(move_state), period_id, tuple(journals)))
         return self.cr.fetchone()[0] or 0.0
 
 report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print, header='internal')
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 84a9ee6a780..489416adf76 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -226,7 +226,7 @@
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
     	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and  get_filter(data) ]]</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -254,7 +254,7 @@
 	        	</tr>
         	 </blockTable>
         	</td>
-		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+		<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
 	</tr>
 	</blockTable>
 
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 80a7ff44f0e..f3ec97a592e 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -87,6 +87,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             'get_sortby': self._get_sortby,
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
+            'get_target_move': self._get_target_move,
         })
         self.context = context
 
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 7ded26849bd..6ac6cd51286 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -196,7 +196,7 @@
     <td><para style="terp_tblheader_General_Centre">Display Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
   <tr>
      <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -226,7 +226,7 @@
            </blockTable>
           </td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-  <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+  <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
   </tr>
   </blockTable>
 
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 1321bdea750..ee3d5a349a9 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -199,7 +199,7 @@
     <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
   <tr>
      <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -230,7 +230,7 @@
            </blockTable>
           </td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-  <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+  <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
   </tr>
   </blockTable>
     <para style="terp_default_8">
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index ac41bf0b3fd..4f6ad99792d 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -49,6 +49,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             'get_end_date':self._get_end_date,
             'display_currency':self._display_currency,
             'get_sortby': self._get_sortby,
+            'get_target_move': self._get_target_move,
     })
 
     def set_context(self, objects, data, ids, report_type=None):
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 5b7ebf78766..ba343f389b9 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -208,7 +208,7 @@
 		<td><para style="terp_tblheader_General_Centre">Journal</para></td>
         <td><para style="terp_tblheader_General_Centre">Filters By </para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
@@ -237,7 +237,7 @@
         	 </blockTable>
         	</td>
         <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+	<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
 	</tr>
 	</blockTable>
     <para style="P9">
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index 7668a1ae2a6..06baa4639eb 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -49,6 +49,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
             'get_start_period': self.get_start_period,
             'get_end_period': self.get_end_period,
             'get_partners':self._get_partners,
+            'get_target_move': self._get_target_move,
         })
 
     def set_context(self, objects, data, ids, report_type=None):
diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index eee31e87d6c..19eef489507 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -189,7 +189,7 @@
        	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
 		<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Partner's</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
 	<tr>
        <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -219,7 +219,7 @@
         	 </blockTable>
         	</td>
 	<td> <para style="terp_default_Centre_9">[[ get_partners()  ]]</para></td>
-	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+	<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
 	</tr>
 	</blockTable>
 
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 6ce8813fabb..3317c26de57 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -53,6 +53,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             'get_intial_balance':self._get_intial_balance,
             'display_initial_balance':self._display_initial_balance,
             'display_currency':self._display_currency,
+            'get_target_move': self._get_target_move,
         })
 
     def set_context(self, objects, data, ids, report_type=None):
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 7de67780056..06c589d5569 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -230,7 +230,7 @@
 		<td><para style="terp_tblheader_General_Centre">Journal</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Partner's</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
@@ -259,7 +259,7 @@
         	 </blockTable>
         	</td>
 	<td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>
-	<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+	<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
 	</tr>
 	</blockTable>
      <para style="P4">
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 53cb0d46d83..f91f2ff41f5 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -368,7 +368,7 @@
                 <para style="P9">Partner's</para>
               </td>
               <td>
-                <para style="P9">Printing Date</para>
+                <para style="P9">Target Moves</para>
               </td>
             </tr>
             <tr>
@@ -421,7 +421,7 @@
                 <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
               </td>
               <td>
-                <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]]</para>
+                <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
               </td>
             </tr>
           </blockTable>
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index d55b2e93a43..8c66f223df9 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -156,7 +156,7 @@
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -184,7 +184,7 @@
         	 </blockTable>
         	</td>
 		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+		<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
 	</tr>
 	</blockTable>
         <para style="Standard">
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 6a6e0f3c2cc..84a7a4f8dbf 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -53,6 +53,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'get_company':self._get_company,
+            'get_target_move': self._get_target_move,
         })
         self.context = context
 
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 272945e658e..2d85dc590e6 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -157,7 +157,7 @@
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
@@ -185,7 +185,7 @@
         	 </blockTable>
         	</td>
 		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-		<td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]] </para></td>
+		<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
 	</tr>
 	</blockTable>
     <para style="Standard">
diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index 3bce3c10ed0..35d0c1356ef 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -60,6 +60,13 @@ class common_report_header(object):
             return data['form']['date_from']
         return ''
 
+    def _get_target_move(self, data):
+        if data.get('form', False) and data['form'].get('target_move', False):
+            if data['form']['target_move'] == 'all':
+                return 'All Entries'
+            return 'All Posted Entries'
+        return ''
+
     def _get_end_date(self, data):
         if data.get('form', False) and data['form'].get('date_to', False):
             return data['form']['date_to']

From 819ee1b9a112f0d6ae56179ab1845989fd5baf54 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 4 Oct 2010 17:16:01 +0530
Subject: [PATCH 234/632] [FIX] Account: move line query get

bzr revid: mra@mra-laptop-20101004114601-z0kjv5blmflm35c8
---
 addons/account/account_move_line.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 0a5a759d0f7..11f90061015 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -65,13 +65,13 @@ class account_move_line(osv.osv):
             if state.lower() not in ['all']:
                 where_move_state= " AND "+obj+".move_id in (select id from account_move where account_move.state = '"+state+"')"
 
-        if context.get('period_from', False) and context.get('periof_from', False) and not context.get('periods', False):
+        if context.get('period_from', False) and context.get('period_to', False) and not context.get('periods', False):
             if initial_bal:
-                period_company_id = period_obj.browse(cr, uid, data['form']['period_from'], context=context).company_id.id
-                first_period = self.pool.get('account.period').search(cr, uid, [('company_id', '=', period_company_id)], order='date_start', limit=1)[0]
-                context['periods'] = period_obj.build_ctx_periods(cr, uid, first_period, data['form']['period_from'])
+                period_company_id = fiscalperiod_obj.browse(cr, uid, context['period_from'], context=context).company_id.id
+                first_period = fiscalperiod_obj.search(cr, uid, [('company_id', '=', period_company_id)], order='date_start', limit=1)[0]
+                context['periods'] = fiscalperiod_obj.build_ctx_periods(cr, uid, first_period, context['period_from'])
             else:
-                context['periods'] = period_obj.build_ctx_periods(cr, uid, data['form']['period_from'], data['form']['period_to'])
+                context['periods'] = fiscalperiod_obj.build_ctx_periods(cr, uid, context['period_from'], context['period_to'])
 
         if context.get('periods', False):
             ids = ','.join([str(x) for x in context['periods']])

From afe202a227165b2728479cdf6269526a936ce139 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 17:30:12 +0530
Subject: [PATCH 235/632] [MOD] hr_timesheet : employees timesheet report and
 wizard, instead of selecting user, from employee report is generated

bzr revid: vir@tinyerp.com-20101004120012-rzi4tyn14ixw4aoe
---
 addons/hr_timesheet/report/users_timesheet.py          | 10 ++++++----
 addons/hr_timesheet/wizard/hr_timesheet_print_users.py |  4 ++--
 .../wizard/hr_timesheet_print_users_view.xml           |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 35c86fd08b9..5a52e9ce9c8 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -59,7 +59,7 @@ def emp_create_xml(cr, id, som, eom):
     time_xml = ([xml % (day, amount) for day, amount in month.iteritems()])
 
     # Computing the employee
-    cr.execute("select name from res_users where id=%s", (id,))
+    cr.execute("select name from resource_resource where id=%s", (id,))
     emp = cr.fetchone()[0]
 
     # Computing the xml
@@ -91,9 +91,11 @@ class report_custom(report_rml):
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
 
         emp_xml=''
-        for id in data['form']['user_ids']:
-            emp_xml += emp_create_xml(cr, id, som, eom)
-
+        emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')        
+        for id in data['form']['employee_ids']:
+            user = emp_obj.browse(cr, uid, id).user_id.id
+            if user:
+                emp_xml += emp_create_xml(cr, id, som, eom)
         # Computing the xml
         #Without this, report don't show non-ascii characters (TO CHECK)
         date_xml = '\n'.join(date_xml)
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 27533710f35..b0a0c3c0f05 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -30,7 +30,7 @@ class analytical_timesheet_employees(osv.osv_memory):
         'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
-        'user_ids': fields.many2many('res.users', 'timesheet_users_rel', 'timesheet_id', 'user_id', 'Users', required=True)
+        'employee_ids': fields.many2many('hr.employee', 'timesheet_employee_rel', 'timesheet_id', 'employee_id', 'employees', required=True)
                 }
 
     _defaults = {
@@ -55,4 +55,4 @@ class analytical_timesheet_employees(osv.osv_memory):
 
 analytical_timesheet_employees()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index d71946abfd9..95b7bd3b93e 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,16 +8,16 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Employees Timesheet">
+				<form string="Monthly Employees Timesheet">
 					<group height="260" width="460">
 						<group colspan="4">
-							<separator string="This wizard will print monthly timesheet of employees" colspan="4"/>
 							<field name="month"/>
 							<field name="year"/>
-							<field name="user_ids" colspan="4"/>
+                            <separator string="Employees" colspan="4"/>
+							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>
-						<group colspan="4" col="6">
+						<group colspan="4">
 							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
 							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
 						</group>

From f9c1a32a7084971927f006e2cab03f9a31af102e Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 4 Oct 2010 17:37:23 +0530
Subject: [PATCH 236/632] [MOD/IMP] hr_payroll : Improvementin yml

bzr revid: amp@tinyerp.com-20101004120723-1rm0krq66x65qf4w
---
 addons/hr_payroll/test/payslip.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index 705270d7c82..e8706aeee1f 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -2,6 +2,11 @@
   I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
 -
   I Create a bank record
+-
+  !record {model: res.bank, id: res_bank_0}:
+    name: Argenta
+-
+  I Create a bank record for a partner
 -
   !record {model: res.partner.bank, id: res_partner_bank_0}:
     acc_number: '987654321'
@@ -9,6 +14,7 @@
     sequence: 0.0
     name: Fortis
     state: bank
+    bank: res_bank_0
 -
   I create a new employee “Richard”
 -

From a5e8742e93df22b0be303d3e4903ea21c92ef3e9 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 4 Oct 2010 17:39:26 +0530
Subject: [PATCH 237/632] [IMP] hr_timesheet_invoice : improve in view for
 timesheet profit wizard

bzr revid: vir@tinyerp.com-20101004120926-hzv7cc00tb3l22q0
---
 .../wizard/hr_timesheet_analytic_profit_view.xml       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 87648a61642..7bdae9bee1d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Timesheet Profit">
-					<group height="340" width="480">
+					<group height="400" width="480">
 						<group col="4" colspan="6">
 							<field name="date_from"/>
 							<field name="date_to"/>
-							<field name="journal_ids" colspan="4"/>
-							<field name="employee_ids" colspan="4"/>
+                            <separator string="Journals" colspan="4"/>
+							<field name="journal_ids" colspan="4" nolabel="1"/>
+                            <separator string="Employees" colspan="4"/>
+							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>
 						<group col="2" colspan="4">
@@ -39,4 +41,4 @@
         	parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>

From 1711150d969c9e15cdb4440769e5c944a03444e0 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 4 Oct 2010 18:11:06 +0530
Subject: [PATCH 238/632] [MOD/IMP] hr_* : In HR all fields department
 prefiltered with user department filter

bzr revid: dbr@tinyerp.com-20101004124106-kqqnanm7cxdrmgj9
---
 addons/hr/hr_view.xml                         | 3 ++-
 addons/hr_expense/hr_expense_view.xml         | 2 +-
 addons/hr_holidays/hr_holidays_view.xml       | 5 +++--
 addons/hr_recruitment/hr_recruitment_menu.xml | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f3edf5ab4e2..ca9cd3bc158 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -145,6 +145,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="context">{"search_default_department_id": department_id}</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
@@ -395,7 +396,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_job_filter"/>
-            <field name="context">{'search_default_Current':1}</field>
+            <field name="context">{"search_default_Current":1,"search_default_department_id": department_id}</field>
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 11e88bf361c..0763d76d1b4 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -167,7 +167,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_user_id":uid,'search_default_this':1}</field>
+            <field name="context">{"search_default_user_id":uid,"search_default_department_id": department_id,"search_default_this":1}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
             <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 12d347cd876..ca3d940f858 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -269,6 +269,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
+            <field name="context">{"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
@@ -302,7 +303,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_user_id':uid,'type':'add'}</field>
+            <field name="context">{'search_default_user_id':uid,'type':'add',"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -330,7 +331,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'allocation_type':'company', 'report':True}</field>
+            <field name="context">{'allocation_type':'company', 'report':True,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 21f9074545a..7c158bb8795 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="view_id" ref="crm_case_tree_view_job"/>
-            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1}</field>
+            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
         </record>
 

From 0f3a822ce03817e8c9a7fdf24229156a6f1b5304 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Mon, 4 Oct 2010 18:28:11 +0530
Subject: [PATCH 239/632] [FIX] account: fixed balance sheet report total
 problem.

bzr revid: vra@tinyerp.com-20101004125811-i3fxe5flt1kj6tmv
---
 addons/account/report/account_balance_sheet.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 5b612a4af53..876d23901f4 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -62,7 +62,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
 
     def sum_dr(self):
         if self.res_bl['type'] == 'Net Profit':
-            self.result_sum_dr += self.res_bl['balance']
+            self.result_sum_dr += self.res_bl['balance']*-1
         return self.result_sum_dr
 
     def sum_cr(self):
@@ -127,9 +127,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
                         'balance':account.balance,
                     }
                     if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_dr += abs(account.debit - account.credit)
+                        self.result_sum_dr += account.balance
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_cr += abs(account.debit - account.credit)
+                        self.result_sum_cr += account.balance
                     if data['form']['display_account'] == 'bal_movement':
                         if account.credit > 0 or account.debit > 0 or account.balance > 0 :
                             accounts_temp.append(account_dict)

From 6fda5961668407082984d69bb6708a8068ba9025 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 18:51:32 +0530
Subject: [PATCH 240/632] [IMP] stock: Add the action for incoming and outgoing
 delay product

bzr revid: sbh@tinyerp.com-20101004132132-2ljae0lzcf6bvnz8
---
 addons/stock/board_warehouse_view.xml         | 21 +++++++++++++++++--
 .../stock/report/report_stock_move_view.xml   |  1 +
 addons/stock/stock_view.xml                   |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 04e4b592aef..1dae20ffec2 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -25,7 +25,23 @@
 			<field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>			
 			<field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
-
+        
+		<record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
+			<field name="res_model">report.stock.move</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+		    <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
+			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+         </record>
+		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
+			<field name="res_model">report.stock.move</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+		    <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
+			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+         </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
             <field name="model">board.board</field>
@@ -39,7 +55,8 @@
                         </child1>
 
                         <child2>
-						                        
+							<action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>						                              
+							<action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index df91f1f7737..a4c1e2a7c6b 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,6 +44,7 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
+             	 <field name="day" group="True"/>
                  <field name="product_id"/>
                  <field name="day_diff2" operator="+"/>
              </graph>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1a8a13c0f7b..ef046414bd6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1731,7 +1731,7 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel')" string="Moves">
+                <tree string="Moves">
                     <field name="picking_id" string="Reference"/>
                     <field name="partner_id" string="Partner"/>
                     <field name="product_id"/>

From 7ff12c07510712138a08a567869b9df2d0d8b914 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 4 Oct 2010 19:05:06 +0530
Subject: [PATCH 241/632] Improved PageCount for internal header

bzr revid: apa@tinyerp.com-20101004133506-9ixrru1nf2kdwl0k
---
 bin/addons/base/res/res_company.py    |  6 -----
 bin/report/render/rml2pdf/trml2pdf.py | 34 ++++++++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 6d78062a0e9..426731348f2 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -211,9 +211,6 @@ class res_company(osv.osv):
         <drawString x="25" y="725"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="490" y="725">[[ company.partner_id.name ]]</drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="1073" y="725"><pageNumber/>/</drawRightString>
-        <drawString x="1073" y="725"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>25 720 1085 720</lines>
     </pageGraphics>
@@ -231,9 +228,6 @@ class res_company(osv.osv):
         <drawString x="1.3cm" y="28.3cm"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]]  [[ time.strftime("%H:%M") ]]</drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm">[[ company.partner_id.name ]]</drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/>/</drawRightString>
-        <drawString x="19.7cm" y="28.3cm"><pageCount/></drawString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
         </pageGraphics>
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 5ec38a405df..abba6eacd13 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -40,37 +40,36 @@ from reportlab.lib.units import inch,cm,mm
 encoding = 'utf-8'
 
 class NumberedCanvas(canvas.Canvas):
-
     def __init__(self, *args, **kwargs):
         canvas.Canvas.__init__(self, *args, **kwargs)
         self._codes = []
         self._flag=False
         self._pageCount=0
-        self.i =0
-        self.k=0
+        self._currentPage =0
+        self._pageCounter=0
         self.pages={}
 
     def showPage(self):
-        self.i +=1
+        self._currentPage +=1
         if not self._flag:
            self._pageCount += 1
         else:
-            self.pages.update({self.i:self._pageCount})
+            self.pages.update({self._currentPage:self._pageCount})
         self._codes.append({'code': self._code, 'stack': self._codeStack})
         self._startPage()
         self._flag=False
 
     def pageCount(self):
-        if self.pages.get(self.k,False):
+        if self.pages.get(self._pageCounter,False):
             self._pageNumber=0
-        self.k +=1
-        key=self.k
+        self._pageCounter +=1
+        key=self._pageCounter
         if not self.pages.get(key,False):
             while not self.pages.get(key,False):
                 key = key + 1
-        self.setFont("Helvetica", 15)
-        self.drawRightString(200*mm, 20*mm,
-            "page %(this)i of %(total)i" % {
+        self.setFont("Helvetica", 8)
+        self.drawRightString((self._pagesize[0]-35), (self._pagesize[1]-40),
+            "%(this)i / %(total)i" % {
                'this': self._pageNumber+1,
                'total': self.pages.get(key,False),
             }
@@ -85,6 +84,7 @@ class NumberedCanvas(canvas.Canvas):
             self._codeStack = code['stack']
             self.pageCount()
             canvas.Canvas.showPage(self)
+#        self.restoreState()
         self._doc.SaveToFile(self._filename, self)
 
 class PageCount(platypus.Flowable):
@@ -452,6 +452,7 @@ class _rml_canvas(object):
             else:
                 args['height'] = sy * args['width'] / sx
         self.canvas.drawImage(img, **args)
+#        self.canvas._doc.SaveToFile(self.canvas._filename, self.canvas)
 
     def _path(self, node):
         self.path = self.canvas.beginPath()
@@ -832,6 +833,7 @@ class _rml_template(object):
         self.page_templates = []
         self.styles = doc.styles
         self.doc = doc
+        self.image=[]
         pts = node.findall('pageTemplate')
         for pt in pts:
             frames = []
@@ -846,6 +848,7 @@ class _rml_template(object):
             except Exception: # FIXME: be even more specific, perhaps?
                 gr=''
             if len(gr):
+                self.image=[ n for n in utils._child_get(gr[0], self) if n.tag=='image' or not self.localcontext]
                 drw = _rml_draw(self.localcontext,gr[0], self.doc, images=images, path=self.path, title=self.title)
                 self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) ))
             else:
@@ -860,15 +863,18 @@ class _rml_template(object):
         for node_story in node_stories:
             if story_cnt > 0:
                 fis.append(platypus.PageBreak())
-
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
-            self.doc_tmpl.afterFlowable(fis)
+            if not self.image:
+                self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())
-        self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
+        if not self.image:
+            self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
+        else:
+            self.doc_tmpl.build(fis)
 
 def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):
     node = etree.XML(rml)

From e1834aef40723c9f76a2d2ad0725f56bdb0f3332 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 4 Oct 2010 19:14:15 +0530
Subject: [PATCH 242/632] [Fix]: stock: fix the stock_demo data for yml test

bzr revid: sbh@tinyerp.com-20101004134415-o78uo0gcrjwdfn5e
---
 addons/stock/stock_demo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 91acb5c6406..1249317a2e4 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -274,6 +274,7 @@
             <field name="type">out</field>
             <field name="move_type">direct</field>
             <field name="invoice_state">2binvoiced</field>
+            <field name="address_id"  ref="base.main_address"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
     </data>

From a5c59a2f139c5de622cf82ad8bd777c96e5bc4ec Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 4 Oct 2010 19:16:58 +0530
Subject: [PATCH 243/632] [FIX] mrp: Fixed error on 'Change Qty' wizard when
 connected with different user.

bzr revid: uco@tinyerp.com-20101004134658-ozcgbr9kb4gkh20i
---
 addons/mrp/wizard/change_production_qty.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 5f7aa0754e1..f5d62d535c9 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -87,10 +87,10 @@ class change_production_qty(osv.osv_memory):
                 factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
                 res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
                 for r in res[0]:
-                    if r['product_id']== move.product_id.id:
-                        move_lines_obj.write(cr, uid,move.id, {'product_qty' :  r['product_qty']})
+                    if r['product_id'] == move.product_id.id:
+                        move_lines_obj.write(cr, uid, [move.id], {'product_qty' :  r['product_qty']})
             for m in prod.move_created_ids:
-                move_lines_obj.write(cr, uid,m.id, {'product_qty': wiz_qty.product_qty})
+                move_lines_obj.write(cr, uid, [m.id], {'product_qty': wiz_qty.product_qty})
     
         return {}
     

From 4ee3ea16c6f3b6c7265dc079e92f0e882df89252 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Mon, 4 Oct 2010 19:17:52 +0530
Subject: [PATCH 244/632] [IMP] mrp: Improved access rights and groups to
 menuitems.

bzr revid: uco@tinyerp.com-20101004134752-6fy8wuu2omc30vrt
---
 addons/mrp/report/mrp_report_view.xml   |  3 ++-
 addons/mrp/security/ir.model.access.csv | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 1bf82338cdd..dcb2bcb3566 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -101,7 +101,8 @@
             <field name="view_mode">graph,tree</field>
             <field name="help">Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).</field>
         </record>
-        <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="next_id_77"/>
+        <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" 
+                    parent="next_id_77" groups="mrp.group_mrp_manager"/>
 
 
 
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 79c5de9a505..e63ced14997 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -5,12 +5,14 @@
 "access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
 "access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
 "access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
+"access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
 "access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
 "access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
 "access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,1
 "access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
 "access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
 "access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
@@ -20,14 +22,15 @@
 "access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
 "access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,1,1,1
 "access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
-"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","base.group_system",1,1,1,1
+"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
 "access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
 "access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
 "access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
 "access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
-"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
-"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
-"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
+"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
+"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0
+"access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
 "access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
 "access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,1,1,1
 "access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,1,1,1
@@ -39,6 +42,7 @@
 "access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
 "access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
 "access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
+"access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
 "access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,1,1,0
 "access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,1,1,0
 "access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,1,1,0
@@ -55,7 +59,7 @@
 "access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
 "access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
 "access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
+"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
 "access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
 "access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
 "access_product_template_system","product.template mgr.system","product.model_product_template","base.group_system",1,0,0,0
@@ -87,6 +91,6 @@
 "access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
 "access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
 "access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
-"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,1,1,1
+"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0

From 85bb4e09bc8ebec89b98df32c090c4693a90ef5b Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Mon, 4 Oct 2010 15:55:30 +0200
Subject: [PATCH 245/632] [IMP] report engine: printscreen: total computation
 now uses digits attribute from field if present [FIX] report engine:
 printscreen: fixed wrong indentation

bzr revid: olt@tinyerp.com-20101004135530-lj37yioz8kcfk0xd
---
 bin/report/printscreen/ps_list.py | 33 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index aa95eedeff8..7fb20eab0dc 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -105,13 +105,13 @@ class report_printscreen_list(report_int):
                 dom = datas.get('_domain',[])
             get_groupby_data(self.groupby, dom)
         else:
-             rows = model.read(cr, uid, datas['ids'], result['fields'].keys(), context)
-             ids2 = map(itemgetter('id'), rows) # getting the ids from read result
-             if datas['ids'] != ids2: # sorted ids were not taken into consideration for print screen
-                 rows_new = []
-                 for id in datas['ids']:
-                     rows_new += [elem for elem in rows if elem['id'] == id]
-                 rows = rows_new
+            rows = model.read(cr, uid, datas['ids'], result['fields'].keys(), context)
+            ids2 = map(itemgetter('id'), rows) # getting the ids from read result
+            if datas['ids'] != ids2: # sorted ids were not taken into consideration for print screen
+                rows_new = []
+                for id in datas['ids']:
+                    rows_new += [elem for elem in rows if elem['id'] == id]
+                rows = rows_new
         res = self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model_desc)
         return (self.obj.get(), 'pdf')
 
@@ -232,7 +232,7 @@ class report_printscreen_list(report_int):
                 if line[f] != None:
                     col.text = tools.ustr(line[f] or '')
                     if float_flag:
-                       col.set('tree','float')
+                        col.set('tree','float')
                     if line.get('__no_leaf') and temp[count] == 1 and f != 'id' and not line['__context']['group_by']:
                         tsum[count] = float(tsum[count]) + float(line[f])
                     if not line.get('__group') and f != 'id' and temp[count] == 1:
@@ -240,19 +240,18 @@ class report_printscreen_list(report_int):
                 else:
                     col.text = '/'
 
-
-
         node_line = etree.SubElement(lines, 'row')
         for f in range(0, len(fields_order)):
             col = etree.SubElement(node_line, 'col', para='group', tree='no')
-            col.set('tree','float')
+            col.set('tree', 'float')
             if tsum[f] != None:
-               if tsum[f] >= 0.01 :
-                   prec = '%.2f'
-                   total = prec%(tsum[f])
-                   txt = str(total or '')
-               else:
-                   txt = str(tsum[f] or '')
+                if tsum[f] != 0.0:
+                    digits = fields[fields_order[f]].get('digits', (16, 2))
+                    prec = '%%.%sf' % (digits[1], )
+                    total = prec % (tsum[f], )
+                    txt = str(total or '')
+                else:
+                    txt = str(tsum[f] or '')
             else:
                 txt = '/'
             if f == 0:

From 73eb43a41fd8def132c99822c9069dd7937982e6 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 4 Oct 2010 19:27:12 +0530
Subject: [PATCH 246/632] [IMP] account:-improvements in the security access
 rights for the objects in Accounting/Configuration for user 'Manager'

bzr revid: mtr@mtr-20101004135712-5qmcsojwdsdv51p4
---
 addons/account/security/ir.model.access.csv | 34 +++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 0402088a502..56e75a3c036 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -20,14 +20,16 @@
 "access_account_tax","account.tax","model_account_tax","account.group_account_invoice",1,0,0,0
 "access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
 "access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
+"access_account_model_manager","account.model","model_account_model","account.group_account_manager",1,1,1,1
+"access_account_model_line_manager","account.model.line","model_account_model_line","account.group_account_manager",1,1,1,1
 "access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
 "access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
 "access_account_subscription_manager","account.subscription manager","model_account_subscription","account.group_account_manager",1,0,0,0
 "access_account_subscription_line_manager","account.subscription.line manager","model_account_subscription_line","account.group_account_manager",1,0,0,0
-"access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,0,0,0
-"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,0,0,0
+"access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
+"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
 "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
-"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,0,0,0
+"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
 "access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
@@ -41,22 +43,22 @@
 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
-"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,0,0,0
+"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
 "access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,0,0,0
-"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,0,0,0
-"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,0,0,0
-"access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,0,0,0
-"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,0,0,0
+"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
+"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
+"access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,1,1,1
+"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
 "access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,0,0,0
-"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,0,0,0
+"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
 "access_account_journal_invoice","account.journal invoice","model_account_journal","account.group_account_invoice",1,0,0,0
-"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,0,0,0
+"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
 "access_account_period_invoice","account.period invoice","model_account_period","account.group_account_invoice",1,0,0,0
-"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,0,0,0
+"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
 "access_account_invoice_group_invoice","account.invoice group invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,0,0,0
-"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,0,0,0
-"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,0,0,0
+"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","account.group_account_manager",1,1,1,1
+"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1
+"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
 "access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
 "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
 "access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
@@ -68,13 +70,13 @@
 "access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
 "access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
-"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,0,0,0
 "access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,0,0,0
 "access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
 "access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
 "access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
-"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,0,0,0
+"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","account.group_account_manager",1,1,1,1
 "access_account_fiscal_position_tax_template","account.fiscal.position.tax.template","model_account_fiscal_position_tax_template","account.group_account_manager",1,0,0,0
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,0,0,0
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1

From 4d406ba4748c4d84f2261f081595271ee065f7c3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:08:23 +0200
Subject: [PATCH 247/632] [FIX] base/res.groups: cleanup duplicate copy()
 method

bzr revid: odo@openerp.com-20101004140823-6a1rp4yq17csobas
---
 bin/addons/base/res/res_user.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 003571d3935..506538bd48b 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -47,7 +47,7 @@ class groups(osv.osv):
 
     def copy(self, cr, uid, id, default=None, context={}):
         group_name = self.read(cr, uid, [id], ['name'])[0]['name']
-        default.update({'name': group_name +' (copy)'})
+        default.update({'name': _('%s (copy)')%group_name})
         return super(groups, self).copy(cr, uid, id, default, context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -75,14 +75,6 @@ class groups(osv.osv):
                 aid.write({'groups_id': [(4, gid)]})
         return gid
 
-    def copy(self, cr, uid, id, default={}, context={}, done_list=[], local=False):
-        group = self.browse(cr, uid, id, context=context)
-        default = default.copy()
-        if not 'name' in default:
-            default['name'] = group['name']
-        default['name'] = default['name'] + _(' (copy)')
-        return super(groups, self).copy(cr, uid, id, default, context=context)
-
     def get_extended_interface_group(self, cr, uid, context=None):
         data_obj = self.pool.get('ir.model.data')
         extended_group_data_id = data_obj._get_id(cr, uid, 'base', 'group_extended')

From 5d7b8578290c4bc7b3f915d6b68dd31b7e4cd61c Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Mon, 4 Oct 2010 20:01:37 +0530
Subject: [PATCH 248/632] [FIX]: fix a problem of partner_id required partner
 on employee to maintain the accounting information

bzr revid: mga@tinyerp.com-20101004143137-7qs14p36olvkl05v
---
 addons/hr/hr.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9ce0b535401..d638f8191dd 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -113,11 +113,10 @@ class hr_employee(osv.osv):
         'identification_id': fields.char('Identification No', size=32),
         'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
         'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
-        'bank_account': fields.char('Bank Account', size=64),
-        'partner_id': fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
         'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
+        'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
         'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
         'work_location': fields.char('Office Location', size=32),

From cd527b6c9d3a7337ae689b54325a1bb574b3b285 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:33:36 +0200
Subject: [PATCH 249/632] [IMP] base: refactor/unify base module wizards

bzr revid: odo@openerp.com-20101004143336-nh0vnvbipt5dvmna
---
 .../module/wizard/base_export_language.py     | 13 +--
 .../wizard/base_export_language_view.xml      | 76 ++++++++---------
 .../module/wizard/base_import_language.py     |  2 +-
 .../wizard/base_import_language_view.xml      | 54 ++++++------
 .../module/wizard/base_language_install.py    | 36 +++-----
 .../wizard/base_language_install_view.xml     | 62 +++++++-------
 .../base/module/wizard/base_module_import.py  | 67 +++++----------
 .../module/wizard/base_module_import_view.xml | 80 +++++++++---------
 .../base/module/wizard/base_module_scan.py    |  5 +-
 .../base/module/wizard/base_module_update.py  | 82 ++++---------------
 .../module/wizard/base_module_update_view.xml | 72 ++++++++--------
 .../base/module/wizard/base_module_upgrade.py |  4 +-
 .../module/wizard/base_update_translations.py | 13 +--
 .../wizard/base_update_translations_view.xml  | 29 +++++--
 bin/addons/base/res/res_config.py             | 19 +----
 15 files changed, 259 insertions(+), 355 deletions(-)

diff --git a/bin/addons/base/module/wizard/base_export_language.py b/bin/addons/base/module/wizard/base_export_language.py
index ca2e3059cfb..1b43b561ac3 100644
--- a/bin/addons/base/module/wizard/base_export_language.py
+++ b/bin/addons/base/module/wizard/base_export_language.py
@@ -68,6 +68,7 @@ class base_language_export(osv.osv_memory):
         return self.write(cr, uid, ids, {'state':'get', 'data':out, 'advice':this.advice, 'name':this.name}, context=context)
 
     _name = "base.language.export"
+    _inherit = "ir.wizard.screen"
     _columns = {
             'name': fields.char('Filename', 16, readonly=True),
             'lang': fields.selection(_get_languages, 'Language', help='To export a new language, do not select a language.'), # not required: unset = new language
@@ -78,11 +79,11 @@ class base_language_export(osv.osv_memory):
             'state': fields.selection( ( ('choose','choose'),   # choose language
                                          ('get','get'),         # get the file
                                        ) ),
-            }
-    _defaults = { 'state': lambda *a: 'choose',
-                  'name': lambda *a: 'lang.tar.gz'
-                }
+    }
+    _defaults = { 
+        'state': lambda *a: 'choose',
+        'name': lambda *a: 'lang.tar.gz'
+    }
 base_language_export()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_export_language_view.xml b/bin/addons/base/module/wizard/base_export_language_view.xml
index 07c5a34f0da..c908c5ce03a 100644
--- a/bin/addons/base/module/wizard/base_export_language_view.xml
+++ b/bin/addons/base/module/wizard/base_export_language_view.xml
@@ -3,48 +3,50 @@
     <data>
 
         <record id="wizard_lang_export" model="ir.ui.view">
-            <field name="name">Export Translation</field>
+            <field name="name">Export Translations</field>
             <field name="model">base.language.export</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Export Translation">
-                  <group colspan="3">
-                      <group colspan="1">
-                            <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
-                            <label align="0.0" colspan="4" string=""/>
-                            <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
-                            <label align="0.0" colspan="4" string=""/>
-                            <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
-                            <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
-                       </group>
-                       <group colspan="1">
-                       <separator orientation="vertical" rowspan="15"/>
-                       </group>
-  				       <group colspan="1">
-                          <group colspan="4" states="choose">
-                              <separator colspan="4" string="Export Translation"/>
-                              <field name="lang" required="1"/>
-                              <field name="format" required="1"/>
-                              <field height="200" name="modules" nolabel="1" colspan="4"/>
-                              <field invisible="1" name="state"/>
-                          </group>
-                          <group colspan="4" states="get">
-                              <separator string="Export done" colspan="4"/>
-                              <field name="name" invisible="1" colspan="4"/>
-                              <field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
-                              <field height="80" name="advice" nolabel="1" colspan="4"/>
-                          </group>
-                           <separator string="" colspan="4"/>
-                    		<group colspan="2" col="2">
-                    		</group>
-                          <group col="2" colspan="2">
-                             <button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Close" type="object"/>
-                             <button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
-                             <button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="_Close" type="object"/>
-                          </group>
+                <form string="Export Translations">
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="OpenERP translations (core, modules, clients) are managed through Launchpad.net, our open source project management facility. We use their online interface to synchronize all translations efforts."/>
+                            <label colspan="4" width="220" string="To improve or expand the official translations, you should use directly Lauchpad's web interface (Rosetta). If you need to perform mass translation, Launchpad also allows uploading full .po files at once"/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="To browse official translations, you can start with these links:"/>
+                            <label colspan="4" width="220" string="https://help.launchpad.net/Translations"/>
+                            <label colspan="4" width="220" string="https://translations.launchpad.net/openobject"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4">
+                            <group colspan="4" states="choose">
+                                <separator colspan="4" string="Export Translation"/>
+                                <field name="lang"/>
+                                <field name="format" required="1"/>
+                                <field height="200" name="modules" nolabel="1" colspan="4"/>
+                                <field invisible="1" name="state"/>
+                            </group>
+                            <group colspan="4" states="get">
+                                <separator string="Export done" colspan="4"/>
+                                <field name="name" invisible="1" colspan="4"/>
+                                <field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
+                                <field height="80" name="advice" nolabel="1" colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="choose">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object"/>
+                            <button icon="gtk-ok" name="act_getfile" string="_Export" type="object"/>
+                        </group>
+                        <group colspan="8" col="8" states="get">
+                            <separator string="" colspan="8"/>
+                            <label colspan="7" width="220"/>
+                            <button icon="gtk-close" name="act_destroy" special="cancel" string="_Close" type="object"/>
                         </group>
                     </group>
-
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/module/wizard/base_import_language.py b/bin/addons/base/module/wizard/base_import_language.py
index ca45c0a6c1c..6608ade03ef 100644
--- a/bin/addons/base/module/wizard/base_import_language.py
+++ b/bin/addons/base/module/wizard/base_import_language.py
@@ -21,7 +21,6 @@
 
 import tools
 import base64
-import pooler
 from tempfile import TemporaryFile
 from osv import osv, fields
 
@@ -30,6 +29,7 @@ class base_language_import(osv.osv_memory):
 
     _name = "base.language.import"
     _description = "Language Import"
+    _inherit = "ir.wizard.screen"
 
     _columns = {
         'name': fields.char('Language Name',size=64 , required=True),
diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/bin/addons/base/module/wizard/base_import_language_view.xml
index 70a48850448..c7cdac663b5 100644
--- a/bin/addons/base/module/wizard/base_import_language_view.xml
+++ b/bin/addons/base/module/wizard/base_import_language_view.xml
@@ -7,35 +7,33 @@
             <field name="model">base.language.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import Language">
-            <group colspan="3">
-                 <group colspan="1">
-                      <label string="You have to import a .CSV file which is encoded in UTF-8."/>
-                      <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
-                      <label string="type,name,res_id,src,value" colspan="4"/>
-                      <label string="module,type,name,res_id,src,value" colspan="4"/>
-                      <label string="You can also import .po files." colspan="4" align="0.0"/>
-                 </group>
-                 <group colspan="1">
-                      <separator orientation="vertical" rowspan="8"/>
-                 </group>
-                 <group colspan="1">
-                    <group colspan="4" col="4">
-                        <separator string="Import Translation" colspan="4"/>
-                        <field name="name" width="200"/>
-                        <field name="code"/>
-                        <field name="data" colspan="4"/>
+                <form string="Import Translation">
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="Supported file formats: *.csv (Comma-separated values) or *.po (GetText Portable Objects)"/>
+                            <label colspan="4" width="220" string="Please double-check that the file encoding is set to UTF-8 (sometimes called Unicode) when the translator exports it."/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="When using CSV format, please also check that the first line of your file is one of the following:"/>
+                            <label colspan="4" width="220" string="- type,name,res_id,src,value"/>
+                            <label colspan="4" width="220" string="- module,type,name,res_id,src,value"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4" col="4">
+                            <separator string="Import Translation" colspan="4"/>
+                            <field name="name" width="200"/>
+                            <field name="code"/>
+                            <field name="data" colspan="4"/>
+                        </group>
+                        <group colspan="8" col="8">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                                <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                                <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
+                        </group>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="2" col="2">
-                    </group>
-                    <group colspan="2" col="2">
-                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
-                        <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
-                    </group>
-                </group>
-			</group>
-            </form>
+                </form>
             </field>
         </record>
 
diff --git a/bin/addons/base/module/wizard/base_language_install.py b/bin/addons/base/module/wizard/base_language_install.py
index 140cc4cc033..7a3b8cc75aa 100644
--- a/bin/addons/base/module/wizard/base_language_install.py
+++ b/bin/addons/base/module/wizard/base_language_install.py
@@ -20,17 +20,22 @@
 ##############################################################################
 
 import tools
-import pooler
 from osv import osv, fields
 
 class base_language_install(osv.osv_memory):
     """ Install Language"""
 
     _name = "base.language.install"
+    _inherit = "ir.wizard.screen"
     _description = "Install Language"
 
     _columns = {
-        'lang': fields.selection(tools.scan_languages(),'Language'),
+        'lang': fields.selection(tools.scan_languages(),'Language', required=True),
+        'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
+    }
+
+    _defaults = {  
+        'state': 'init',
     }
 
     def lang_install(self, cr, uid, ids, context):
@@ -40,30 +45,9 @@ class base_language_install(osv.osv_memory):
             modobj = self.pool.get('ir.module.module')
             mids = modobj.search(cr, uid, [('state', '=', 'installed')])
             modobj.update_translations(cr, uid, mids, lang)
-
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_language_install_msg')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.import.msg',
-            'views': [(id2, 'form')],
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
+            self.write(cr, uid, ids, {'state': 'done'}, context=context)
+        return False
 
 base_language_install()
 
-class base_language_install_msg(osv.osv_memory):
-    """ Install Language"""
-
-    _name = "base.language.install.msg"
-    _description = "Install Language"
-
-base_language_install_msg()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_language_install_view.xml b/bin/addons/base/module/wizard/base_language_install_view.xml
index 3d9f4eabe3b..38edf4d4a82 100644
--- a/bin/addons/base/module/wizard/base_language_install_view.xml
+++ b/bin/addons/base/module/wizard/base_language_install_view.xml
@@ -8,13 +8,38 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Load Official Translation">
-                    <separator string="Load an Official Translation" colspan="4"/>
-                    <group colspan="4"><field name="lang"/></group>
-                    <label string="" colspan="4"/>
-                    <label string="Please be patient, as this operation may take a few minutes..." colspan="4"/>
-                    <separator string="" colspan="4"/>
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="lang_install" string="Load" type="object" icon="gtk-ok"/>
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="This wizard helps you add a new language to your OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
+                            <field name="state" invisible="1"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Load Official Translation" colspan="4"/>
+                            <group states="init" colspan="4">
+                                <field name="lang" colspan="4"/>
+                            </group>
+                            <group states="done" colspan="4">
+                                <label string="The selected language has been successfully installed.
+You must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="lang_install" string="Load" type="object" icon="gtk-ok"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="7" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                        </group>
+                    </group>
                 </form>
            </field>
         </record>
@@ -33,29 +58,6 @@
         action="action_view_base_language_install"
         id="menu_view_base_language_install"
         parent="menu_translation" sequence="2"/>
-
-        <record id="view_base_language_install_msg" model="ir.ui.view">
-            <field name="name">Official Translation Loaded</field>
-            <field name="model">base.module.import.msg</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Official Translation Loaded">
-                <separator string="Official Translation Loaded" colspan="4"/>
-                <label string="The selected language has been successfully installed.\nYou must change the preferences of the user and open a new menu to view the changes." colspan="4"/>
-                <separator string="" colspan="4"/>
-                <button special="cancel" string="OK" icon="gtk-ok"/>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_view_base_language_install_msg" model="ir.actions.act_window">
-            <field name="name">Official Translation Loaded</field>
-            <field name="res_model">base.module.import.msg</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_language_install"/>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>
 
diff --git a/bin/addons/base/module/wizard/base_module_import.py b/bin/addons/base/module/wizard/base_module_import.py
index 990a77ce8cd..68822690f45 100644
--- a/bin/addons/base/module/wizard/base_module_import.py
+++ b/bin/addons/base/module/wizard/base_module_import.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-
-import pooler
 import os
 import tools
 
@@ -34,19 +32,24 @@ class base_module_import(osv.osv_memory):
     """ Import Module """
 
     _name = "base.module.import"
+    _inherit = "ir.wizard.screen"
     _description = "Import Module"
 
     _columns = {
           'module_file': fields.binary('Module .ZIP file', required=True),
+          'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
+          'module_name': fields.char('Module Name', size=128),
+    }
+
+    _defaults = {  
+        'state': 'init',
     }
 
     def importzip(self, cr, uid, ids, context):
-        module_obj= self.pool.get('ir.module.module')
-        active_ids = context and context.get('active_ids', False)
-        data = self.browse(cr, uid, ids , context=context)[0]
+        (data,) = self.browse(cr, uid, ids , context=context)
         module_data = data.module_file
 
-        val =base64.decodestring(module_data)
+        val = base64.decodestring(module_data)
         fp = StringIO()
         fp.write(val)
         fdata = zipfile.ZipFile(fp, 'r')
@@ -55,62 +58,30 @@ class base_module_import(osv.osv_memory):
 
         ad = tools.config['addons_path']
 
-        fname = os.path.join(ad,module_name+'.zip')
+        fname = os.path.join(ad, module_name+'.zip')
         try:
             fp = file(fname, 'wb')
             fp.write(val)
             fp.close()
-        except IOError, e:
+        except IOError:
             raise osv.except_osv(_('Error !'), _('Can not create the module file: %s !') % (fname,) )
 
-        module_obj.update_list(cr, uid,{'module_name': module_name,})
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_import_msg')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-        module_name = module_obj.browse(cr, uid, ids, context=context)
-        return {
-            'domain': str([('name', '=', module_name)]),
-            'name': 'Message',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.import.msg',
-            'views': [(id2, 'form')],
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-
-base_module_import()
-
-class base_module_import_msg(osv.osv_memory):
-    """   message    """
-    _name = "base.module.import.msg"
-    _description = "Message"
+        self.pool.get('ir.module.module').update_list(cr, uid, {'module_name': module_name,})
+        self.write(cr, uid, ids, {'state':'done', 'module_name': module_name}, context)
+        return False
 
     def action_module_open(self, cr, uid, ids, context):
-        module_obj = self.pool.get('base.module.import')
-        data = module_obj.browse(cr, uid, ids , context=context)[0]
-        module_data = data.module_file
-
-        val =base64.decodestring(module_data)
-        fp = StringIO()
-        fp.write(val)
-        fdata = zipfile.ZipFile(fp, 'r')
-        fname = fdata.namelist()[0]
-        module_name = os.path.split(fname)[0]
-
+        (data,) = self.browse(cr, uid, ids , context=context)
         return {
-            'domain': str([('name', '=', module_name)]),
-            'name': 'Module List',
+            'domain': str([('name', '=', data.module_name)]),
+            'name': 'Modules',
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'ir.module.module',
             'type': 'ir.actions.act_window',
         }
 
-base_module_import_msg()
+base_module_import()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index 9d1aa1bce49..b04bc050e97 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -7,17 +7,41 @@
             <field name="model">base.module.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import module">
-            <separator string="Module Import" colspan="4"/>
-            <label string="Please give your module .ZIP file to import." colspan="4"/>
-            <field name="module_file"/>
-            <separator string="" colspan="4" />
-            <newline/>
-            <group colspan="6" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="importzip" string="Import module" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
+                <form string="Import module">
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="This wizard helps you add a new language to you OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
+                            <field name="state" invisible="1"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Module Import" colspan="4"/>
+                            <group states="init" colspan="4" col="4">
+                                <label string="Select module package to import (.zip file):" colspan="4"/>
+                                <field name="module_file" colspan="4"/>
+                            </group>
+                            <group states="done" colspan="4" col="4">
+                                <label string="Module file successfully imported!" colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="importzip" string="Import module" type="object" icon="gtk-apply"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                            <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
+                        </group>
+                    </group>
+                </form>
             </field>
         </record>
 
@@ -31,36 +55,12 @@
         </record>
 
         <menuitem
-        name="Import Module"
-        action="action_view_base_module_import"
-        id="menu_view_base_module_import"
-       parent="menu_management"
-       sequence="1"/>
+            name="Import Module"
+            action="action_view_base_module_import"
+            id="menu_view_base_module_import"
+            parent="menu_management"
+            sequence="1"/>
 
-        <record id="view_base_module_import_msg" model="ir.ui.view">
-            <field name="name">Module Import Message</field>
-            <field name="model">base.module.import.msg</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Message">
-            <label string="Module successfully imported !"/>
-            <separator string="" colspan="4"/>
-            <newline/>
-            <group>
-            <button name="action_module_open" string="Cancel" type="object" icon="gtk-cancel"/>
-            </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_view_base_module_import_msg" model="ir.actions.act_window">
-            <field name="name">Module Import Message</field>
-            <field name="res_model">base.module.import.msg</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_module_import"/>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>
 
diff --git a/bin/addons/base/module/wizard/base_module_scan.py b/bin/addons/base/module/wizard/base_module_scan.py
index cd8d4ab7ec5..d47e091955f 100644
--- a/bin/addons/base/module/wizard/base_module_scan.py
+++ b/bin/addons/base/module/wizard/base_module_scan.py
@@ -19,16 +19,13 @@
 #
 ##############################################################################
 import os
-import re
 import glob
-import time
 import imp
 
 import tools
-import pooler
 
 import zipfile
-from osv import osv, fields
+from osv import osv
 
 class base_module_scan(osv.osv_memory):
     """ scan module """
diff --git a/bin/addons/base/module/wizard/base_module_update.py b/bin/addons/base/module/wizard/base_module_update.py
index eea5f5aaee4..a0d21840d90 100644
--- a/bin/addons/base/module/wizard/base_module_update.py
+++ b/bin/addons/base/module/wizard/base_module_update.py
@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import netsvc
-import pooler
 from osv import osv, fields
 
 class base_module_update(osv.osv_memory):
@@ -27,69 +25,25 @@ class base_module_update(osv.osv_memory):
 
     _name = "base.module.update"
     _description = "Update Module"
-
-    def update_module(self, cr, uid, ids, context):
-        """
-           Update Module
-
-            @param cr: the current row, from the database cursor.
-            @param uid: the current user’s ID for security checks.
-            @param ids: the ID or list of IDs
-            @param context: A standard dictionary
-        """
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_update_open')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.update.open',
-            'views': [(id2, 'form')],
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-
-        }
-
-base_module_update()
-
-class base_module_update_open(osv.osv_memory):
-    """ Update Module Open """
-
-    _name = "base.module.update.open"
-    _description = "Update Module Open"
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-        @return : default values of fields.
-        """
-
-        module_obj = self.pool.get('ir.module.module')
-        update, add = module_obj.update_list(cr, uid,)
-        return {'update': update, 'add': add}
+    _inherit = "ir.wizard.screen"
 
     _columns = {
-          'update': fields.integer('Number of modules updated', readonly=True),
-          'add': fields.integer('Number of modules added', readonly=True),
+        'update': fields.integer('Number of modules updated', readonly=True),
+        'add': fields.integer('Number of modules added', readonly=True),
+        'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
     }
 
-    def action_module_open(self, cr, uid, ids, context):
-        """
-           Update Module List Open
+    _defaults = {  
+        'state': 'init',
+    }
 
-            @param cr: the current row, from the database cursor.
-            @param uid: the current user’s ID for security checks.
-            @param ids: the ID or list of IDs
-            @param context: A standard dictionary
-        """
+    def update_module(self, cr, uid, ids, context=None):
+        module_obj = self.pool.get('ir.module.module')
+        update, add = module_obj.update_list(cr, uid,)
+        self.write(cr, uid, ids, {'update': update, 'add': add, 'state': 'done'}, context=context)
+        return False
+
+    def action_module_open(self, cr, uid, ids, context):
         res = {
             'domain': str([]),
             'name': 'Modules',
@@ -99,13 +53,9 @@ class base_module_update_open(osv.osv_memory):
             'view_id': False,
             'type': 'ir.actions.act_window',
         }
-        view_obj = self.pool.get('ir.ui.view')
-        search_view_id = view_obj.search(cr, uid, [('name','=','ir.module.module.list.select')], context=context)
-        if search_view_id:
-            res.update({'search_view_id' : search_view_id[0]})
         return res
 
-base_module_update_open()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+base_module_update()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_module_update_view.xml b/bin/addons/base/module/wizard/base_module_update_view.xml
index 9091b5a1b9d..21bff3fb935 100644
--- a/bin/addons/base/module/wizard/base_module_update_view.xml
+++ b/bin/addons/base/module/wizard/base_module_update_view.xml
@@ -7,15 +7,41 @@
             <field name="model">base.module.update</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Scan for new modules">
-           <label string="This wizard will scan all module repositories (on the server side) to detect any new or updated modules. Please be patient as this operation may take a few seconds..." colspan="4" align="0.0"/>
-            <separator string="" colspan="4" />
-            <newline/>
-            <group colspan="6" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="update_module" string="Check new modules" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
+                <form string="Update Module List">
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="This wizard will scan all module repositories on the server side to detect newly added modules as well as any change to existing modules."/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="Please be patient, as this operation may take a few seconds..."/>
+                            <field name="state" invisible="1"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Module update result" colspan="4"/>
+                            <group states="init" colspan="4">
+                                <label string="Click on Update below to start the process..." colspan="4"/>
+                            </group>
+                            <group states="done" colspan="4">
+                                <field name="update" colspan="4"/>
+                                <field name="add" colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="update_module" string="Update" type="object" icon="gtk-ok"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                            <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
+                        </group>
+                    </group>
+                </form>
             </field>
         </record>
 
@@ -36,33 +62,5 @@
        sequence="2"
        icon="STOCK_CONVERT"/>
 
-       <record id="view_base_module_update_open" model="ir.ui.view">
-            <field name="name">Update ModuleList</field>
-            <field name="model">base.module.update.open</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="New modules">
-            <field name="update" colspan="4"/>
-            <field name="add" colspan="4"/>
-            <separator string="" colspan="4" />
-            <newline/>
-            <group colspan="6" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="action_module_open" string="OK" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
-            </field>
-        </record>
-
-          <record id="action_view_base_module_update_open" model="ir.actions.act_window">
-            <field name="name">Update ModuleList</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base.module.update.open</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_module_update"/>
-            <field name="target">new</field>
-        </record>
-
     </data>
 </openerp>
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py
index 79ec7c80997..4db4028bdb0 100644
--- a/bin/addons/base/module/wizard/base_module_upgrade.py
+++ b/bin/addons/base/module/wizard/base_module_upgrade.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import pooler
-import os
-import tools
 from osv import osv, fields
 
 class base_module_upgrade(osv.osv_memory):
@@ -98,7 +96,7 @@ class base_module_upgrade(osv.osv_memory):
             raise osv.except_osv('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
         mod_obj.download(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        _, pool = pooler.restart_pool(cr.dbname, update_module=True)
 
         id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install')
         if id2:
diff --git a/bin/addons/base/module/wizard/base_update_translations.py b/bin/addons/base/module/wizard/base_update_translations.py
index cc7a3361a29..94cb0ee2e18 100644
--- a/bin/addons/base/module/wizard/base_update_translations.py
+++ b/bin/addons/base/module/wizard/base_update_translations.py
@@ -35,7 +35,7 @@ class base_update_translations(osv.osv_memory):
         lang_obj=pooler.get_pool(cr.dbname).get('res.lang')
         ids=lang_obj.search(cr, uid, [('code', '=', lang_code)])
         if not ids:
-            raise osv.orm_except('Bad lang')
+            raise osv.except_osv(_('No language with code "%s" exists') % lang_code)
         lang = lang_obj.browse(cr, uid, ids[0])
         return lang.name
     def act_cancel(self, cr, uid, ids, context=None):
@@ -51,14 +51,17 @@ class base_update_translations(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields, context=None):
-        lang_obj = self.pool.get('res.lang')
+        res = super(base_update_translations, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
-        lang=lang_obj.browse(cr,uid,record_id).code
-        return {'lang':lang}
+        if record_id:
+            lang = self.pool.get('res.lang').browse(cr, uid, record_id).code
+            res.update(lang=lang)
+        return res
 
     _name = 'base.update.translations'
+    _inherit = "ir.wizard.screen"
     _columns = {
         'lang': fields.selection(_get_languages, 'Language', required=True),
     }
 
-base_update_translations()
+base_update_translations()
\ No newline at end of file
diff --git a/bin/addons/base/module/wizard/base_update_translations_view.xml b/bin/addons/base/module/wizard/base_update_translations_view.xml
index 781f3d142d8..60d30440ca1 100644
--- a/bin/addons/base/module/wizard/base_update_translations_view.xml
+++ b/bin/addons/base/module/wizard/base_update_translations_view.xml
@@ -2,23 +2,34 @@
 <openerp>
     <data>
          <record id="wizard_update_translations" model="ir.ui.view">
-            <field name="name">Update Translations</field>
+            <field name="name">Synchronize Translations</field>
             <field name="model">base.update.translations</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form col="3" string="Update Translations">
-                    <field name="lang"/>
-                    <label align="0.0" colspan="4" string="This wizard will detect new terms in the application so that you can update them manually."/>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4" fill="0">
-                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
-                        <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
+                <form string="Synchronize Translations">
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="This wizard will detect new terms to translate in the application, so that you can then add translations manually or perform a complete export (as a template for a new language example)."/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Synchronize Translation" colspan="4"/>
+                            <field name="lang" colspan="4"/>
+                        </group>
+                        <group colspan="8" col="8">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button icon="gtk-cancel" name="act_cancel" special="cancel" string="Cancel" type="object"/>
+                            <button icon="gtk-ok" name="act_update" string="Update" type="object"/>
+                        </group>
                     </group>
                 </form>
             </field>
         </record>
         <record id="action_wizard_update_translations" model="ir.actions.act_window">
-            <field name="name">Resynchronise Terms</field>
+            <field name="name">Synchronize Translations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.update.translations</field>
             <field name="view_type">form</field>
diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index f94c4fbeaa6..47667a5ba81 100644
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -19,19 +19,14 @@
 #
 ##############################################################################
 
-import os
-import base64
-import random
 from operator import attrgetter
 
 from osv import osv, fields
-import tools
 from tools.translate import _
 import netsvc
 import pooler
 
 
-
 class res_config_configurable(osv.osv_memory):
     ''' Base classes for new-style configuration items
 
@@ -40,6 +35,7 @@ class res_config_configurable(osv.osv_memory):
     their view inherit from the related res_config_view_base view.
     '''
     _name = 'res.config'
+    _inherit = 'ir.wizard.screen'
     logger = netsvc.Logger()
 
     def get_current_progress(self, cr, uid, context=None):
@@ -57,20 +53,13 @@ class res_config_configurable(osv.osv_memory):
             return round(closed*100./total)
         return 100.
 
-    def _get_image(self, cr, uid, context=None):
-        file_no = str(random.randint(1,3))
-        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
-        file_data = tools.file_open(path,'rb').read()
-        return base64.encodestring(file_data)
-
     _columns = dict(
         progress = fields.float('Configuration Progress', readonly=True),
-        config_logo = fields.binary('Image', readonly=True),
-        )
+    )
+
     _defaults = dict(
         progress = _progress,
-        config_logo = _get_image
-        )
+    )
 
     def _next_action(self, cr, uid, context=None):
         todos = self.pool.get('ir.actions.todo')

From 4ca2280a36a6131ff3cc1f242cc3301ebee01f4a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:37:21 +0200
Subject: [PATCH 250/632] [IMP] base/res.users: cleanup + improved label

bzr revid: odo@openerp.com-20101004143721-75tqs7y3e8fd2r98
---
 bin/addons/base/res/res_user.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 506538bd48b..38cf1fc21a7 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -145,10 +145,8 @@ class users(osv.osv):
         return self.WELCOME_MAIL_BODY
 
     def get_current_company(self, cr, uid):
-        res=[]
         cr.execute('select company_id, res_company.name from res_users left join res_company on res_company.id = company_id where res_users.id=%s' %uid)
-        res = cr.fetchall()
-        return res
+        return cr.fetchall()
 
     def send_welcome_email(self, cr, uid, id, context=None):
         logger= netsvc.Logger()
@@ -233,7 +231,7 @@ class users(osv.osv):
                  " aren't configured, it won't be possible to email new "
                  "users."),
         'signature': fields.text('Signature', size=64),
-        'address_id': fields.many2one('res.partner.address', 'Company Address'),
+        'address_id': fields.many2one('res.partner.address', 'Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
         'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),

From 72e5a0102c269ac946612d928c582c9c83ab9fd5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:37:41 +0200
Subject: [PATCH 251/632] [IMP] base/workflow: shorter menu label

bzr revid: odo@openerp.com-20101004143741-1qxnva3fda8okd0b
---
 bin/addons/base/ir/workflow/workflow_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 9adbec0fc56..b4e9b0daf46 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <menuitem id="menu_workflow_root" name="Workflow Definitions" parent="base.menu_custom" groups="base.group_extended"/>
+    <menuitem id="menu_workflow_root" name="Workflows" parent="base.menu_custom" groups="base.group_extended"/>
 
     <!--
         ================================

From 128a11714a0d64617c90894a4da331af68fecbd7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:38:26 +0200
Subject: [PATCH 252/632] [IMP] base: refactor/unify base module wizards

bzr revid: odo@openerp.com-20101004143826-tfc7k01rv7b52fas
---
 bin/addons/base/ir/wizard/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/ir/wizard/__init__.py b/bin/addons/base/ir/wizard/__init__.py
index b1a92b51272..99c6cdcd0de 100644
--- a/bin/addons/base/ir/wizard/__init__.py
+++ b/bin/addons/base/ir/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import wizard_menu
+import wizard_screen
 import create_action
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From c92e531a1af30cfb08c6aeccc99782f96a0e0012 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:39:04 +0200
Subject: [PATCH 253/632] [IMP] base/ir_cron: better tooltips

bzr revid: odo@openerp.com-20101004143904-n5j7anltcnh2mo25
---
 bin/addons/base/ir/ir_cron.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index c4d4e72260f..06121533922 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -50,12 +50,12 @@ class ir_cron(osv.osv, netsvc.Agent):
         'interval_number': fields.integer('Interval Number',help="Repeat every x."),
         'interval_type': fields.selection( [('minutes', 'Minutes'),
             ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
-        'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),
-        'doall' : fields.boolean('Repeat Missed',help="Select this if you want to run the scheduler for the missed occurencs."),
-        'nextcall' : fields.datetime('Next Execution Date', required=True,help="Date when this schedular will call next time"),
-        'model': fields.char('Object', size=64,help="Name of object whose function will be called when this scheduler will run. e.g. 'res.partener'"),
-        'function': fields.char('Function', size=64,help="Name of the function to be called by this scheduler. "),
-        'args': fields.text('Arguments',help="Arguments to be passed to the function. e.g. (uid,)"),
+        'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates no limit'),
+        'doall' : fields.boolean('Repeat Missed', help="Enable this if you want to execute missed occurences as soon as the server restarts."),
+        'nextcall' : fields.datetime('Next Execution Date', required=True, help="Next planned execution date for this scheduler"),
+        'model': fields.char('Object', size=64, help="Name of object whose function will be called when this scheduler will run. e.g. 'res.partener'"),
+        'function': fields.char('Function', size=64, help="Name of the method to be called on the object when this scheduler is executed."),
+        'args': fields.text('Arguments', help="Arguments to be passed to the method. e.g. (uid,)"),
         'priority': fields.integer('Priority', help='0=Very Urgent\n10=Not urgent')
     }
 

From a0d132ba5caa6d3f07462ce0366e516586ab5b82 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:39:44 +0200
Subject: [PATCH 254/632] [IMP] base/ir_action: removed unused m2m + lint
 cleanup

bzr revid: odo@openerp.com-20101004143944-m1ewxgouv3y50vda
---
 bin/addons/base/ir/ir_actions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index c100087ba89..37f1ab19643 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -28,7 +28,6 @@ from tools.translate import _
 import netsvc
 import re
 import copy
-import sys
 from xml import dom
 
 class actions(osv.osv):
@@ -220,7 +219,6 @@ class act_window(osv.osv):
         'search_view_id': fields.many2one('ir.ui.view', 'Search View Ref.'),
         'filter': fields.boolean('Filter'),
         'auto_search':fields.boolean('Auto Search'),
-        'default_user_ids': fields.many2many('res.users', 'ir_act_window_user_rel', 'act_id', 'uid', 'Users'),
         'search_view' : fields.function(_search_view, type='text', method=True, string='Search View'),
         'menus': fields.char('Menus', size=4096),
         'help': fields.text('Action description',

From b6b618c61bc30daeda75490882f27a415892367f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:41:40 +0200
Subject: [PATCH 255/632] [IMP] base: Administration review: improved
 menus/views

bzr revid: odo@openerp.com-20101004144140-3b7trmv8phl7k0bf
---
 bin/addons/base/base_menu.xml |  2 +-
 bin/addons/base/ir/ir.xml     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 9aab35b5d81..830ead09f6f 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -5,7 +5,7 @@
         <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
-            groups="base.group_extended,base.group_no_one"  />
+            groups="base.group_no_one"/>
         <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index bf21eea7e08..8d35e469bd8 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -353,8 +353,8 @@
                 <form string="Filters">
                     <group colspan="4" col="6" >
                         <field name="name"/>
-                        <field name="user_id"/>
                         <field name="model_id"/>
+                        <field name="user_id"/>
                     </group>
                     <group col="4" expand="1">
                         <separator string="Domain" colspan="2" />
@@ -425,14 +425,13 @@
             <field name="model">ir.actions.report.xml</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Report xml">
+                <form string="Report">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
                         <field name="model" select="1"/>
-                        <field name="type" select="1"/>
+                        <field name="usage"/>
 
                         <field name="report_name" select="1"/>
-                        <field name="usage"/>
                         <field name="report_type"/>
                     </group>
 
@@ -503,7 +502,7 @@
         </record>
 
         <record id="ir_action_report_xml" model="ir.actions.act_window">
-            <field name="name">XML Reports</field>
+            <field name="name">Reports</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.actions.report.xml</field>
             <field name="view_type">form</field>
@@ -831,7 +830,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views">
-                   <separator string="General" colspan="4"/>
                     <group colspan="4" col="6">
                         <field name="name" select="1" colspan="6"/>
                         <field name="type" select="1"/>
@@ -1337,7 +1335,7 @@
                        <field name="src" nolabel="1" height="400"/>
                     </group>
                     <group colspan="2" col="2">
-                       <separator string="Tranlsation" colspan="2"/>
+                       <separator string="Translation" colspan="2"/>
                        <field name="value" nolabel="1" height="400"/>
                     </group>
 
@@ -1858,6 +1856,7 @@
                 <tree editable="bottom" string="Config Wizard Steps">
                     <field name="sequence"/>
                     <field name="action_id"/>
+                    <field name="restart"/>
                     <field name="state" readonly="1"/>
                     <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
                     <button name="action_open" states="cancel,skip,done"

From 683fbd05a71d8d3faeab54f1aab52e62346a47af Mon Sep 17 00:00:00 2001
From: "rga@openerp.com" <>
Date: Mon, 4 Oct 2010 17:23:37 +0200
Subject: [PATCH 256/632] [FIX] ir_values: attempt to return items in a more
 deterministic order

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

bzr revid: odo@openerp.com-20101004152337-35g54q0dw2b2qmf5
---
 bin/addons/base/ir/ir_values.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_values.py b/bin/addons/base/ir/ir_values.py
index 1f9a54516b6..310f3552403 100644
--- a/bin/addons/base/ir/ir_values.py
+++ b/bin/addons/base/ir/ir_values.py
@@ -176,7 +176,7 @@ class ir_values(osv.osv):
                     where.append('res_id=%s')
                     params.append(res_id)
 
-            where.append('(user_id=%s or (user_id IS NULL))')
+            where.append('(user_id=%s or (user_id IS NULL)) order by id')
             params.append(uid)
             clause = ' and '.join(where)
             cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)

From baba6829dc1586acf86eb845eb0be727bed62b13 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 17:25:36 +0200
Subject: [PATCH 257/632] [IMP] base: Administration review (bis): added
 previously missing wizard_screen file

bzr revid: odo@openerp.com-20101004152536-cz5j7tokhdxpu9sb
---
 bin/addons/base/ir/wizard/wizard_screen.py | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 bin/addons/base/ir/wizard/wizard_screen.py

diff --git a/bin/addons/base/ir/wizard/wizard_screen.py b/bin/addons/base/ir/wizard/wizard_screen.py
new file mode 100644
index 00000000000..56f104d0b13
--- /dev/null
+++ b/bin/addons/base/ir/wizard/wizard_screen.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2010 OpenERP s.a. (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import base64
+import os
+import random
+
+import tools
+from osv import fields,osv
+
+# Simple base class for wizards that wish to use random images on the left
+# side of the form.
+class wizard_screen(osv.osv_memory):
+    _name = 'ir.wizard.screen'
+
+    def _get_image(self, cr, uid, context=None):
+        path = os.path.join('base','res','config_pixmaps','%d.png'%random.randrange(1,4))
+        file_data = tools.file_open(path,'rb').read()
+        return base64.encodestring(file_data)
+
+    def _get_image_fn(self, cr, uid, ids, name, args, context=None):
+        image = self._get_image(cr, uid, context)
+        return dict.fromkeys(ids, image) # ok to use .fromkeys() as the image is same for all 
+
+    _columns = {
+        'config_logo': fields.function(_get_image_fn, string='Image', type='binary', method=True),
+    }
+
+    _defaults = {
+        'config_logo': _get_image
+    }
+wizard_screen()
\ No newline at end of file

From 3c1c74df2cf513a27ac56ae132785330c6dcc498 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Oct 2010 20:46:30 +0200
Subject: [PATCH 258/632] fix

bzr revid: fp@tinyerp.com-20101004184630-x4k02bxow4weam3x
---
 bin/addons/base/res/res_user.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 1f502fc9cff..929a7018f7d 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -327,8 +327,9 @@ class users(osv.osv):
         return ids and ids[0] or False
 
     def _get_group(self,cr, uid, context=None):
-        ids = self.pool.get('res.groups').search(cr, uid, [('name','=','Employee')], context=context)
-        return ids or False
+        dataobj = self.pool.get('ir.model.data')
+        data_id = dataobj._get_id(cr, 1, 'base', 'group_user')
+        return data_id and [data_id] or False
 
     _defaults = {
         'password' : lambda *a : '',

From 863766e16afe32b046e5e5bf0f7e0a6384be025b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 4 Oct 2010 20:47:15 +0200
Subject: [PATCH 259/632] fix

bzr revid: fp@tinyerp.com-20101004184715-0nrs39omt5irivai
---
 bin/addons/base/security/base_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index 76b725b5826..d7d39ea27e9 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -14,7 +14,7 @@
     </record>
 
     <record model="res.groups" id="group_user">
-        <field name="name">Employee</field>
+        <field name="name">Internal User</field>
     </record>
 
     <record model="res.groups" context="{'noadmin':True}" id="group_multi_company">

From 2e3de2d6946c392b47528aa11b447ccb93d78476 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 09:49:50 +0530
Subject: [PATCH 260/632] [REF] Account: Code clean

bzr revid: mra@mra-laptop-20101005041950-dkfe831bwepwyfmh
---
 addons/account/wizard/account_report_central_journal.py | 3 ++-
 addons/account/wizard/account_report_partner_balance.py | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index 0b402ae5f3d..d66be0a70e4 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import osv, fields
+
+from osv import osv
 
 class account_central_journal(osv.osv_memory):
     _name = 'account.central.journal'
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index 43081b046ba..eff9e71cb72 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -29,8 +29,6 @@ class account_partner_balance(osv.osv_memory):
     _name = 'account.partner.balance'
     _description = 'Print Account Partner Balance'
     _columns = {
-#        'initial_balance': fields.boolean('Include Initial Balances'
-#                                    ,help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
                                     ,'Display Partners'),
     }

From 1bb8ea02bfd524235288b40a8df86798db963dde Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 09:55:18 +0530
Subject: [PATCH 261/632] [REF] Account: cleaning

bzr revid: mra@mra-laptop-20101005042518-1uyc69u55bpyenmi
---
 addons/account/account.py              |  3 +--
 addons/account/report/voucher_print.py | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 208bf1d6f68..e90a8be6841 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2859,5 +2859,4 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
 account_bank_accounts_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/report/voucher_print.py b/addons/account/report/voucher_print.py
index 8d763837c1f..fbd05455e59 100644
--- a/addons/account/report/voucher_print.py
+++ b/addons/account/report/voucher_print.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -21,22 +21,22 @@
 ##############################################################################
 
 import time
+
 from report import report_sxw
 from tools import amount_to_text_en
 
 class report_voucher_move(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(report_voucher_move, self).__init__(cr, uid, name, context)
+    def __init__(self, cr, uid, name, context=None):
+        super(report_voucher_move, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
             'convert':self.convert,
             'get_title': self.get_title,
             'debit':self.debit,
             'credit':self.credit,
-            #'get_ref' : self._get_ref
         })
  	self.user=uid
-     
+
     def convert(self, amount):
     	user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0]
     	cur = user_id.company_id.currency_id.name
@@ -49,22 +49,24 @@ class report_voucher_move(report_sxw.rml_parse):
             type = voucher.journal_id.type
             title = type[0].swapcase() + type[1:] + " Voucher"
         return title
-    
+
     def debit(self, move_ids):
         debit = 0.0
         for move in move_ids:
             debit +=move.debit
         return debit
-    
+
     def credit(self, move_ids):
         credit = 0.0
         for move in move_ids:
             credit +=move.credit
         return credit
-    
+
 report_sxw.report_sxw(
     'report.account.move.voucher',
     'account.move',
     'addons/account/report/voucher_print.rml',
     parser=report_voucher_move,header="external"
 )
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From dfab2f19c9daad458886223e90eb3a9e637d10ae Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 5 Oct 2010 10:08:41 +0530
Subject: [PATCH 262/632] [MOD] hr : displays the category name with its
 parents

bzr revid: vir@tinyerp.com-20101005043841-8cnkrnfzv64pugq8
---
 addons/hr/hr.py       | 18 ++++++++++++++++++
 addons/hr/hr_view.xml |  3 +--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 03af527359d..e2da2b9cf7b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -26,10 +26,28 @@ import tools
 from tools.translate import _
 
 class hr_employee_category(osv.osv):
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
+        res = self.name_get(cr, uid, ids, context)
+        return dict(res)
+
     _name = "hr.employee.category"
     _description = "Employee Category"
     _columns = {
         'name': fields.char("Category", size=64, required=True),
+        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
     }
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ca9cd3bc158..496e24bbb08 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -259,8 +259,7 @@
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Employees Categories">
-                    <field name="name"/>
-                    <field name="parent_id"/>
+                    <field name="complete_name"/>
                 </tree>
             </field>
         </record>

From 8364c38fda539cb720279ccef2ba614050bea3b1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 10:53:18 +0530
Subject: [PATCH 263/632] [Fix] project_timesheet:Fix the buildbot-bug foryml

bzr revid: sbh@tinyerp.com-20101005052318-azg6kccngrq0qy72
---
 .../test/worktask_entry_to_timesheetline_entry.yml              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 42e780642bf..2a08d863fff 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -7,6 +7,8 @@
     login: hr
     name: HR Manager
     password: hr
+    groups_id:
+      - base.group_hr_manager   
             
 - 
   Create a product with type service used to specifies employees designation

From e235f2a631a9eaa1c957dbbe638c0d85c0e21040 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 11:21:22 +0530
Subject: [PATCH 264/632] [FIX] Account: Account move line => Query get method
 improved with Initial balance calculation

bzr revid: mra@mra-laptop-20101005055122-9ywrjw1rwkvovkxy
---
 addons/account/account_move_line.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 11f90061015..e93eb85bf38 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -72,10 +72,20 @@ class account_move_line(osv.osv):
                 context['periods'] = fiscalperiod_obj.build_ctx_periods(cr, uid, first_period, context['period_from'])
             else:
                 context['periods'] = fiscalperiod_obj.build_ctx_periods(cr, uid, context['period_from'], context['period_to'])
-
         if context.get('periods', False):
-            ids = ','.join([str(x) for x in context['periods']])
-            query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids, where_move_state, where_move_lines_by_date)
+            if initial_bal:
+                query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s %s)" % (fiscalyear_clause, where_move_state, where_move_lines_by_date)
+                period_ids = fiscalperiod_obj.search(cr, uid, [('id', 'in', context['periods'])], order='date_start', limit=1)
+                if period_ids and period_ids[0]:
+                    first_period = fiscalperiod_obj.browse(cr, uid, period_ids[0], context=context)
+                    # Find the old periods where date start of those periods less then Start period
+                    periods = fiscalperiod_obj.search(cr, uid, [('date_start', '<', first_period.date_start)])
+                    periods = ','.join([str(x) for x in periods])
+                    if periods:
+                        query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) OR id in (%s)) %s %s" % (fiscalyear_clause, periods, where_move_state, where_move_lines_by_date)
+            else:
+                ids = ','.join([str(x) for x in context['periods']])
+                query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids, where_move_state, where_move_lines_by_date)
         else:
             query = obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s %s)" % (fiscalyear_clause,where_move_state,where_move_lines_by_date)
 

From afcaaf5d5321d664c5c5a61b8c8391835ea93256 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 11:26:04 +0530
Subject: [PATCH 265/632] [IMP] stock: Improve set the groups to menuitems

bzr revid: sbh@tinyerp.com-20101005055604-0hni5yhjg0i77iav
---
 addons/stock/__openerp__.py | 4 ++--
 addons/stock/stock_view.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 7a20abe2fb0..79d6c860e65 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -45,6 +45,8 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
+        "security/stock_security.xml",  
+        "security/ir.model.access.csv",                  
         "stock_data.xml",
         "wizard/stock_move_view.xml",
         "wizard/stock_partial_picking_view.xml",
@@ -68,8 +70,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "partner_view.xml",
         "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
-        "security/stock_security.xml",
-        "security/ir.model.access.csv",
         "board_warehouse_view.xml"
     ],
     'test': ['test/stock_test.yml',
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ef046414bd6..bc4f7b2ab67 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,12 +2,12 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="5"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" parent="" groups="group_stock_manager" sequence="5"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,base.group_extended"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
-        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="base.group_system"/>
+        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager,base.group_system"/>
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="base.group_system"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 

From edf6dbd439286c1f5d0d33a4ea8dd3526415c476 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Tue, 5 Oct 2010 11:27:12 +0530
Subject: [PATCH 266/632] [FIX] account: fixed the cash statement opening
 balance problem and some improvement at cancel side.

bzr revid: vra@tinyerp.com-20101005055712-rmbveh0l0k678x1t
---
 addons/account/account_cash_statement.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index ed987de7e37..34c751072ce 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -250,6 +250,12 @@ class account_cash_statement(osv.osv):
 
         if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
             open_close = self._get_cash_open_close_box_lines(cr, uid, context)
+            if vals.get('starting_details_ids',False):
+                for start in vals.get('starting_details_ids'):
+                    dict_val = start[2]
+                    for end in open_close['end']:
+                       if end[2]['pieces'] == dict_val['pieces']:
+                           end[2]['number'] += dict_val['number']
             vals.update({
                 'ending_details_ids':open_close['start'],
                 'starting_details_ids':open_close['end']
@@ -260,7 +266,7 @@ class account_cash_statement(osv.osv):
                 'starting_details_ids':False
             })
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
-        #self.write(cr, uid, [res_id], {})
+        self.write(cr, uid, [res_id], {})
         return res_id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -370,6 +376,14 @@ class account_cash_statement(osv.osv):
         super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
 
+    def button_cancel(self, cr, uid, ids, context=None):
+        cash_box_line_pool = self.pool.get('account.cashbox.line')
+        super(account_cash_statement, self).button_cancel(cr, uid, ids, context=context)
+        for st in self.browse(cr, uid, ids, context):
+            for end in st.ending_details_ids:
+                cash_box_line_pool.write(cr, uid, [end.id], {'number':0})
+        return True
+    
 account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 2b644cce5e1640aec932efed67961c67b26d1bc8 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 11:45:56 +0530
Subject: [PATCH 267/632] [IMP] Twitter widget for openerp web.

bzr revid: vda@tinyerp.com-20101005061556-sotgy22ty52xc2n8
---
 bin/addons/base/__openerp__.py               |  5 ++-
 bin/addons/base/res/__init__.py              |  1 +
 bin/addons/base/res/res_widget.py            | 30 ++++++++++++++
 bin/addons/base/res/res_widget_data.xml      | 42 ++++++++++++++++++++
 bin/addons/base/res/res_widget_view.xml      | 37 +++++++++++++++++
 bin/addons/base/security/ir.model.access.csv |  1 +
 6 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 bin/addons/base/res/res_widget.py
 create mode 100644 bin/addons/base/res/res_widget_data.xml
 create mode 100644 bin/addons/base/res/res_widget_view.xml

diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 86a0229358a..2bf126f5300 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -73,13 +73,14 @@
         'security/base_security.xml',
         'maintenance/maintenance_view.xml',
 
-        'security/ir.model.access.csv'
-
+        'security/ir.model.access.csv',
+        'res/res_widget_view.xml',
     ],
     'demo_xml': [
         'base_demo.xml',
         'res/partner/partner_demo.xml',
         'res/partner/crm_demo.xml',
+        'res/res_widget_data.xml',
     ],
     'test': [
         'test/base_test.xml',
diff --git a/bin/addons/base/res/__init__.py b/bin/addons/base/res/__init__.py
index b7a14c78a93..1536f8b2d75 100644
--- a/bin/addons/base/res/__init__.py
+++ b/bin/addons/base/res/__init__.py
@@ -33,4 +33,5 @@ import res_request
 import res_lang 
 import res_log 
 import ir_property
+import res_widget
 
diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
new file mode 100644
index 00000000000..d59975b5e8a
--- /dev/null
+++ b/bin/addons/base/res/res_widget.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class openerp_feedback(osv.osv):
+    _name = "twitter.widget"
+    _columns = {
+                'title' : fields.char('Title', size=64,help="ABC"),
+                'content': fields.text('Content')
+                }
+openerp_feedback()
\ No newline at end of file
diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
new file mode 100644
index 00000000000..eaaf0ff3869
--- /dev/null
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="openerp_twitter_favorites" model="twitter.widget">
+      <field name="title">OpenERP Favorites</field>
+      <field name="content"><![CDATA[
+<script type="text/javascript" src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script type="text/javascript">
+new TWTR.Widget({
+  version: 2,
+  type: 'faves',
+  rpp: 10,
+  interval: 6000,
+  title: '',
+  subject: '',
+  width: 'auto',
+  height: 300,
+  theme: {
+    shell: {
+      background: '#F0EEEE',
+      color: '#444444'
+    },
+    tweets: {
+      background: '#F0EEEE',
+      color: '#444444',
+      links: '#43c43f'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: true,
+    behavior: 'all'
+  }
+}).render().setUser('openerp').start();
+</script>]]> </field>
+    </record>
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
new file mode 100644
index 00000000000..0002ae08020
--- /dev/null
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="twitter_widget_form" model="ir.ui.view">
+            <field name="name">twitter.widget.form</field>
+            <field name="model">twitter.widget</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="OpenERP Feedback">
+                    <field name="title"/>
+                    <field name="content"/>
+                </form>
+            </field>
+        </record>
+        <record id="twitter_widget_tree" model="ir.ui.view">
+            <field name="name">twitter.widget.tree</field>
+            <field name="model">twitter.widget</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="OpenERP Feedback">
+                    <field name="title"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="twitter_widget_act_window" model="ir.actions.act_window">
+            <field name="name">OpenERP Feedback</field>
+            <field name="res_model">twitter.widget</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="twitter_widget_tree"/>
+        </record>
+        <menuitem
+            action="twitter_widget_act_window"
+            id="menu_twitter_widget_act_window"
+            parent="base.menu_users"/>
+    </data>
+</openerp>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index cbbeb30fa0d..76f525a613c 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -120,3 +120,4 @@
 "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1
+"access_res_widget","res.widget","model_twitter_widget","group_erp_manager",1,1,1,1

From 74a1a530890e986782055ddd4f4f22bb96211bb8 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 5 Oct 2010 11:50:47 +0530
Subject: [PATCH 268/632] [IMP] account: small changes in rml of Partner ledger

bzr revid: psi@tinyerp.co.in-20101005062047-d5h6zv1chb5oaaen
---
 .../account/report/account_partner_ledger.rml | 76 +++++++++----------
 .../report/account_partner_ledger_other.rml   | 21 ++---
 2 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 06c589d5569..ec03ccec8de 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -37,7 +37,7 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-2"/>
     </blockTableStyle>
     <blockTableStyle id="Table2_header">
       <blockAlignment value="LEFT"/>
@@ -86,7 +86,7 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
- 	<blockTableStyle id="Table3_header">
+   <blockTableStyle id="Table3_header">
       <blockAlignment value="LEFT"/>
         <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
     </blockTableStyle>
@@ -106,8 +106,7 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-2"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -168,6 +167,7 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -225,43 +225,43 @@
     <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
       <blockTable colWidths="80.0,80.0,80.0,130.0,70.0,80.0" style="Table2_header">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+        <td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-		<td><para style="terp_tblheader_General_Centre">Journal</para></td>
+    <td><para style="terp_tblheader_General_Centre">Journal</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
          <td><para style="terp_tblheader_General_Centre">Partner's</para></td>
         <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
       </tr>
-	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
+  <tr>
+     <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
-		<td><para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para></td>
+    <td><para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3_header">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-				<tr>
-	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
-	        	</tr>
-	        	<tr>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
-	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
-	        	</tr>
-        	</blockTable>
-        	<blockTable colWidths="65.0,65.0" style="Table3_header">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-				<tr>
-			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-	        	</tr>
-	        	<tr>
-			        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
-			        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
-	        	</tr>
-        	 </blockTable>
-        	</td>
-	<td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>
-	<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
-	</tr>
-	</blockTable>
+          <blockTable colWidths="60.0,60.0" style="Table3_header">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <tr>
+                 <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
+              <td><para style="terp_tblheader_General_Centre">End Date</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="65.0,65.0" style="Table3_header">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        <tr>
+              <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
+              <td><para style="terp_tblheader_General_Centre">End Period</para></td>
+            </tr>
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+              <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
+            </tr>
+           </blockTable>
+          </td>
+  <td><para style="terp_default_Centre_8">[[ get_partners() ]]</para></td>
+  <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
+  </tr>
+  </blockTable>
      <para style="P4">
       <font color="white"> </font>
     </para>
@@ -328,8 +328,8 @@
         </td>
       </tr>
        <tr>
-    	<td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-          <para style="P2">Initial Balance</para>
+      <td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
+          <para style="terp_default_Left_9">Initial Balance</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
@@ -439,7 +439,7 @@
       </tr>
       <tr>
         <td>[[display_initial_balance(data) or  removeParentNode('tr') ]]
-          <para style="P2">Initial Balance</para>
+          <para style="terp_default_Left_9">Initial Balance</para>
         </td>
          <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]]</para>
@@ -450,7 +450,7 @@
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
         </td>
-   		<td>
+       <td>
           <para style="P5"></para>
         </td>
     </tr>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index f91f2ff41f5..4408c03a283 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -188,12 +188,12 @@
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-  		<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-  		<lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_header">
       <blockAlignment value="LEFT"/>
@@ -222,7 +222,7 @@
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0, 0" stop="0,-2"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -261,7 +261,7 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-2"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -320,13 +320,14 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table index 1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
     <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Table index heading" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="16.0" leading="20" spaceBefore="12.0" spaceAfter="6.0"/>
-	<paraStyle name="terp_default_Right_1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+  <paraStyle name="terp_default_Right_1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -459,8 +460,8 @@
         </td>
       </tr>
     </blockTable>
-	<section>
-	<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
+  <section>
+  <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
     <blockTable colWidths="349.0,60.0,60.0,60.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
@@ -479,7 +480,7 @@
       </tr>
       <tr>
     <td>[[ display_initial_balance(data)  or  removeParentNode('tr') ]]
-          <para style="P2">Initial Balance</para>
+          <para style="terp_default_Left_9">Initial Balance</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
@@ -581,7 +582,7 @@
       </tr>
         <tr>
         <td>[[ data['form']['initial_balance'] or  removeParentNode('tr') ]]
-         <para style="P2">Initial Balance</para>
+         <para style="terp_default_Left_9">Initial Balance</para>
         </td>
          <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0]) ]]</para>
@@ -592,7 +593,7 @@
         <td>
           <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
         </td>
-   		<td>
+       <td>
           <para style="terp_default_Right_9"></para>
         </td>
         </tr>

From 01bda9b4b4b354acf76395d416a9a3490d421337 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 5 Oct 2010 12:00:26 +0530
Subject: [PATCH 269/632] [REM] point_of_sale: Removed unused object
 'pos.payment' as Payment is now done with 'account.bank.statement' object
 from account.

bzr revid: uco@tinyerp.com-20101005063026-eew1c2snhawv1not
---
 addons/point_of_sale/pos.py                   | 56 +------------------
 addons/point_of_sale/pos_sequence.xml         | 11 ----
 .../report/pos_details_summary.py             |  6 +-
 .../point_of_sale/report/pos_receipt_bis.rml  |  2 +-
 .../security/ir.model.access.csv              |  3 -
 5 files changed, 6 insertions(+), 72 deletions(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 3132367d8bf..778c504337d 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -175,9 +175,8 @@ class pos_order(osv.osv):
             cur_obj = self.pool.get('res.currency')
             cur = order.pricelist_id.currency_id
             for payment in order.statement_ids:
-                 res[order.id]['amount_paid'] +=  payment.amount
-            for payment in order.payments:
-                res[order.id]['amount_return']  += (payment.amount < 0 and payment.amount or 0)
+                res[order.id]['amount_paid'] +=  payment.amount
+                res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
             for line in order.lines:
                 if order.price_type!='tax_excluded':
                     res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
@@ -221,7 +220,6 @@ class pos_order(osv.osv):
             default = {}
         default.update({
             'state': 'draft',
-            'payments': [],
             'partner_id': False,
             'invoice_id': False,
             'account_move': False,
@@ -285,7 +283,6 @@ class pos_order(osv.osv):
             ('tax_excluded','Tax excluded')
         ], 'Price method', required=True),
         'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments',states={'draft': [('readonly', False)]},readonly=True),
-        'payments': fields.one2many('pos.payment', 'order_id', 'Order Payments', states={'draft': [('readonly', False)]}, readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
         'state': fields.selection([('draft', 'Quotation'), ('payment', 'Payment'),
@@ -1265,55 +1262,6 @@ class pos_order_line(osv.osv):
 
 pos_order_line()
 
-
-class pos_payment(osv.osv):
-    _name = 'pos.payment'
-    _description = 'Pos Payment'
-
-    def _journal_get(self, cr, uid, context=None):
-        obj = self.pool.get('account.journal')
-        ids = obj.search(cr, uid, [('type', '=', 'cash')])
-        res = obj.read(cr, uid, ids, ['id', 'name'], context)
-        res = [(r['id'], r['name']) for r in res]
-        return res
-
-    def _journal_default(self, cr, uid, context=None):
-        journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
-        if journal_list:
-            return journal_list[0]
-        else:
-            return False
-
-    _columns = {
-        'name': fields.char('Description', size=64),
-        'order_id': fields.many2one('pos.order', 'Order Ref', required=True, ondelete='cascade'),
-        'journal_id': fields.many2one('account.journal', "Journal", required=True),
-        'payment_id': fields.many2one('account.payment.term','Payment Term', select=True),
-        'payment_nb': fields.char('Piece Number', size=32),
-        'payment_name': fields.char('Payment Name', size=32),
-        'payment_date': fields.date('Payment Date', required=True),
-        'amount': fields.float('Amount', required=True),
-    }
-    _defaults = {
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.payment'),
-        'journal_id': _journal_default,
-        'payment_date':  lambda *a: time.strftime('%Y-%m-%d'),
-    }
-
-    def create(self, cr, user, vals, context=None):
-        if vals.get('journal_id') and vals.get('amount'):
-            return super(pos_payment, self).create(cr, user, vals, context)
-        return False
-
-    def write(self, cr, user, ids, values, context=None):
-        if 'amount' in values and not values['amount']:
-            return False
-        if 'journal_id' in values and not values['journal_id']:
-            return False
-        return super(pos_payment, self).write(cr, user, ids, values, context)
-
-pos_payment()
-
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/pos_sequence.xml
index 691b35a8f1a..399dccc634f 100644
--- a/addons/point_of_sale/pos_sequence.xml
+++ b/addons/point_of_sale/pos_sequence.xml
@@ -17,17 +17,6 @@
         <field name="padding">3</field>
     </record>
 
-    <record model="ir.sequence.type" id="seq_type_pos_payment">
-        <field name="name">POS Payment</field>
-        <field name="code">pos.payment</field>
-    </record>
-    <record model="ir.sequence" id="seq_pos_payment">
-        <field name="name">POS Payment</field>
-        <field name="code">pos.payment</field>
-        <field name="prefix">Payment/</field>
-        <field name="padding">2</field>
-    </record>
-
     <record model="ir.sequence.type" id="seq_type_pos_order_line">
         <field name="name">POS order line</field>
         <field name="code">pos.order.line</field>
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 7a57e17bf87..00d9df0c56f 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -61,10 +61,10 @@ class pos_details_summary(report_sxw.rml_parse):
 
         result = {}
         for obj in objects:
-            for payment in obj.payments:
-                if gift_journal_id and gift_journal_id == payment.journal_id.id:
+            for payment in obj.statement_ids:
+                if gift_journal_id and gift_journal_id == payment.statement_id.journal_id.id:
                     continue
-                result[payment.journal_id.name] = result.get(payment.journal_id.name, 0.0) + payment.amount
+                result[payment.statement_id.journal_id.name] = result.get(payment.statement_id.journal_id.name, 0.0) + payment.amount
         return result
 
     def _paid_total(self, objects):
diff --git a/addons/point_of_sale/report/pos_receipt_bis.rml b/addons/point_of_sale/report/pos_receipt_bis.rml
index ab8af5ca999..8a9989294a8 100644
--- a/addons/point_of_sale/report/pos_receipt_bis.rml
+++ b/addons/point_of_sale/report/pos_receipt_bis.rml
@@ -161,7 +161,7 @@
     <blockTable colWidths="97.0,78.0" style="Table_Amount">
       <tr>
         <td>
-          <para style="terp_default_2">[[ repeatIn(o.payments,'d') ]]</para>
+          <para style="terp_default_2">[[ repeatIn(o.statement_ids,'d') ]]</para>
           <para style="terp_default_Bold_9_Right1">[[ d.name ]]:</para>
           </td>
         <td>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index d2bc03fd47f..8587ef07683 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -4,7 +4,6 @@
 "access_pos_order_line","pos.order.line","model_pos_order_line","group_pos_user",1,1,1,1
 "access_pos_order_manager","pos.order manager","model_pos_order","group_pos_manager",1,0,0,0
 "access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,1,1,1
-"access_pos_payment","pos.payment","model_pos_payment","group_pos_user",1,1,1,1
 "access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","group_pos_manager",1,1,1,1
 "access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
 "access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,1,1,0
@@ -61,11 +60,9 @@
 "access_pos_order_line_system","pos.order.line system","model_pos_order_line","base.group_system",1,0,0,0
 "access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,1,1,1
 "access_account_invoice_manager","account.invoice manager","account.model_account_invoice","group_pos_manager",1,1,1,1
-"access_pos_payment_manager","pos.payment manager","model_pos_payment","group_pos_manager",1,0,0,0
 "access_report_transaction_pos_system","report.transaction.pos system","model_report_transaction_pos","base.group_system",1,1,1,1
 "access_account_bank_statement_line_system","account.bank.statement.line system","account.model_account_bank_statement_line","base.group_system",1,0,0,0
 "access_product_product_supplierinfo","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
-"access_pos_payment_system","pos.payment system","model_pos_payment","base.group_system",1,0,0,0
 "access_product_product_supplierinfo_manager","product.supplierinfo manager","product.model_product_supplierinfo","group_pos_manager",1,0,0,0
 "access_product_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","group_pos_user",1,0,0,0
 "access_product_product_packaging_system","product.packaging system","product.model_product_packaging","base.group_system",1,0,0,0

From 772ac664ba54742e95190996467fdc867cab26d1 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 5 Oct 2010 12:30:21 +0530
Subject: [PATCH 270/632] [FIX] account analytic plan, account budget,
 hr_timesheet, project_planning: Fix warning on Openerp TEst

bzr revid: ara@tinyerp.com-20101005070021-1djnjreztc8z6ix5
---
 addons/account_analytic_plans/account_analytic_plans.py | 2 +-
 addons/account_budget/account_budget.py                 | 1 -
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py  | 2 +-
 addons/project_planning/project_planning.py             | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index d7b4532b6e8..e85275a9bba 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -326,7 +326,7 @@ class account_move_line(osv.osv):
                        'journal_id': line.journal_id.analytic_journal_id.id,
                        'ref': line.ref,
                    }
-                   ali_id=analytic_line_obj.create(cr, uid, al_vals, context=context)
+                   analytic_line_obj.create(cr, uid, al_vals, context=context)
         return True
 
 account_move_line()
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 74bc4dba3a2..8726eca929c 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -73,7 +73,6 @@ class account_budget_post_dotation(osv.osv):
             if line.period_id:
                 obj_period = self.pool.get('account.period').browse(cr, uid, line.period_id.id)
 
-                total_days = strToDate(obj_period.date_stop) - strToDate(obj_period.date_start)
                 budget_id = line.post_id and line.post_id.id or False
                 query="SELECT id FROM crossovered_budget_lines WHERE \
                         general_budget_id= %s AND (date_from  >=%s AND date_from <= %s ) \
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 88b094f97cc..cf1e10bce37 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -172,7 +172,7 @@ class hr_si_project(osv.osv_memory):
             context = {}
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            success = emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index cf22a90aceb..759057fbaef 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -25,7 +25,6 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
 from osv import fields, osv
-from tools.translate import _
 import tools
 
 

From 9f8de3c43137e9d72d4b22a1b010db7a12f47e74 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 5 Oct 2010 12:36:57 +0530
Subject: [PATCH 271/632] [IMP] account: account report file renames

bzr revid: vth@tinyerp.com-20101005070657-fb9nuy1ypa8ot84d
---
 addons/account/account_report.xml                    |  8 ++++----
 addons/account/report/__init__.py                    | 12 ++++++++----
 .../report/{invoice.py => account_print_invoice.py}  |  6 +++---
 .../{invoice.rml => account_print_invoice.rml}       |  0
 .../report/{overdue.py => account_print_overdue.py}  |  2 +-
 .../{overdue.rml => account_print_overdue.rml}       |  0
 .../report/{rml_parse.py => account_rml_parse.py}    |  0
 .../report/{tax_report.py => account_tax_report.py}  |  2 +-
 .../{tax_report.rml => account_tax_report.rml}       |  0
 .../{voucher_print.py => account_voucher_print.py}   |  2 +-
 .../{voucher_print.rml => account_voucher_print.rml} |  0
 addons/point_of_sale/report/pos_invoice.py           |  8 ++++----
 12 files changed, 22 insertions(+), 18 deletions(-)
 rename addons/account/report/{invoice.py => account_print_invoice.py} (95%)
 rename addons/account/report/{invoice.rml => account_print_invoice.rml} (100%)
 rename addons/account/report/{overdue.py => account_print_overdue.py} (98%)
 rename addons/account/report/{overdue.rml => account_print_overdue.rml} (100%)
 rename addons/account/report/{rml_parse.py => account_rml_parse.py} (100%)
 rename addons/account/report/{tax_report.py => account_tax_report.py} (98%)
 rename addons/account/report/{tax_report.rml => account_tax_report.rml} (100%)
 rename addons/account/report/{voucher_print.py => account_voucher_print.py} (97%)
 rename addons/account/report/{voucher_print.rml => account_voucher_print.rml} (100%)

diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index b41f90245f5..907ff01b832 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -9,13 +9,13 @@
         <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journals" header="False"/>
         <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journals" header="False"/>
         <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journals" header="False"/>
-        <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/overdue.rml" string="Overdue Payments"/>
+        <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments"/>
         <report
             auto="False"
             id="account_invoices"
             model="account.invoice"
             name="account.invoice"
-            rml="account/report/invoice.rml"
+            rml="account/report/account_print_invoice.rml"
             string="Invoices"
             attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
             attachment_use="1"/>
@@ -30,14 +30,14 @@
             menu="False"
             model="account.tax.code"
             name="account.vat.declaration"
-            rml="account/report/tax_report.rml"
+            rml="account/report/account_tax_report.rml"
             string="Taxes Report"/>
 
         <report id="report_account_voucher_new"
             string="Print Voucher"
             model="account.move"
             name="account.move.voucher"
-            rml="account/report/voucher_print.rml"
+            rml="account/report/account_voucher_print.rml"
             auto="False"
             header = "False"
             menu="True"/>
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 4493874baca..7084aa8c07f 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -26,17 +26,21 @@ import account_balance
 import account_partner_balance
 import account_general_ledger
 import account_partner_ledger
-import invoice
-import overdue
+#import invoice
+import account_print_invoice
+#import overdue
+import account_print_overdue
 import account_aged_partner_balance
-import tax_report
+#import tax_report
+import account_tax_report
 import account_tax_code
 import account_balance_landscape
 import account_invoice_report
 import account_report
 import account_entries_report
 import account_analytic_entries_report
-import voucher_print
+#import voucher_print
+import account_voucher_print
 import account_balance_sheet
 import account_profit_loss
 
diff --git a/addons/account/report/invoice.py b/addons/account/report/account_print_invoice.py
similarity index 95%
rename from addons/account/report/invoice.py
rename to addons/account/report/account_print_invoice.py
index b232a33b9d9..280bc0bc7a0 100644
--- a/addons/account/report/invoice.py
+++ b/addons/account/report/account_print_invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@ class account_invoice(report_sxw.rml_parse):
 report_sxw.report_sxw(
     'report.account.invoice',
     'account.invoice',
-    'addons/account/report/invoice.rml',
+    'addons/account/report/account_print_invoice.rml',
     parser=account_invoice
 )
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/invoice.rml b/addons/account/report/account_print_invoice.rml
similarity index 100%
rename from addons/account/report/invoice.rml
rename to addons/account/report/account_print_invoice.rml
diff --git a/addons/account/report/overdue.py b/addons/account/report/account_print_overdue.py
similarity index 98%
rename from addons/account/report/overdue.py
rename to addons/account/report/account_print_overdue.py
index ebf50224a50..c59dd56a02f 100644
--- a/addons/account/report/overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -90,7 +90,7 @@ class Overdue(report_sxw.rml_parse):
         return message
 
 report_sxw.report_sxw('report.account.overdue', 'res.partner',
-        'addons/account/report/overdue.rml', parser=Overdue)
+        'addons/account/report/account_print_overdue.rml', parser=Overdue)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/overdue.rml b/addons/account/report/account_print_overdue.rml
similarity index 100%
rename from addons/account/report/overdue.rml
rename to addons/account/report/account_print_overdue.rml
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/account_rml_parse.py
similarity index 100%
rename from addons/account/report/rml_parse.py
rename to addons/account/report/account_rml_parse.py
diff --git a/addons/account/report/tax_report.py b/addons/account/report/account_tax_report.py
similarity index 98%
rename from addons/account/report/tax_report.py
rename to addons/account/report/account_tax_report.py
index a89335f99c5..ff90235c5c6 100644
--- a/addons/account/report/tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -215,6 +215,6 @@ class tax_report(rml_parse.rml_parse):
 		return result_accounts
 
 report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
-	'addons/account/report/tax_report.rml', parser=tax_report, header="internal")
+	'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/account_tax_report.rml
similarity index 100%
rename from addons/account/report/tax_report.rml
rename to addons/account/report/account_tax_report.rml
diff --git a/addons/account/report/voucher_print.py b/addons/account/report/account_voucher_print.py
similarity index 97%
rename from addons/account/report/voucher_print.py
rename to addons/account/report/account_voucher_print.py
index fbd05455e59..db43ea0f50a 100644
--- a/addons/account/report/voucher_print.py
+++ b/addons/account/report/account_voucher_print.py
@@ -65,7 +65,7 @@ class report_voucher_move(report_sxw.rml_parse):
 report_sxw.report_sxw(
     'report.account.move.voucher',
     'account.move',
-    'addons/account/report/voucher_print.rml',
+    'addons/account/report/account_voucher_print.rml',
     parser=report_voucher_move,header="external"
 )
 
diff --git a/addons/account/report/voucher_print.rml b/addons/account/report/account_voucher_print.rml
similarity index 100%
rename from addons/account/report/voucher_print.rml
rename to addons/account/report/account_voucher_print.rml
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 649eb727f0c..376f0965633 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -32,7 +32,7 @@ class pos_invoice(report_sxw.rml_parse):
         self.localcontext.update({
             'time': time,
         })
-        
+
 
     def set_context(self, objects, data, ids, report_type=None):
         super(pos_invoice, self).set_context(objects, data, ids, report_type)
@@ -54,5 +54,5 @@ class pos_invoice(report_sxw.rml_parse):
         self.localcontext['data'] = data
         self.localcontext['objects'] = iids
 
-report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'addons/account/report/invoice.rml', parser= pos_invoice)
+report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'addons/account/report/account_print_invoice.rml', parser= pos_invoice)
 

From b73c26aefbabaa5aef84a15d14e4f08e9ba30b12 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 12:41:05 +0530
Subject: [PATCH 272/632] [REVERT] Account: renaming of rml_parse

bzr revid: mra@mra-laptop-20101005071105-bi7h8ggpl4rgvkh7
---
 addons/account/report/{account_rml_parse.py => rml_parse.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/account/report/{account_rml_parse.py => rml_parse.py} (100%)

diff --git a/addons/account/report/account_rml_parse.py b/addons/account/report/rml_parse.py
similarity index 100%
rename from addons/account/report/account_rml_parse.py
rename to addons/account/report/rml_parse.py

From 29d7b9ad30fea820d1b342d909bbc99786bafa4a Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 5 Oct 2010 12:43:17 +0530
Subject: [PATCH 273/632] [MOD] small changes

bzr revid: vir@tinyerp.com-20101005071317-f4c4fk4ie3zg6lq9
---
 addons/hr_evaluation/hr_evaluation.py   | 9 ++++-----
 addons/hr_recruitment/hr_recruitment.py | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 752028be527..041ec2d1fd8 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -115,12 +115,11 @@ class hr_employee(osv.osv):
         return True
 
     def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
-        evaluation_date = evaluation_date or False
-        evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
-        obj_evaluation = self.pool.get('hr_evaluation.evaluation')
         if context is None:
             context = {}
         if evaluation_plan_id:
+            evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
+            obj_evaluation = self.pool.get('hr_evaluation.evaluation')
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
             if not evaluation_date:
@@ -192,11 +191,11 @@ class hr_evaluation(osv.osv):
         return res
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
-        employee_obj=self.pool.get('hr.employee')
         if context is None:
             context = {}
-        evaluation_plan_id=''
+        evaluation_plan_id=False
         if employee_id:
+            employee_obj=self.pool.get('hr.employee')
             for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
                 if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
                     evaluation_plan_id=employee.evaluation_plan_id.id
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index fbb1287afb4..e589a81bde7 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -181,15 +181,15 @@ class hr_applicant(crm.crm_case, osv.osv):
     }
 
     def onchange_job(self,cr, uid, ids, job, context=None):
-        job_obj = self.pool.get('hr.job')
         if context is None:
             context = {}
         result = {}
 
         if job:
+            job_obj = self.pool.get('hr.job')
             result['department_id'] = job_obj.browse(cr, uid, job, context=context).department_id.id
             return {'value': result}
-        return {'value': {'department_id': []}}
+        return {'value': {'department_id': False}}
 
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage

From c841c95c3998c1c6d6b1ac6c93699937f098db4f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 5 Oct 2010 12:57:09 +0530
Subject: [PATCH 274/632] [IMP]:improved for pagecount

bzr revid: apa@tinyerp.com-20101005072709-y8sl7zq4ctxcgryn
---
 .../base/report/custom_default_printscreen.xsl    |  2 --
 bin/report/interface.py                           |  2 ++
 bin/report/render/rml2pdf/trml2pdf.py             | 15 ++++++++++-----
 bin/report/report_sxw.py                          |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/report/custom_default_printscreen.xsl b/bin/addons/base/report/custom_default_printscreen.xsl
index 46bcb0b843a..b8b30222953 100644
--- a/bin/addons/base/report/custom_default_printscreen.xsl
+++ b/bin/addons/base/report/custom_default_printscreen.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//header-date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines size="8">1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
diff --git a/bin/report/interface.py b/bin/report/interface.py
index 0ee9f432883..4d565bb2003 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -174,6 +174,8 @@ class report_rml(report_int):
         return xml
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
+        if not localcontext:
+            localcontext={'header':False}
         if logo:
             self.bin_datas['logo'] = logo
         else:
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index abba6eacd13..51461ec36fc 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -68,8 +68,8 @@ class NumberedCanvas(canvas.Canvas):
             while not self.pages.get(key,False):
                 key = key + 1
         self.setFont("Helvetica", 8)
-        self.drawRightString((self._pagesize[0]-35), (self._pagesize[1]-40),
-            "%(this)i / %(total)i" % {
+        self.drawRightString((self._pagesize[0]-35), (self._pagesize[1]-43),
+            "Page %(this)i of %(total)i" % {
                'this': self._pageNumber+1,
                'total': self.pages.get(key,False),
             }
@@ -820,9 +820,12 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
         self.localcontext = localcontext
+        if not self.localcontext:
+            self.localcontext={'header':'internal'}
         self.images= images
         self.path = path
         self.title = title
+
         if not node.get('pageSize'):
             pageSize = (utils.unit_get('21cm'), utils.unit_get('29.7cm'))
         else:
@@ -848,7 +851,7 @@ class _rml_template(object):
             except Exception: # FIXME: be even more specific, perhaps?
                 gr=''
             if len(gr):
-                self.image=[ n for n in utils._child_get(gr[0], self) if n.tag=='image' or not self.localcontext]
+#                self.image=[ n for n in utils._child_get(gr[0], self) if n.tag=='image' or not self.localcontext]
                 drw = _rml_draw(self.localcontext,gr[0], self.doc, images=images, path=self.path, title=self.title)
                 self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) ))
             else:
@@ -866,12 +869,14 @@ class _rml_template(object):
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
-            if not self.image:
+            if self.localcontext and self.localcontext.get('header',False) and \
+               (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
                 self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
         if self.localcontext:
             fis.append(PageCount())
-        if not self.image:
+        if self.localcontext and self.localcontext.get('header',False) and \
+           (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
             self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
         else:
             self.doc_tmpl.build(fis)
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 2c505e98622..343806c6625 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -360,6 +360,7 @@ class report_sxw(report_rml, preprocess.report):
         return table_obj.browse(cr, uid, ids, list_class=browse_record_list, context=context, fields_process=_fields_process)
 
     def create(self, cr, uid, ids, data, context=None):
+        context.update({'header':self.header})
         pool = pooler.get_pool(cr.dbname)
         ir_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_obj.search(cr, uid,

From 0fe4e77b57ab3b59a22fb4beb7b61e7d15d553e3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 5 Oct 2010 13:02:21 +0530
Subject: [PATCH 275/632] improve

bzr revid: apa@tinyerp.com-20101005073221-92b343fpetaacum9
---
 bin/report/interface.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 4d565bb2003..0ee9f432883 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -174,8 +174,6 @@ class report_rml(report_int):
         return xml
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
-        if not localcontext:
-            localcontext={'header':False}
         if logo:
             self.bin_datas['logo'] = logo
         else:

From 95242daa1c43f6e085dfbc4823d71749d4846a5d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 13:07:05 +0530
Subject: [PATCH 276/632] [FIX] Remove all warnings from account.py genereated
 by automated test

bzr revid: mra@mra-laptop-20101005073705-by7equhzw54lzkhw
---
 addons/account/account.py | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index e90a8be6841..d46c5f7ac1d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -25,12 +25,9 @@ from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 
 import netsvc
-import pooler
 from osv import fields, osv
 import decimal_precision as dp
-from tools.misc import currency
 from tools.translate import _
-from tools import config
 
 def check_cycle(self, cr, uid, ids):
     """ climbs the ``self._table.parent_id`` chains for 100 levels or
@@ -624,7 +621,6 @@ class account_journal(osv.osv):
     }
 
     def write(self, cr, uid, ids, vals, context=None):
-        obj=[]
         if 'company_id' in vals:
             move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
             if move_lines:
@@ -640,20 +636,9 @@ class account_journal(osv.osv):
         @param context: context arguments, like lang, time zone
         @return: return a result
         """
-
-        journal_type = ('sale', 'sale_refund', 'purchase', 'purchase_refund')
-        journal_seq = {
-            'sale':'seq_out_invoice',
-            'purchase':'seq_in_invoice',
-            'purchase_refund':'seq_out_refund',
-            'sale_refund':'seq_in_refund'
-        }
-
         seq_pool = self.pool.get('ir.sequence')
         seq_typ_pool = self.pool.get('ir.sequence.type')
-        date_pool = self.pool.get('ir.model.data')
 
-        result = True
         name = vals['name']
         code = vals['code'].lower()
 
@@ -924,7 +909,6 @@ class account_period(osv.osv):
         return self.name_get(cr, user, ids, context=context)
 
     def write(self, cr, uid, ids, vals, context={}):
-        obj=[]
         if 'company_id' in vals:
             move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
             if move_lines:
@@ -2332,7 +2316,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
             'parent_id': data[0]['cparent_id'],
             'company_id': company_id,
             }
-        new_account = acc_obj.create(cr, uid, vals)
+        acc_obj.create(cr, uid, vals)
         return {'type':'state', 'state': 'end' }
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -2738,7 +2722,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             if ref_acc_bank.code:
                 try:
                     new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
-                except Exception,e:
+                except:
                     new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
             vals = {
                 'name': tmp,

From 2ebe698dbd1ca6d5e285b9858079076d55f28413 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 13:18:59 +0530
Subject: [PATCH 277/632] [FIX] account voucher report: Remove all warnings
 from genereated by automated test

bzr revid: mra@mra-laptop-20101005074859-cbf4uzfwobvlnzpr
---
 addons/account/report/account_voucher_print.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_voucher_print.py b/addons/account/report/account_voucher_print.py
index db43ea0f50a..7901fd31f6a 100644
--- a/addons/account/report/account_voucher_print.py
+++ b/addons/account/report/account_voucher_print.py
@@ -35,13 +35,11 @@ class report_voucher_move(report_sxw.rml_parse):
             'debit':self.debit,
             'credit':self.credit,
         })
- 	self.user=uid
+ 	self.user = uid
 
     def convert(self, amount):
     	user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0]
-    	cur = user_id.company_id.currency_id.name
-        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur);
-        return amt_en
+        return amount_to_text_en.amount_to_text(amount, 'en', user_id.company_id.currency_id.name)
 
     def get_title(self, voucher):
         title = ''

From 7e09be4b9827997ca31a21d2111843e6705e9ecc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Oct 2010 10:00:17 +0200
Subject: [PATCH 278/632] fix

bzr revid: fp@tinyerp.com-20101005080017-czdp6ddpzqqf589g
---
 bin/addons/base/res/partner/partner_data.xml | 10 +++++-----
 bin/addons/base/res/partner/partner_view.xml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_data.xml b/bin/addons/base/res/partner/partner_data.xml
index 642c4cc46bf..46e9faac130 100644
--- a/bin/addons/base/res/partner/partner_data.xml
+++ b/bin/addons/base/res/partner/partner_data.xml
@@ -3,8 +3,8 @@
     <data noupdate="True">
 
         <!--
-		Resource: res.partner.title
-		-->
+        Resource: res.partner.title
+        -->
         <record id="res_partner_title_pvt_ltd" model="res.partner.title">
             <field name="domain">partner</field>
             <field name="name">Corp.</field>
@@ -49,9 +49,9 @@
             <field name="bank_type_id" ref="bank_normal"/>
         </record>
 
-		<!--
-		Resource: res.request.link
-		-->
+        <!--
+        Resource: res.request.link
+        -->
 
         <record id="req_link_partner" model="res.request.link">
             <field name="name">Partner</field>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index dbe19959445..fcf007deb0f 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -123,7 +123,7 @@
             <field name="act_window_id" ref="action_partner_address_form"/>
         </record>
         <menuitem action="action_partner_address_form" id="menu_partner_address_form"
-            groups="base.group_extended,base.group_system,group_sale_manager,group_sale_salesman"
+            groups="base.group_extended"
             parent="base.menu_address_book" sequence="30"/>
 
         <!--
@@ -207,7 +207,7 @@
             <field name="domain">[('domain','=','partner')]</field>
         </record>
 
-        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" name="Partner Title" parent="menu_config_address_book" sequence="2"/>
+        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" parent="menu_config_address_book" sequence="2"/>
 
         <record id="action_partner_title_contact" model="ir.actions.act_window">
             <field name="name">Contact Titles</field>

From c8afabf6fdc579974e8f7d39b8aa28db7f358ccb Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 5 Oct 2010 14:06:26 +0530
Subject: [PATCH 279/632] improved

bzr revid: apa@tinyerp.com-20101005083626-8km5a3kb8hexmi8d
---
 addons/hr_attendance/report/hr_custom_default.xsl | 4 ----
 addons/hr_holidays/report/hr_custom_default.xsl   | 4 ----
 addons/hr_timesheet/report/custom_default.xsl     | 4 ----
 addons/mrp/report/custom_default.xsl              | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/addons/hr_attendance/report/hr_custom_default.xsl b/addons/hr_attendance/report/hr_custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_attendance/report/hr_custom_default.xsl
+++ b/addons/hr_attendance/report/hr_custom_default.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
@@ -23,8 +21,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
  </xsl:template>
diff --git a/addons/hr_holidays/report/hr_custom_default.xsl b/addons/hr_holidays/report/hr_custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_holidays/report/hr_custom_default.xsl
+++ b/addons/hr_holidays/report/hr_custom_default.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
@@ -23,8 +21,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
  </xsl:template>
diff --git a/addons/hr_timesheet/report/custom_default.xsl b/addons/hr_timesheet/report/custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_timesheet/report/custom_default.xsl
+++ b/addons/hr_timesheet/report/custom_default.xsl
@@ -9,8 +9,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="13.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
 	</xsl:template>
@@ -23,8 +21,6 @@
         <drawString x="1.3cm" y="19.5cm"><xsl:value-of select="//report/header/date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="27.8cm" y="19.5cm"><xsl:value-of select="//report/header/company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="28.4cm" y="19.5cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 19.3cm 28.5cm 19.3cm</lines>
  </xsl:template>
diff --git a/addons/mrp/report/custom_default.xsl b/addons/mrp/report/custom_default.xsl
index 103128eb9f4..aa5eb22d8e0 100644
--- a/addons/mrp/report/custom_default.xsl
+++ b/addons/mrp/report/custom_default.xsl
@@ -19,8 +19,6 @@
         <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
 
@@ -35,8 +33,6 @@
         <drawString x="1.3cm" y="28.3cm"><xsl:value-of select="//date"/></drawString>
         <setFont name="DejaVu Sans Bold" size="10"/>
         <drawString x="9.8cm" y="28.3cm"><xsl:value-of select="//company"/></drawString>
-        <setFont name="DejaVu Sans" size="8"/>
-        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> /  </drawRightString>
         <stroke color="#000000"/>
         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
  </xsl:template>

From 7012daac7f820810600e90fe9f2c17921419ce17 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 14:39:26 +0530
Subject: [PATCH 280/632] [REF]

bzr revid: mra@mra-laptop-20101005090926-saxsj86yl40229u0
---
 addons/account_voucher/wizard/account_statement_from_invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 926647afae1..eaac705031b 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -128,7 +128,7 @@ class account_statement_from_invoice(osv.osv_memory):
         'line_ids': fields.many2many('account.move.line', 'account_move_line_relation', 'move_id', 'line_id', 'Invoices'),
     }
     _defaults = {
-        'date':lambda *a: time.strftime('%Y-%m-%d'),
+        'date': time.strftime('%Y-%m-%d'),
     }
 
     def search_invoices(self, cr, uid, ids, context=None):

From 9ea6b85f745ddac46ccbd3ec76fb145649f1def6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 14:51:42 +0530
Subject: [PATCH 281/632] [IMP] stock: Improve set the groups for Configuration
 menu

bzr revid: sbh@tinyerp.com-20101005092142-oqio0u9lg59xf1f2
---
 addons/stock/stock_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bc4f7b2ab67..0979341dd63 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" parent="" groups="group_stock_manager" sequence="5"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,base.group_extended"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" groups="group_stock_manager,group_stock_user" sequence="5"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,group_stock_user,base.group_extended"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager,base.group_system"/>
-        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="base.group_system"/>
+        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager,base.group_system"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
@@ -508,7 +508,7 @@
             <field name="search_view_id" ref="view_location_search"/>
             <field name="context">{'full':1, 'search_default_in_location':1}</field>
         </record>
-        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system"/>
+        <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system,group_stock_manager"/>
 
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
@@ -568,7 +568,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_warehouse_tree"/>
         </record>
-        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="base.group_system"/>
+        <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager,base.group_system"/>
 
         <record id="stock_picking_move_wizard_form" model="ir.ui.view">
             <field name="name">stock.picking.move.wizard.form</field>
@@ -2053,7 +2053,7 @@
         <menuitem
             action="action_stock_journal_form"
             id="menu_action_stock_journal_form"
-            groups="base.group_extended"
+            groups="group_stock_manager,base.group_extended"
             parent="menu_warehouse_config" />
 
     </data>

From 5edaa42c3f889bae8770428b679d057aacfa5a9e Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 14:57:02 +0530
Subject: [PATCH 282/632] [FIX] Fixes users right, model name.

bzr revid: vda@tinyerp.com-20101005092702-28d10t9idqvk0kcw
---
 bin/addons/base/res/res_widget.py            |  6 ++--
 bin/addons/base/res/res_widget_data.xml      |  2 +-
 bin/addons/base/res/res_widget_view.xml      | 32 +++++++++++---------
 bin/addons/base/security/base_security.xml   |  4 +++
 bin/addons/base/security/ir.model.access.csv |  4 ++-
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index d59975b5e8a..2cddaa73ca8 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -21,10 +21,10 @@
 
 from osv import fields,osv
 
-class openerp_feedback(osv.osv):
-    _name = "twitter.widget"
+class res_widget(osv.osv):
+    _name = "res.widget"
     _columns = {
                 'title' : fields.char('Title', size=64,help="ABC"),
                 'content': fields.text('Content')
                 }
-openerp_feedback()
\ No newline at end of file
+res_widget()
\ No newline at end of file
diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index eaaf0ff3869..b4e110b21cc 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record id="openerp_twitter_favorites" model="twitter.widget">
+    <record id="openerp_twitter_favorites" model="res.widget">
       <field name="title">OpenERP Favorites</field>
       <field name="content"><![CDATA[
 <script type="text/javascript" src="http://widgets.twimg.com/j/2/widget.js"></script>
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 0002ae08020..690d456691c 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="twitter_widget_form" model="ir.ui.view">
-            <field name="name">twitter.widget.form</field>
-            <field name="model">twitter.widget</field>
+        <record id="res_widget_form" model="ir.ui.view">
+            <field name="name">res.widget.form</field>
+            <field name="model">res.widget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="OpenERP Feedback">
+                <form string="OpenERP Favourites">
                     <field name="title"/>
                     <field name="content"/>
                 </form>
             </field>
         </record>
-        <record id="twitter_widget_tree" model="ir.ui.view">
-            <field name="name">twitter.widget.tree</field>
-            <field name="model">twitter.widget</field>
+        <record id="res_widget_tree" model="ir.ui.view">
+            <field name="name">res.widget.tree</field>
+            <field name="model">res.widget</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="OpenERP Feedback">
+                <tree string="OpenERP Favourites">
                     <field name="title"/>
                 </tree>
             </field>
         </record>
 
-        <record id="twitter_widget_act_window" model="ir.actions.act_window">
-            <field name="name">OpenERP Feedback</field>
-            <field name="res_model">twitter.widget</field>
+        <record id="res_widget_act_window" model="ir.actions.act_window">
+            <field name="name">OpenERP Favourites</field>
+            <field name="res_model">res.widget</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="twitter_widget_tree"/>
+            <field name="view_id" ref="res_widget_tree"/>
         </record>
+        
         <menuitem
-            action="twitter_widget_act_window"
-            id="menu_twitter_widget_act_window"
-            parent="base.menu_users"/>
+            action="res_widget_act_window"
+            id="menu_res_widget_act_window"
+            parent="base.menu_users"
+            />
     </data>
 </openerp>
diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index d7d39ea27e9..016204e7241 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -8,6 +8,10 @@
     <record model="res.groups" id="group_system">
         <field name="name">Administration / Configuration</field>
     </record>
+    
+    <!--<record model="res.groups" id="group_widget">
+        <field name="name">Administration / Widget</field>
+    </record> -->
 
     <record model="res.groups" id="group_erp_manager">
         <field name="name">Administration / Access Rights</field>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 76f525a613c..a8144a44834 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -120,4 +120,6 @@
 "access_ir_filter employee","ir_filters employee","model_ir_filters","group_user",1,1,1,1
 "access_ir_filters","ir_filters_all","model_ir_filters",,1,1,1,1
 "access_res_partner_address","res.partner.address","model_res_partner_address","group_system",1,1,1,1
-"access_res_widget","res.widget","model_twitter_widget","group_erp_manager",1,1,1,1
+"access_res_widget","res.widget","model_res_widget","group_erp_manager",1,1,1,1
+"access_res_widget_user","res.widget.user","model_res_widget",,1,0,0,0
+

From 139269c5c8ad182afbb8286b6d02ba6b09ac21bc Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 14:58:47 +0530
Subject: [PATCH 283/632] [IMP] stock: set the multi_company group on company
 filter

bzr revid: sbh@tinyerp.com-20101005092847-81m7ec0cesm5vt4b
---
 addons/stock/report/report_stock_move_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a4c1e2a7c6b..3708bafb612 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -204,7 +204,7 @@
                     <filter name="group_product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                      <filter name="group_lot" string="Lot" context="{'group_by':'prodlot_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter name="group_company" string="Company" context="{'group_by':'company_id'}"/>
+                    <filter name="group_company" string="Company" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>

From 6b4820d9baa99634ea6e611afaa3e20db4386a70 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Tue, 5 Oct 2010 15:02:44 +0530
Subject: [PATCH 284/632] [IMP]:Partner_Balance report

bzr revid: jni@tinyerp.com-20101005093244-59nlh8yp253s9ii2
---
 addons/account/test/account_report.yml | 63 +++++++++++++-------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 79fa915d8d6..4bc3b807d28 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -1,6 +1,6 @@
 -
   In order to test the PDF reports defined on an invoice, we will print an Invoice Report
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
@@ -9,7 +9,7 @@
 
 -
   In order to test the PDF reports defined on a partner, we will print the Overdue Report
-- 
+-
   !python {model: res.partner}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
@@ -18,7 +18,7 @@
 
 -
   In order to test the PDF reports defined on Account Move, we will print the Voucher Report
-- 
+-
   !python {model: account.move}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
@@ -33,7 +33,7 @@
     sign : 10.00
 -
  Print Tax Code entries report
-- 
+-
   !python {model: account.tax.code}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account_tax_code_0')], {}, {})
@@ -53,7 +53,7 @@
 
 -
   In order to test the PDF reports defined on an invoice, we will print an invoice
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
@@ -86,9 +86,9 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'initial_balance': 1, 'periods': period_list,'journal_ids':journal_ids, 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : query_line, 'result_selection': 'customer','direction_selection': 'past','fiscalyear_id':fy_id}}
     data_dict['form'].update(res)
     (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {})
@@ -124,10 +124,10 @@
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal.'+format), 'wb+').write(data)
-    
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':[ref('account.bal'),ref('account.gpf')]})
-    
+
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal-menu.'+format), 'wb+').write(data)
@@ -147,16 +147,16 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
-       
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':journal_period_ids})
-    
+
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal-menu.'+format), 'wb+').write(data)
@@ -169,13 +169,13 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'ir.ui.menu','id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
     (data, format) = netsvc.LocalService('report.account.general.journal').create(cr, uid, journal_period_ids, data_dict, {})
@@ -191,15 +191,15 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query': query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
@@ -219,15 +219,15 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
@@ -254,17 +254,17 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'sort_selection': 'date','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-print_journal.'+format), 'wb+').write(data)
-       
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':journal_period_ids})
-    
+
     (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-print_journal-menu.'+format), 'wb+').write(data)
@@ -277,16 +277,17 @@
     fy_id = ref('account.data_fiscalyear')
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-
+    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
-    (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, [], data_dict, {})
+
+    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'active_ids':journal_period_ids,'display_partner': 'all','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
+    (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-partner_balance.'+format), 'wb+').write(data)
 
@@ -304,9 +305,9 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': True,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
@@ -326,7 +327,7 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': False,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger_other').create(cr, uid, [], data_dict, {})

From ceedb2fc81a3131a9c27ace460c52dfe106476f9 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 15:03:01 +0530
Subject: [PATCH 285/632] [FIX] Remove unnecessary code.

bzr revid: vda@tinyerp.com-20101005093301-4t0dzqhivdmqwng1
---
 bin/addons/base/res/res_widget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 2cddaa73ca8..80706084df1 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -24,7 +24,7 @@ from osv import fields,osv
 class res_widget(osv.osv):
     _name = "res.widget"
     _columns = {
-                'title' : fields.char('Title', size=64,help="ABC"),
+                'title' : fields.char('Title', size=64),
                 'content': fields.text('Content')
                 }
 res_widget()
\ No newline at end of file

From a23c020583840c2f451f2a6cb00b12fe002b8b67 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 5 Oct 2010 11:45:29 +0200
Subject: [PATCH 286/632] [IMP] report engine: decimal precision can now be
 passed to formatLang. digits argument has an upper precedence

bzr revid: olt@tinyerp.com-20101005094529-bkavp9g994lflx3u
---
 bin/report/report_sxw.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 2c505e98622..efde8cb036f 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -253,7 +253,7 @@ class rml_parse(object):
             if ids:
                 d = decimal_precision_obj.browse(self.cr, self.uid, ids)[0].digits
         elif obj and f:
-            res_digits = getattr(obj._columns[f], 'digits', lambda x: ((16,DEFAULT_DIGITS)))
+            res_digits = getattr(obj._columns[f], 'digits', lambda x: ((16, DEFAULT_DIGITS)))
             if isinstance(res_digits, tuple):
                 d = res_digits[1]
             else:
@@ -264,9 +264,18 @@ class rml_parse(object):
                 d = obj._field.digits[1] or DEFAULT_DIGITS
         return d
 
-    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
+    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False):
+        """
+            Assuming 'Account' decimal.precision=3:
+                formatLang(value, digits=4) -> digits=4
+                formatLang(value, dp='Account') -> digits=3 ('Account' decimal.precision=3)
+                formatLang(value, digits=5, dp='Account') -> digits=5
+        """
         if digits is None:
-            digits = self.get_digits(value)
+            if dp:
+                digits = self.get_digits(dp=dp)
+            else:
+                digits = self.get_digits(value)
 
         if isinstance(value, (str, unicode)) and not value:
             return ''

From 33fa22f0ff5d3dc5bab99620831a2c268a91835f Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 5 Oct 2010 15:16:15 +0530
Subject: [PATCH 287/632] [FIX] account: total doesn't sum the initial balance
 in partner ledger report

bzr revid: psi@tinyerp.co.in-20101005094615-hf3g6nmbn90e3hr9
---
 .../account/report/account_partner_ledger.py  | 241 ++++++++++--------
 1 file changed, 140 insertions(+), 101 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 3317c26de57..5df50566b0d 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -35,8 +35,8 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             'lines': self.lines,
             'sum_debit_partner': self._sum_debit_partner,
             'sum_credit_partner': self._sum_credit_partner,
-            'sum_debit': self._sum_debit,
-            'sum_credit': self._sum_credit,
+#            'sum_debit': self._sum_debit,
+#            'sum_credit': self._sum_credit,
             'get_currency': self._get_currency,
             'comma_me' : self.comma_me,
             'get_start_period': self.get_start_period,
@@ -185,10 +185,29 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             move_state = ['posted']
 
         result_tmp = 0.0
+        result_init = 0.0
         if self.reconcil :
             RECONCILE_TAG = " "
         else:
             RECONCILE_TAG = "AND reconcile_id IS NULL"
+        if self.initial_balance:
+            self.cr.execute(
+                    "SELECT sum(debit) " \
+                    "FROM account_move_line AS l, " \
+                    "account_move AS m "
+                    "WHERE partner_id = %s" \
+                        "AND m.id = l.move_id " \
+                        "AND m.state IN %s "
+                        "AND account_id IN %s" \
+                        " " + RECONCILE_TAG + " " \
+                        "AND " + self.init_query + " ",
+                    (partner.id, tuple(move_state), tuple(self.account_ids)))
+            contemp = self.cr.fetchone()
+            if contemp != None:
+                result_init = contemp[0] or 0.0
+            else:
+                result_init = result_tmp + 0.0
+
         self.cr.execute(
                 "SELECT sum(debit) " \
                 "FROM account_move_line AS l, " \
@@ -206,7 +225,8 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             result_tmp = contemp[0] or 0.0
         else:
             result_tmp = result_tmp + 0.0
-        return result_tmp
+
+        return result_tmp  + result_init
 
     def _sum_credit_partner(self, partner):
         move_state = ['draft','posted']
@@ -214,10 +234,29 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
             move_state = ['posted']
 
         result_tmp = 0.0
+        result_init = 0.0
         if self.reconcil :
             RECONCILE_TAG = " "
         else:
             RECONCILE_TAG = "AND reconcile_id IS NULL"
+        if self.initial_balance:
+            self.cr.execute(
+                    "SELECT sum(credit) " \
+                    "FROM account_move_line AS l, " \
+                    "account_move AS m  "
+                    "WHERE partner_id = %s" \
+                        "AND m.id = l.move_id " \
+                        "AND m.state IN %s "
+                        "AND account_id IN %s" \
+                        " " + RECONCILE_TAG + " " \
+                        "AND " + self.init_query + " ",
+                    (partner.id, tuple(move_state), tuple(self.account_ids)))
+            contemp = self.cr.fetchone()
+            if contemp != None:
+                result_init = contemp[0] or 0.0
+            else:
+                result_init = result_tmp + 0.0
+
         self.cr.execute(
                 "SELECT sum(credit) " \
                 "FROM account_move_line AS l, " \
@@ -231,111 +270,111 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                 (partner.id, tuple(move_state), tuple(self.account_ids),))
 
         contemp = self.cr.fetchone()
-        if contemp != None:
-            result_tmp = contemp[0] or 0.0
-        else:
-            result_tmp = result_tmp + 0.0
-        return result_tmp
-
-    def _sum_debit(self):
-        move_state = ['draft','posted']
-        if self.target_move == 'posted':
-            move_state = ['posted']
-
-        if not self.ids:
-            return 0.0
-        result_tmp = 0.0
-        result_init = 0.0
-        if self.reconcil :
-            RECONCILE_TAG = " "
-        else:
-            RECONCILE_TAG = "AND reconcile_id IS NULL"
-        if self.initial_balance:
-            self.cr.execute(
-                    "SELECT sum(debit) " \
-                    "FROM account_move_line AS l, " \
-                    "account_move AS m "
-                    "WHERE partner_id IN %s" \
-                        "AND m.id = l.move_id " \
-                        "AND m.state IN %s "
-                        "AND account_id IN %s" \
-                        "AND reconcile_id IS NULL " \
-                        "AND " + self.init_query + " ",
-                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
-            contemp = self.cr.fetchone()
-            if contemp != None:
-                result_init = contemp[0] or 0.0
-            else:
-                result_init = result_tmp + 0.0
-
-        self.cr.execute(
-                "SELECT sum(debit) " \
-                "FROM account_move_line AS l, " \
-                "account_move AS m "
-                "WHERE partner_id IN %s" \
-                    "AND m.id = l.move_id " \
-                    "AND m.state IN %s "
-                    "AND account_id IN %s" \
-                    " " + RECONCILE_TAG + " " \
-                    "AND " + self.query + " " ,
-                    (tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
-        contemp = self.cr.fetchone()
         if contemp != None:
             result_tmp = contemp[0] or 0.0
         else:
             result_tmp = result_tmp + 0.0
         return result_tmp  + result_init
 
-    def _sum_credit(self):
-        move_state = ['draft','posted']
-        if self.target_move == 'posted':
-            move_state = ['posted']
-
-        if not self.ids:
-            return 0.0
-        result_tmp = 0.0
-        result_init = 0.0
-        if self.reconcil :
-            RECONCILE_TAG = " "
-        else:
-            RECONCILE_TAG = "AND reconcile_id IS NULL"
-        if self.initial_balance:
-            self.cr.execute(
-                    "SELECT sum(credit) " \
-                    "FROM account_move_line AS l, " \
-                    "account_move AS m  "
-                    "WHERE partner_id IN %s" \
-                        "AND m.id = l.move_id " \
-                        "AND m.state IN %s "
-                        "AND account_id IN %s" \
-                        "AND reconcile_id IS NULL " \
-                        "AND " + self.init_query + " ",
-                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
-            contemp = self.cr.fetchone()
-            if contemp != None:
-                result_init = contemp[0] or 0.0
-            else:
-                result_init = result_tmp + 0.0
-
-        self.cr.execute(
-                "SELECT sum(credit) " \
-                "FROM account_move_line AS l, " \
-                "account_move AS m "
-                "WHERE partner_id  IN %s" \
-                    "AND m.id = l.move_id " \
-                    "AND m.state IN %s "
-                    "AND account_id IN %s" \
-                    " " + RECONCILE_TAG + " " \
-                    "AND " + self.query + " " ,
-                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
-        contemp = self.cr.fetchone()
-        if contemp != None:
-            result_tmp = contemp[0] or 0.0
-        else:
-            result_tmp = result_tmp + 0.0
-
-        return result_tmp  + result_init
+    # code is deprecated
+#    def _sum_debit(self):
+#        move_state = ['draft','posted']
+#        if self.target_move == 'posted':
+#            move_state = ['posted']
 #
+#        if not self.ids:
+#            return 0.0
+#        result_tmp = 0.0
+#        result_init = 0.0
+#        if self.reconcil :
+#            RECONCILE_TAG = " "
+#        else:
+#            RECONCILE_TAG = "AND reconcile_id IS NULL"
+#        if self.initial_balance:
+#            self.cr.execute(
+#                    "SELECT sum(debit) " \
+#                    "FROM account_move_line AS l, " \
+#                    "account_move AS m "
+#                    "WHERE partner_id IN %s" \
+#                        "AND m.id = l.move_id " \
+#                        "AND m.state IN %s "
+#                        "AND account_id IN %s" \
+#                        "AND reconcile_id IS NULL " \
+#                        "AND " + self.init_query + " ",
+#                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
+#            contemp = self.cr.fetchone()
+#            if contemp != None:
+#                result_init = contemp[0] or 0.0
+#            else:
+#                result_init = result_tmp + 0.0
+#
+#        self.cr.execute(
+#                "SELECT sum(debit) " \
+#                "FROM account_move_line AS l, " \
+#                "account_move AS m "
+#                "WHERE partner_id IN %s" \
+#                    "AND m.id = l.move_id " \
+#                    "AND m.state IN %s "
+#                    "AND account_id IN %s" \
+#                    " " + RECONCILE_TAG + " " \
+#                    "AND " + self.query + " " ,
+#                    (tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
+#        contemp = self.cr.fetchone()
+#        if contemp != None:
+#            result_tmp = contemp[0] or 0.0
+#        else:
+#            result_tmp = result_tmp + 0.0
+#        return result_tmp  + result_init
+#
+#    def _sum_credit(self):
+#        move_state = ['draft','posted']
+#        if self.target_move == 'posted':
+#            move_state = ['posted']
+#
+#        if not self.ids:
+#            return 0.0
+#        result_tmp = 0.0
+#        result_init = 0.0
+#        if self.reconcil :
+#            RECONCILE_TAG = " "
+#        else:
+#            RECONCILE_TAG = "AND reconcile_id IS NULL"
+#        if self.initial_balance:
+#            self.cr.execute(
+#                    "SELECT sum(credit) " \
+#                    "FROM account_move_line AS l, " \
+#                    "account_move AS m  "
+#                    "WHERE partner_id IN %s" \
+#                        "AND m.id = l.move_id " \
+#                        "AND m.state IN %s "
+#                        "AND account_id IN %s" \
+#                        "AND reconcile_id IS NULL " \
+#                        "AND " + self.init_query + " ",
+#                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
+#            contemp = self.cr.fetchone()
+#            if contemp != None:
+#                result_init = contemp[0] or 0.0
+#            else:
+#                result_init = result_tmp + 0.0
+#
+#        self.cr.execute(
+#                "SELECT sum(credit) " \
+#                "FROM account_move_line AS l, " \
+#                "account_move AS m "
+#                "WHERE partner_id  IN %s" \
+#                    "AND m.id = l.move_id " \
+#                    "AND m.state IN %s "
+#                    "AND account_id IN %s" \
+#                    " " + RECONCILE_TAG + " " \
+#                    "AND " + self.query + " " ,
+#                    (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
+#        contemp = self.cr.fetchone()
+#        if contemp != None:
+#            result_tmp = contemp[0] or 0.0
+#        else:
+#            result_tmp = result_tmp + 0.0
+#        return result_tmp  + result_init
+
     def _get_partners(self):
         if self.result_selection == 'customer':
             return 'Receivable Accounts'

From 9ad4df7f1629ad48a948e01c27781553bd92dc1e Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 5 Oct 2010 11:47:55 +0200
Subject: [PATCH 288/632] [IMP] report engine: decimal precision can now be
 passed to formatLang (changed the docstring)

bzr revid: olt@tinyerp.com-20101005094755-edh3p1hx6v1pg01f
---
 bin/report/report_sxw.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index efde8cb036f..3cd448eac58 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -267,8 +267,9 @@ class rml_parse(object):
     def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False):
         """
             Assuming 'Account' decimal.precision=3:
+                formatLang(value) -> digits=2 (default)
                 formatLang(value, digits=4) -> digits=4
-                formatLang(value, dp='Account') -> digits=3 ('Account' decimal.precision=3)
+                formatLang(value, dp='Account') -> digits=3
                 formatLang(value, digits=5, dp='Account') -> digits=5
         """
         if digits is None:

From c5a6c50c1d48e3eb4b5a40a0cdf2cfe798a2b487 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 5 Oct 2010 15:30:54 +0530
Subject: [PATCH 289/632] [IMP] sale,sale_journal:-improvements in the security
 access rights

bzr revid: mtr@mtr-20101005100054-m64tzbfrjlz3i2d1
---
 addons/sale/sale_view.xml                 | 7 ++++---
 addons/sale/security/sale_security.xml    | 4 ++++
 addons/sale_journal/sale_journal_view.xml | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index db1818602ce..b30aacaa1fa 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+            
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager"/>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
@@ -48,7 +49,7 @@
 
         <menuitem action="action_shop_form" id="menu_action_shop_form"
             parent="product.prod_config_main" sequence="0"
-            groups="base.group_extended"/>
+            groups="base.group_extended,base.group_sale_manager"/>
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -293,7 +294,7 @@ orders, purchases, etc. It support several invoicing methods according
 to your configuration: from the sales order, from the pickings, etc.
             </field>
         </record>
-        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
+        <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <record id="action_order_tree2" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -517,7 +518,7 @@ to your configuration: from the sales order, from the pickings, etc.
         groups="base.group_extended"/>
 
         <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
-        <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
+        <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 19da6a6f81f..36a8fc15118 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -12,6 +12,10 @@
     <record model="ir.ui.menu" id="base.menu_base_partner">
         <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
     </record>
+    
+    <record model="ir.ui.menu" id="base.menu_base_config">
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
+    </record>
 
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="name">Sale Order multi-company</field>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 8a8eb0d2c1e..8c9103d25f0 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,9 +1,9 @@
 <openerp>
    <data>
         <menuitem id="base.menu_base_config" name="Configuration" parent="base.menu_base_partner" sequence="30"
-            groups="base.group_system,base.group_sale_salesman"/>
+            groups="base.group_sale_salesman,base.group_system,base.group_sale_manager"/>
         <menuitem id="menu_sale_journal_config" name="Sale Journals"
-            parent="base.menu_base_config" sequence="5" groups="base.group_system,base.group_sale_salesman"/>
+            parent="base.menu_base_config" sequence="5" groups="base.group_sale_salesman"/>
 
    <!--  sale journal invoice Type's Form  view -->
 

From f5d26f67a5e6ddbdce7e0d7113fad38e21de122d Mon Sep 17 00:00:00 2001
From: "SAZ(OpenERP)" <>
Date: Tue, 5 Oct 2010 15:33:00 +0530
Subject: [PATCH 290/632] [IMP]: Balance_Sheet and Profit and Loss report

bzr revid: jni@tinyerp.com-20101005100300-14sob7ga4csootz4
---
 addons/account/report/account_balance_sheet_horizontal.rml | 2 +-
 addons/account/report/account_profit_horizontal.rml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index a1f7b25d379..5edd2ffe021 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -233,7 +233,7 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
         </td>
      </tr>
      </blockTable>
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index d55b2e93a43..203c6c9f02c 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -240,7 +240,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
           </td>
         </tr>
       </blockTable>

From c76794e0bb40ff998559830cfb8ea17580787218 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 15:36:06 +0530
Subject: [PATCH 291/632] [FIX] Link colors according to OpenERP web links.

bzr revid: vda@tinyerp.com-20101005100606-1o1rrm9heb2eg7qe
---
 bin/addons/base/res/res_widget_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index b4e110b21cc..4ee85646b04 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -23,7 +23,7 @@ new TWTR.Widget({
     tweets: {
       background: '#F0EEEE',
       color: '#444444',
-      links: '#43c43f'
+      links: '#9A0404'
     }
   },
   features: {

From e6a783697795cb0b30400fd3c4f2f2468a6a0ac1 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 5 Oct 2010 15:53:05 +0530
Subject: [PATCH 292/632] [IMP] point_of_sale: Improvements in access rules.

bzr revid: uco@tinyerp.com-20101005102305-d59h5o83g5btb034
---
 addons/point_of_sale/pos_view.xml                        | 6 +++---
 addons/point_of_sale/security/ir.model.access.csv        | 9 ++++++---
 addons/point_of_sale/security/point_of_sale_security.xml | 8 ++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 17420b1ffe9..7453682f566 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -706,7 +706,7 @@
         </record>
 
         <menuitem name="Configuration" parent="menu_point_root"
-            id="menu_point_config_product" sequence="25" groups="base.group_system"/>
+            id="menu_point_config_product" sequence="25" groups="base.group_system,group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_input">
             <field name="name">Products</field>
@@ -732,7 +732,7 @@
                     parent="menu_point_config_product"
                     action="action_product_input"
                     id="products_for_input_operations"
-                    groups="base.group_system"/>
+                    groups="base.group_system,group_pos_manager"/>
 
         <record model="ir.actions.act_window" id="action_product_output">
             <field name="name">Products</field>
@@ -758,7 +758,7 @@
                     parent="menu_point_config_product"
                     action="action_product_output"
                     id="products_for_output_operations"
-                    groups="base.group_system"/>
+                    groups="base.group_system,group_pos_manager"/>
 
         <menuitem
             name="Input Operations" parent="menu_point_of_sale"
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 8587ef07683..32b48c2a0e3 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -3,7 +3,7 @@
 "access_pos_order","pos.order","model_pos_order","group_pos_user",1,1,1,1
 "access_pos_order_line","pos.order.line","model_pos_order_line","group_pos_user",1,1,1,1
 "access_pos_order_manager","pos.order manager","model_pos_order","group_pos_manager",1,0,0,0
-"access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,1,1,1
+"access_pos_order_line_manager","pos.order.line manager","model_pos_order_line","group_pos_manager",1,0,0,0
 "access_report_transaction_pos","report.transaction.pos","model_report_transaction_pos","group_pos_manager",1,1,1,1
 "access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
 "access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,1,1,0
@@ -37,14 +37,16 @@
 "access_account_cashbox_line_manager","account.cashbox.line manager","account.model_account_cashbox_line","group_pos_manager",1,1,1,1
 "access_product_product","product.product","product.model_product_product","group_pos_user",1,0,0,0
 "access_product_template_pos_user","product.template pos user","product.model_product_template","group_pos_user",1,0,0,0
-"access_product_product_pos_manager","product.product.pos manager","product.model_product_product","group_pos_manager",1,0,0,0
-"access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,0,0,0
+"access_product_product_pos_manager","product.product.pos manager","product.model_product_product","group_pos_manager",1,1,1,1
+"access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,1,1,1
 "access_account_move_line","account.move.line","account.model_account_move_line","group_pos_user",1,1,1,0
 "access_account_move_line_manager","account.move.line manager","account.model_account_move_line","group_pos_manager",1,1,1,1
 "access_account_move","account.move","account.model_account_move","group_pos_user",1,1,1,0
 "access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
 "access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
 "access_account_journal_system","account.journal system","account.model_account_journal","base.group_system",1,0,0,0
+"access_account_journal_period_user","account.journal.period user","account.model_account_journal_period","group_pos_user",1,1,1,1
+"access_account_journal_period_manager","account.journal.period manager","account.model_account_journal_period","group_pos_manager",1,0,0,0
 "access_account_journal_view","account.journal.view","account.model_account_journal_view","group_pos_user",1,1,1,0
 "access_account_journal_view_manager","account.journal.view manager","account.model_account_journal_view","group_pos_manager",1,0,0,0
 "access_account_journal_view_system","account.journal.view system","account.model_account_journal_view","base.group_system",1,0,0,0
@@ -56,6 +58,7 @@
 "access_report_check_register","report.cash.register","model_report_cash_register","group_pos_manager",1,1,1,1
 "access_product_product_pos","product.product.pos","product.model_product_product","base.group_system",1,0,0,0
 "access_product_template_pos","product.template pos","product.model_product_template","base.group_system",1,1,1,1
+"access_ir_property_pos_manager","ir.property manager","base.model_ir_property","group_pos_manager",1,1,1,1
 "access_pos_order_system","pos.order system","model_pos_order","base.group_system",1,0,0,0
 "access_pos_order_line_system","pos.order.line system","model_pos_order_line","base.group_system",1,0,0,0
 "access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,1,1,1
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index d70fd1caa85..c5c879fa3d3 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -8,6 +8,14 @@
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
+    
+    <record model="ir.rule" id="pos_cash_statement_rule">
+        <field name="name">Registers</field>
+        <field name="model_id" search="[('model','=','account.bank.statement')]" model="ir.model"/>
+        <field name="global" eval="False"/>
+        <field name="domain_force">[('user_id','=',[user.id])]</field>
+        <field name="groups" eval="[(6, 0, [ref('group_pos_user')])]"/>
+    </record>
 
 </data>
 </openerp>

From 892045e51b0ff83aa1eed88b106274f4f80c0fdc Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 5 Oct 2010 15:56:02 +0530
Subject: [PATCH 293/632] [FIX] Remove warning from
 account/report/account_voucher_print.py genereated by automated test

bzr revid: psi@tinyerp.co.in-20101005102602-8vsfdxtdv348nd2a
---
 addons/account/report/account_voucher_print.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_voucher_print.py b/addons/account/report/account_voucher_print.py
index 7901fd31f6a..44587b3e689 100644
--- a/addons/account/report/account_voucher_print.py
+++ b/addons/account/report/account_voucher_print.py
@@ -35,10 +35,10 @@ class report_voucher_move(report_sxw.rml_parse):
             'debit':self.debit,
             'credit':self.credit,
         })
- 	self.user = uid
+        self.user = uid
 
     def convert(self, amount):
-    	user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0]
+        user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0]
         return amount_to_text_en.amount_to_text(amount, 'en', user_id.company_id.currency_id.name)
 
     def get_title(self, voucher):

From 0d5ea8b1427b71b0d6c57de045636d33be002d51 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 16:11:32 +0530
Subject: [PATCH 294/632] [FIX] Account: Refund invoice correct opening of
 refund invoice with correct domain

bzr revid: mra@mra-laptop-20101005104132-wrc0vdeg7dgyk5hh
---
 addons/account/wizard/account_invoice_refund.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 4e74774ce58..c7e75f205f8 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -202,14 +202,11 @@ class account_invoice_refund(osv.osv_memory):
                                 inv_obj.write(cr, uid, [inv_id], data['value'])
                         created_inv.append(inv_id)
 
-            if inv.type == 'out_invoice':
-                xml_id = 'action_invoice_tree1'
-            elif inv.type == 'in_invoice':
-                xml_id = 'action_invoice_tree2'
-            elif inv.type == 'out_refund':
+            if inv.type in ('out_invoice', 'out_refund'):
                 xml_id = 'action_invoice_tree3'
             else:
                 xml_id = 'action_invoice_tree4'
+
             result = mod_obj._get_id(cr, uid, 'account', xml_id)
             id = mod_obj.read(cr, uid, result, ['res_id'], context=context)['res_id']
             result = act_obj.read(cr, uid, id, context=context)

From 31680ea2589481693e348636b572841de95bd871 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 5 Oct 2010 16:16:26 +0530
Subject: [PATCH 295/632] [FIX] base: cr.close() before return on login

bzr revid: hmo@tinyerp.com-20101005104626-mfb50prd55ljpyy0
---
 bin/addons/base/res/res_user.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 929a7018f7d..d2d44039f80 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -423,14 +423,13 @@ class users(osv.osv):
         cr = pooler.get_db(db).cursor()
         cr.execute('select id from res_users where login=%s and password=%s and active', (tools.ustr(login), tools.ustr(password)))
         res = cr.fetchone()
-
+        result = False
         if res:
             cr.execute("update res_users set date=%s where id=%s", (time.strftime('%Y-%m-%d %H:%M:%S'),res[0]))
             cr.commit()
-            return res[0]
-        else:
-            return False
+            result = res[0]
         cr.close()
+        return result
     def check_super(self, passwd):
         if passwd == tools.config['admin_passwd']:
             return True

From 55da21f5b634485b520adc10e2f5afc60ce231aa Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 5 Oct 2010 16:17:59 +0530
Subject: [PATCH 296/632] [FIX] base : _get_group() method corrected

bzr revid: ach@tinyerp.com-20101005104759-2mdxxuu4emvwc785
---
 bin/addons/base/res/res_user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d2d44039f80..e5927fe2ac1 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -328,8 +328,8 @@ class users(osv.osv):
 
     def _get_group(self,cr, uid, context=None):
         dataobj = self.pool.get('ir.model.data')
-        data_id = dataobj._get_id(cr, 1, 'base', 'group_user')
-        return data_id and [data_id] or False
+        dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_user')
+        return [group_id] or False
 
     _defaults = {
         'password' : lambda *a : '',

From 9e41a89fb8424945d080712e76aa6b371997f8ea Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 5 Oct 2010 12:49:59 +0200
Subject: [PATCH 297/632] [IMP] membership: membership analysis + overall
 improvement

bzr revid: qdp-launchpad@tinyerp.com-20101005104959-qb8niv56nm2bdopc
---
 addons/membership/membership.py               |   5 +-
 addons/membership/report/report_membership.py | 139 +++++++++---------
 .../report/report_membership_view.xml         |  47 +++---
 3 files changed, 105 insertions(+), 86 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 7bb84ef9ebb..1e92d3c619b 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -125,7 +125,7 @@ class membership_line(osv.osv):
     _name = 'membership.membership_line'
     _columns = {
         'partner': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=1),
-        'membership_id': fields.many2one('product.product', string="Membership", required=True),
+        'membership_id': fields.many2one('product.product', string="Membership Product", required=True),
         'date_from': fields.date('From', readonly=True),
         'date_to': fields.date('To', readonly=True),
         'date_cancel' : fields.date('Cancel date'),
@@ -133,7 +133,8 @@ class membership_line(osv.osv):
         'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
-        'state': fields.function(_state, method=True, string='State', type='selection', selection=STATE),
+        'state': fields.function(_state, method=True, string='Membership State', type='selection', selection=STATE, store=True),
+        'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True)
     }
     _rec_name = 'partner'
     _order = 'id desc'
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index 1bfdce82404..c4d31354840 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -21,6 +21,18 @@
 
 from osv import fields, osv
 import tools
+import decimal_precision as dp
+
+
+STATE = [
+    ('none', 'Non Member'),
+    ('canceled', 'Cancelled Member'),
+    ('old', 'Old Member'),
+    ('waiting', 'Waiting Member'),
+    ('invoiced', 'Invoiced Member'),
+    ('free', 'Free Member'),
+    ('paid', 'Paid Member'),
+]
 
 
 class report_membership(osv.osv):
@@ -38,27 +50,21 @@ class report_membership(osv.osv):
                                   ('07', 'July'), ('08', 'August'),\
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        'date': fields.datetime('Create Date', readonly=True),                          
-        'canceled_number': fields.integer('Canceled', readonly=True),
-        'waiting_number': fields.integer('Waiting', readonly=True),
-        'invoiced_number': fields.integer('Invoiced', readonly=True),
-        'paid_number': fields.integer('Paid', readonly=True),
-        'canceled_amount': fields.float('Canceled', digits=(16, 2), readonly=True),
-        'waiting_amount': fields.float('Waiting', digits=(16, 2), readonly=True),
-        'invoiced_amount': fields.float('Invoiced', digits=(16, 2), readonly=True),
-        'paid_amount': fields.float('Paid', digits=(16, 2), readonly=True),
-        'currency': fields.many2one('res.currency', 'Currency', readonly=True,
-            select=2),
-            
-        'state':fields.selection([('draft', 'Non Member'),
-                                  ('cancel', 'Cancelled Member'),
-                                    ('done', 'Old Member'),
-                                   ('open', 'Invoiced Member'),
-                                    ('free', 'Free Member'), ('paid', 'Paid Member')], 'State'),
-        'partner_id': fields.many2one('res.partner', 'Members', readonly=True, select=3),
-        'membership_id': fields.many2one('product.product', 'Membership', readonly=True, select=3) 
-                
-
+        'date_from': fields.datetime('Start Date', readonly=True, help="Start membership date"),                          
+        'date_to': fields.datetime('End Date', readonly=True, help="End membership date"),                          
+        'num_canceled': fields.integer('# Canceled', readonly=True),
+        'num_old': fields.integer('# Old', readonly=True),
+        'num_waiting': fields.integer('# Waiting', readonly=True),
+        'num_invoiced': fields.integer('# Invoiced', readonly=True),
+        'num_free': fields.integer('# Free', readonly=True),
+        'num_paid': fields.integer('# Paid', readonly=True),
+        'tot_pending': fields.float('Pending Amount', digits_compute= dp.get_precision('Account'), readonly=True),
+        'tot_earned': fields.float('Earned Amount', digits_compute= dp.get_precision('Account'), readonly=True),            
+        'state':fields.selection(STATE, 'Membership State'),
+        'partner_id': fields.many2one('res.partner', 'Members', readonly=True),
+        'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True),
+        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True)
 }
 
     def init(self, cr):
@@ -68,58 +74,59 @@ class report_membership(osv.osv):
     CREATE OR REPLACE VIEW report_membership AS (
         SELECT
         MIN(id) as id,
-        COUNT(ncanceled) as canceled_number,
-        COUNT(npaid) as paid_number,
-        COUNT(ninvoiced) as invoiced_number,
-        COUNT(nwaiting) as waiting_number,
-        SUM(acanceled) as canceled_amount,
-        SUM(apaid) as paid_amount,
-        SUM(ainvoiced) as invoiced_amount,
-        SUM(awaiting) as waiting_amount,
+        COUNT(num_canceled) as num_canceled,
+        COUNT(num_old) as num_old,
+        COUNT(num_waiting) as num_waiting,
+        COUNT(num_invoiced) as num_invoiced,
+        COUNT(num_free) as num_free,
+        COUNT(num_paid) as num_paid,
+        SUM(tot_pending) as tot_pending,
+        SUM(tot_earned) as tot_earned,
         year,
         month,
-        date,
+        date_from,
+        date_to,
         partner_id,
         membership_id,
-        state,
-        currency
-        
-        FROM (SELECT
-            CASE WHEN ai.state = 'cancel' THEN ml.id END AS ncanceled,
-            CASE WHEN ai.state = 'paid' THEN ml.id END AS npaid,
-            CASE WHEN ai.state = 'open' THEN ml.id END AS ninvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN ml.id END AS nwaiting,
-            CASE WHEN ai.state = 'cancel'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS acanceled,
-            CASE WHEN ai.state = 'paid'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS apaid,
-            CASE WHEN ai.state = 'open'
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS ainvoiced,
-            CASE WHEN (ai.state = 'draft' OR ai.state = 'proforma')
-                THEN SUM(ail.price_unit * ail.quantity * (1 - ail.discount / 100))
-            ELSE 0 END AS awaiting,
+        company_id,
+        user_id,
+        state
+        FROM 
+        (SELECT
+            CASE WHEN ml.state = 'canceled' THEN ml.id END AS num_canceled,
+            CASE WHEN ml.state = 'old'      THEN ml.id END AS num_old,
+            CASE WHEN ml.state = 'waiting'  THEN ml.id END AS num_waiting,
+            CASE WHEN ml.state = 'invoiced' THEN ml.id END AS num_invoiced,
+            CASE WHEN ml.state = 'free'     THEN ml.id END AS num_free,
+            CASE WHEN ml.state = 'paid'     THEN ml.id END AS num_paid,
+            CASE WHEN ml.state IN ('waiting', 'invoiced') THEN SUM(il.price_subtotal) ELSE 0 END AS tot_pending,
+            CASE WHEN ml.state IN ('old', 'paid') THEN SUM(il.price_subtotal) ELSE 0 END AS tot_earned,
             TO_CHAR(ml.date_from, 'YYYY') AS year,
-            TO_CHAR(ml.date_from, 'MM')as month,
-            TO_CHAR(ml.date_from, 'YYYY-MM-DD') as date,
-            ai.partner_id AS partner_id,
-            ai.currency_id AS currency,
-            ai.state as state,
+            TO_CHAR(ml.date_from, 'MM') AS month,
+            TO_CHAR(ml.date_from, 'YYYY-MM-DD') AS date_from,
+            TO_CHAR(ml.date_to, 'YYYY-MM-DD') AS date_to,
+            ml.partner AS partner_id,
             MIN(ml.id) AS id,
-            ml.membership_id AS membership_id
+            ml.membership_id AS membership_id,
+            p.user_id AS user_id,
+            ml.company_id AS company_id,
+            ml.state AS state
             FROM membership_membership_line ml
-            JOIN (account_invoice_line ail
-                LEFT JOIN account_invoice ai
-                ON (ail.invoice_id = ai.id))
-            ON (ml.account_invoice_line = ail.id)
-            JOIN res_partner p
-            ON (ml.partner = p.id)
-            GROUP BY TO_CHAR(ml.date_from, 'YYYY'),  TO_CHAR(ml.date_from, 'MM'), TO_CHAR(ml.date_from, 'YYYY-MM-DD'), ai.state, ai.partner_id,
-            ai.currency_id, ml.id, ml.membership_id) AS foo
-        GROUP BY year, month, date, currency, partner_id, membership_id, state)
+            LEFT JOIN account_invoice_line il ON (ml.account_invoice_line = il.id)
+            LEFT JOIN account_invoice ai ON (il.invoice_id = ai.id)
+            LEFT JOIN res_partner p ON (ml.partner = p.id)
+            GROUP BY 
+                 TO_CHAR(ml.date_from, 'YYYY'),  
+                 TO_CHAR(ml.date_from, 'MM'), 
+                 TO_CHAR(ml.date_from, 'YYYY-MM-DD'), 
+                 TO_CHAR(ml.date_to, 'YYYY-MM-DD'), 
+                 ml.partner,
+                 ml.id, 
+                 p.user_id,
+                 ml.company_id,
+                 ml.state,
+                 ml.membership_id) AS foo
+        GROUP BY year, month, date_from, date_to, partner_id, user_id, membership_id, company_id, state)
                 """)
         
 report_membership()
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 90330a92a55..962345cf1ae 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -12,13 +12,21 @@
                 <tree colors="blue:state in ('draft');black:state in ('open','free');gray:state in ('done','cancel') " string="Membership">
                     <field name="state"/>
                     <field name="partner_id"/>
+                    <field name="user_id"/>
                     <field name="membership_id"/>
-                    <field name="canceled_number"/>
-                    <field name="waiting_number"/>
-                    <field name="invoiced_number"/>
-                    <field name="paid_number"/>
-                    <field name="year"/>
-                    <field name="month"/>
+                    <field name="num_canceled"/>
+                    <field name="num_waiting"/>
+                    <field name="num_invoiced"/>
+                    <field name="tot_pending"/>
+                    <field name="num_paid"/>
+                    <field name="num_old"/>
+                    <field name="tot_earned"/>
+                    <field name="num_free"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="year" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -31,40 +39,43 @@
                 <search string="Membership">
                     <group col="8" colspan="4">
                         <filter string="Last 365 Days" icon="terp-go-year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
                         <filter string="Last 30 Days" icon="terp-go-month" name="month"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
 		                <filter icon="terp-camera_test"
 		                    string="Invoiced"
-		                    domain="[('state','=','open')]"/>
+		                    domain="[('state','=','invoiced')]"/>
 		                <filter icon="terp-check"
                             string="Paid"
                             domain="[('state','=','paid')]"/>
                         <filter icon="terp-gtk-media-pause"
                             string="Waiting"
                             default="1" name="none"
-                            domain="[('state','=', 'draft')]"/>
-    
+                            domain="[('state','=', 'waiting')]"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="12">
-                        <filter string="Members" icon="terp-personal" name="member"
+                    <group expand="1" string="Group By..." colspan="4" col="12">
+                        <filter string="Salesman" icon="terp-personal" name="salesman"
+                            domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" icon="terp-partner" name="partner"
                             domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Memberships" icon="terp-personal" name="membership"
+                        <separator orientation="vertical"/>       
+                        <filter string="Membership Product" icon="terp-product" name="product"
                             domain="[]" context="{'group_by':'membership_id'}"/>    
-                       <filter string="state" icon="terp-stock_effects-object-colorize"
+                        <filter string="Membership State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}"/>
-                                      
+                        <separator orientation="vertical" groups="base.group_multi_company"/>       
+                        <filter string="Company" icon="terp-go-home"
+                            domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>       
                         <filter string="Year" name="year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}"/>
                         <filter string="Month" name="month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}"/>    
-
                     </group>
                 </search>
             </field>
@@ -107,7 +118,7 @@
             <field name="act_window_id" ref="action_report_membership_tree"/>
         </record>
 
-        <menuitem name="Membership" parent="base.menu_report_association"
+        <menuitem name="Membership Analysis" parent="base.menu_report_association"
             action="action_report_membership_tree"
             id="menu_report_membership"/>
 

From a694aff5c0bde00ff7038b9246263ace977a8d95 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 5 Oct 2010 16:24:19 +0530
Subject: [PATCH 298/632] [REF] base : _get_group() method corrected

bzr revid: ach@tinyerp.com-20101005105419-pfzidxgf3yimfs4b
---
 bin/addons/base/res/res_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index e5927fe2ac1..fa3e87aab74 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -329,7 +329,7 @@ class users(osv.osv):
     def _get_group(self,cr, uid, context=None):
         dataobj = self.pool.get('ir.model.data')
         dummy,group_id = dataobj.get_object_reference(cr, 1, 'base', 'group_user')
-        return [group_id] or False
+        return [group_id]
 
     _defaults = {
         'password' : lambda *a : '',

From 4f14f61d006ac51db67bb7fd3f7af05badd7d795 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 5 Oct 2010 16:24:38 +0530
Subject: [PATCH 299/632] [IMP] stock: Improve filter and dashboard action

bzr revid: sbh@tinyerp.com-20101005105438-1deq7glo2u4agjrf
---
 addons/stock/board_warehouse_view.xml          | 8 ++++----
 addons/stock/report/report_stock_move_view.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 1dae20ffec2..8191a53374f 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -30,17 +30,17 @@
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+		    <field name="domain">[('type','=','in')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
          </record>
 		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]</field>	
+		    <field name="domain">[('type','=','out')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
          </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 3708bafb612..cb5ff177050 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -44,7 +44,6 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
-             	 <field name="day" group="True"/>
                  <field name="product_id"/>
                  <field name="day_diff2" operator="+"/>
              </graph>
@@ -63,6 +62,7 @@
                 help="Current year"/>
                 <filter icon="terp-go-month"
                  string="Month-1"
+                 name="month-1"
                  separator="1"
                  domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>

From 489e6ded3924658d9c8d3dfe2e79c040931a464a Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Tue, 5 Oct 2010 16:47:53 +0530
Subject: [PATCH 300/632] [FIX] Removed unnecessary commented code.

bzr revid: vda@tinyerp.com-20101005111753-s54kt87wf1uflmzn
---
 bin/addons/base/security/base_security.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index 016204e7241..d7d39ea27e9 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -8,10 +8,6 @@
     <record model="res.groups" id="group_system">
         <field name="name">Administration / Configuration</field>
     </record>
-    
-    <!--<record model="res.groups" id="group_widget">
-        <field name="name">Administration / Widget</field>
-    </record> -->
 
     <record model="res.groups" id="group_erp_manager">
         <field name="name">Administration / Access Rights</field>

From 794c319ec9864fa404a404066f6e5f5c47272212 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 5 Oct 2010 16:56:53 +0530
Subject: [PATCH 301/632] [FIX]:search_view 'groups=' attribute in the child of
 a field tag was never evaluted: Example: <field name='user_id' select='1'>   
 <filter domain='[('user_id','=',uid)]' help='My Sale Orders'
 icon='terp-personal' groups='base.group_extended'/>

bzr revid: nch@tinyerp.com-20101005112653-vg4qh4x5uzt0k2j5
---
 bin/osv/orm.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 55d2a4e226e..b003e5597d6 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1359,8 +1359,8 @@ class orm_template(object):
                 if trans:
                     node.set('sum', trans)
 
-        if childs:
-            for f in node:
+        for f in node:
+            if childs or (node.tag == 'field' and f.tag in ('filter','separator')):
                 fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
         return fields
@@ -3922,7 +3922,7 @@ class orm(orm_template):
         return True
 
     def _apply_ir_rules(self, cr, uid, query, mode='read', context=None):
-        """Add what's missing in ``query`` to implement all appropriate ir.rules 
+        """Add what's missing in ``query`` to implement all appropriate ir.rules
           (using the ``model_name``'s rules or the current model's rules if ``model_name`` is None)
 
            :param query: the current query object
@@ -3978,7 +3978,7 @@ class orm(orm_template):
             # extract the first field name, to be able to qualify it and add desc/asc
             m2o_order = m2o_order.split(",",1)[0].strip().split(" ",1)[0]
 
-        # Join the dest m2o table if it's not joined yet. We use [LEFT] OUTER join here 
+        # Join the dest m2o table if it's not joined yet. We use [LEFT] OUTER join here
         # as we don't want to exclude results that have NULL values for the m2o
         src_table, src_field = qualified_field.replace('"','').split('.', 1)
         query.join((src_table, dest_model._table, src_field, 'id'), outer=True)

From b1b120c7e443eca77a8c82569d3a88b5b793f0a1 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 17:46:41 +0530
Subject: [PATCH 302/632] [FIX] Account voucher => import invoice on bank
 statement wizard now taking correct account for move line

bzr revid: mra@mra-laptop-20101005121641-oa6m1rvbrkpfv7fc
---
 .../wizard/account_statement_from_invoice.py               | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index eaac705031b..0853ccfdb20 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -72,19 +72,20 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
                     statement.currency.id, amount, context=ctx)
 
+            context.update({'move_line_ids': [line.id]})
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), context=context)
             voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt') ,
                             'name': line.name,
                             'partner_id': line.partner_id.id,
                             'journal_id': statement.journal_id.id,
-                            'account_id': line.account_id.id,
+                            'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id), # improve me: statement.journal_id.default_credit_account_id.id
                             'company_id':statement.company_id.id,
                             'currency_id':statement.currency.id,
                             'date':line.date,
                             'amount':abs(amount),
                             'period_id':statement.period_id.id}
             voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
-            context.update({'move_line_ids': [line.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), context=context)
+
             voucher_line_dict =  False
             if result['value']['line_ids']:
                 for line_dict in result['value']['line_ids']:

From 78000cae6d03c9416daca95f2d18c805dbaaea04 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:37:30 +0200
Subject: [PATCH 303/632] [IMP] netsvc: increase a bit default verbosity of
 debug_* levels for RPC query and results + lint cleanup

bzr revid: odo@openerp.com-20101005123730-f75h4gu1ac8fjtfj
---
 bin/netsvc.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index e5a60f9d3ae..54a8ac68b14 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -211,7 +211,7 @@ def init_logger():
                 handler = logging.handlers.WatchedFileHandler(logf)
             else:
                 handler = logging.handlers.FileHandler(logf)
-        except Exception, ex:
+        except Exception:
             sys.stderr.write("ERROR: couldn't create the logfile directory. Logging to the standard output.\n")
             handler = logging.StreamHandler(sys.stdout)
     else:
@@ -269,11 +269,11 @@ class Logger(object):
                     level_method('[%02d]: %s' % (idx+1, s,))
             elif result:
                 level_method(result[0])
-        except IOError,e:
+        except IOError:
             # TODO: perhaps reset the logger streams?
             #if logrotate closes our files, we end up here..
             pass
-        except:
+        except Exception:
             # better ignore the exception and carry on..
             pass
 
@@ -473,13 +473,13 @@ class OpenERPDispatcher:
 
     def dispatch(self, service_name, method, params):
         try:
+            logger = logging.getLogger('result')
             self.log('service', service_name)
             self.log('method', method)
-            self.log('params', params)
+            self.log('params', params, depth=(logger.isEnabledFor(logging.DEBUG_RPC_ANSWER) and 3 or 1))
             auth = getattr(self, 'auth_provider', None)
             result = ExportService.getService(service_name).dispatch(method, auth, params)
-            logger = logging.getLogger('result')
-            self.log('result', result, channel=logging.DEBUG_RPC_ANSWER, depth=(logger.isEnabledFor(logging.DEBUG_SQL) and 1 or None))
+            self.log('result', result, channel=logging.DEBUG_RPC_ANSWER, depth=(logger.isEnabledFor(logging.DEBUG_SQL) and 5 or 3))
             return result
         except Exception, e:
             self.log('exception', tools.exception_to_unicode(e))

From a4afc9421ec264f03df352811cafc41bca86f838 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 5 Oct 2010 18:13:01 +0530
Subject: [PATCH 304/632] [FIX] Event: Act window on event (open registrations)

bzr revid: mra@mra-laptop-20101005124301-f2d0kuh3iq497kvn
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f58a948fad2..b1555ea7dc5 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -264,7 +264,7 @@
             res_model="event.registration"
             src_model="event.event"
             view_mode="tree,form,calendar,graph"
-            context="{'search_default_event_id': [active_id]}"
+            context="{'search_default_event_id': active_id}"
             view_type="form"/>
 
       <act_window

From 50853e12cb9888f8ac337c8b84d29f5d7be9e710 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:46:33 +0200
Subject: [PATCH 305/632] [FIX] base: re-added explicit menu_id for super-user
 as it is not created by ORM initially

bzr revid: odo@openerp.com-20101005124633-003uft5v4wkza3f8
---
 bin/addons/base/base_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 9597ac83f92..b4340e3faf0 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1052,6 +1052,7 @@
             <field name="signature">Administrator</field>
             <field name="address_id" ref="main_address"/>
             <field name="company_id" ref="main_company"/>
+            <field name="menu_id" ref="action_menu_admin"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
         </record>
 

From d14cee5c3140dd249c7657559daffe3fcc9de1de Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 10:53:40 +0530
Subject: [PATCH 306/632] [Fix] account: Remove the extra menu of account board

bzr revid: sbh@tinyerp.com-20101006052340-2di98zk18o7ly9nu
---
 addons/account/board_account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 5ae2890fd20..3c7879e86c3 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -51,6 +51,6 @@
 
         <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-        <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
+        
     </data>
 </openerp>

From d607cfb5ce055f89c17d5de5208330d39d67297e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 11:34:25 +0530
Subject: [PATCH 307/632] [Fix] crm, email_template: fix the warining of the
 buildbot

bzr revid: sbh@tinyerp.com-20101006060425-due2y7k9tsnpzt7x
---
 addons/crm/crm_opportunity.py           | 5 ++---
 addons/email_template/email_template.py | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 2b0062eb9d5..9047007d52c 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime
-from osv import fields,osv,orm
+from osv import fields,osv
 from tools.translate import _
 import crm
 import time
@@ -121,7 +120,7 @@ class crm_opportunity(osv.osv):
         """
         res = super(crm_opportunity, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'stage_id': False})
-        return True
+        return res
    
  
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index ee82c917351..02ebb1c0bb6 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -31,10 +31,8 @@ TEMPLATE_ENGINES = []
 
 from osv import osv, fields
 from tools.translate import _
-from mako.template import Template  #For backward combatibility
 try:
     from mako.template import Template as MakoTemplate
-    from mako import exceptions
     TEMPLATE_ENGINES.append(('mako', 'Mako Templates'))
 except:
     LOGGER.notifyChannel(
@@ -302,7 +300,6 @@ This is useful for CRM leads for example"),
 
     def unlink_action(self, cr, uid, ids, context):
         for template in self.browse(cr, uid, ids, context):
-            obj = self.pool.get(template.object_name.model)
             try:
                 if template.ref_ir_act_window:
                     self.pool.get('ir.actions.act_window').unlink(cr, uid, template.ref_ir_act_window.id, context)

From 1a87577d4ca17bb2b802bdc3d597cc0b5d4dca63 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 11:40:09 +0530
Subject: [PATCH 308/632] [Fix] event: Fix the warining of pylint

bzr revid: sbh@tinyerp.com-20101006061009-ee2cco8sn1rnz21n
---
 addons/event/event.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 88910f01914..6682a703ea5 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -22,8 +22,6 @@
 from crm import crm
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-import pooler
 import time
 import tools
 import decimal_precision as dp
@@ -354,12 +352,6 @@ class event_registration(osv.osv):
 
         val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
         val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-        partner_address_id = val_invoice['value']['address_invoice_id']
-
-        value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-
-        l = inv_lines_pool.read(cr, uid, lines)
-
         val_invoice['value'].update({
                 'origin': reg.event_product,
                 'reference': False,
@@ -595,7 +587,6 @@ class event_registration(osv.osv):
         addr_obj = self.pool.get('res.partner.address')
         job_obj = self.pool.get('res.partner.job')
 
-        contact_id = contact_obj.browse(cr, uid, contact)
         if partner:
             partner_addresses = addr_obj.search(cr, uid, [('partner_id', '=', partner)])
             job_ids = job_obj.search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])

From ab3fe9358ce567c2423bda9f2aa3df3f74b3fb7a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 17:53:26 +0530
Subject: [PATCH 309/632] [IMP] stock: Incoming shipment  product field in move
 line should not be readonly in draft state

bzr revid: sbh@tinyerp.com-20101006122326-0p2hp6cbgs9esc15
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2f4d0a2e48b..f5f1c854d6f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1281,9 +1281,9 @@
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
                                 <tree colors="grey:scrapped==True" string="Stock Moves">
-                                    <field name="product_id" readonly="1"/>
-                                    <field name="product_qty" readonly="1"/>
-                                    <field name="product_uom" string="UoM" readonly="1"/>
+                                    <field name="product_id" />
+                                    <field name="product_qty" />
+                                    <field name="product_uom" string="UoM" />
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"

From 2c58ba2bfab9cc917ea2098e065932ad35193dc8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 18:14:45 +0530
Subject: [PATCH 310/632] [IMP] stock: set the groups on dashobard

bzr revid: sbh@tinyerp.com-20101006124445-5rwks6iphs87bwlv
---
 addons/stock/board_warehouse_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 8191a53374f..37ab496c3a6 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -71,9 +71,9 @@
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-		<menuitem id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
-        <menuitem action="open_board_warehouse" icon="terp-graph" id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5" action="open_board_warehouse"/>
+		<menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
+        <menuitem action="open_board_warehouse" icon="terp-graph"    id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
+         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"   groups="group_stock_manager,base.group_system" action="open_board_warehouse"/>
 
     </data>
 </openerp>

From c57aed2e0520c40bab5bb6abc762ea4e99b3660d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 18:38:06 +0530
Subject: [PATCH 311/632] [IMP] stock:Add the day wise grouping

bzr revid: sbh@tinyerp.com-20101006130806-b0caho7dff41ua8n
---
 addons/stock/board_warehouse_view.xml          | 12 ++++++------
 addons/stock/report/report_stock_move_view.xml | 11 +++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 37ab496c3a6..7bc58cbb589 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -31,16 +31,16 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
 		    <field name="domain">[('type','=','in')]</field>	
-			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
+			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
 		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
 		    <field name="domain">[('type','=','out')]</field>	
-			<field name="view_id" ref="stock.view_stock_graph"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':[], 'group_by_no_leaf':1}</field>
+			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
+			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
@@ -72,8 +72,8 @@
         </record>
 
 		<menuitem id="menu_dashboard_stock" name="Dashboard"  sequence="0" parent="stock.next_id_61"/>
-        <menuitem action="open_board_warehouse" icon="terp-graph"    id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
-         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"   groups="group_stock_manager,base.group_system" action="open_board_warehouse"/>
+        <menuitem action="open_board_warehouse" icon="terp-graph"  groups="group_stock_manager"  id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
+         <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5"  groups="group_stock_manager" action="open_board_warehouse"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index cb5ff177050..353b8b6bc9c 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -49,6 +49,17 @@
              </graph>
          </field>
     </record>
+    <record id="view_stock_graph_board" model="ir.ui.view">
+         <field name="name">report.stock.move.graph</field>
+         <field name="model">report.stock.move</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Moves Analysis" type="bar">
+                 <field name="day"/>
+                 <field name="day_diff2" operator="+"/>
+             </graph>
+         </field>
+    </record>
 
     <record id="view_stock_search" model="ir.ui.view">
         <field name="name">report.stock.move.search</field>

From 712fc52fceb40df68f24151efccd8b288f5aaa82 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 6 Oct 2010 18:55:59 +0530
Subject: [PATCH 312/632] [IMP] stock : Remove the domain and put in search
 default

bzr revid: sbh@tinyerp.com-20101006132559-vctqot3uwqi3l0zf
---
 addons/stock/board_warehouse_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 7bc58cbb589..84a24f3d0b2 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -30,17 +30,15 @@
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','in')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
 		<record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
 			<field name="res_model">report.stock.move</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree</field>
-		    <field name="domain">[('type','=','out')]</field>	
 			<field name="view_id" ref="stock.view_stock_graph_board"></field>   		        
-			<field name="context">{'search_default_month-1':1,'search_default_group_day':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+			<field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>         
 		<record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>

From 56d2aac9268fb7b4361cec266ee405dbaec5a4be Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:49:37 +0200
Subject: [PATCH 313/632] [IMP] stock: some whitespace removed

bzr revid: odo@openerp.com-20101005124937-3wwifrj712ifwqhc
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d24696ff734..1333fb59dec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2008,7 +2008,7 @@ class stock_move(osv.osv):
                     'product_id': move.product_id and move.product_id.id or False,
                     'quantity': move.product_qty,
                     'ref': move.picking_id and move.picking_id.name or False,
-                    'date': time.strftime('%Y-%m-%d')   ,
+                    'date': time.strftime('%Y-%m-%d'),
                     'partner_id': partner_id,
                     'debit': reference_amount,
                     'account_id': dest_account_id,
@@ -2018,7 +2018,7 @@ class stock_move(osv.osv):
                     'product_id': move.product_id and move.product_id.id or False,
                     'quantity': move.product_qty,
                     'ref': move.picking_id and move.picking_id.name or False,
-                    'date': time.strftime('%Y-%m-%d')   ,
+                    'date': time.strftime('%Y-%m-%d'),
                     'partner_id': partner_id,
                     'credit': reference_amount,
                     'account_id': src_account_id,

From c750ac729b3ee9115e721481cedd543a380659a7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 14:50:28 +0200
Subject: [PATCH 314/632] [FIX] procurement: date_planned field has been
 removed from stock.picking

bzr revid: odo@openerp.com-20101005125028-sfyd78eddtta99l5
---
 addons/procurement/procurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e1b9b5af40b..e85602d79aa 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -343,7 +343,7 @@ class procurement_order(osv.osv):
                         'product_id': procurement.product_id.id,
                         'product_qty': procurement.product_qty,
                         'product_uom': procurement.product_uom.id,
-                        'date_planned': procurement.date_planned,
+                        'date_expected': procurement.date_planned,
                         'state': 'draft',
                         'company_id': procurement.company_id.id,
                     })

From 0888189083c3864907de412f6ac96519e9e0ab75 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 5 Oct 2010 19:02:52 +0530
Subject: [PATCH 315/632] [MOD/IMP] tools : Survey,Idea,Lunch,Subscription
 Usability improvement in access rights

bzr revid: amp@tinyerp.com-20101005133252-hz7jww5xuzjrxal1
---
 addons/idea/idea_view.xml                     |  9 ++++---
 addons/idea/report/report_vote_view.xml       |  2 +-
 addons/idea/security/idea_security.xml        |  5 ----
 addons/idea/security/ir.model.access.csv      | 18 -------------
 addons/lunch/lunch_view.xml                   |  4 +--
 addons/lunch/security/ir.model.access.csv     | 14 +---------
 addons/lunch/security/lunch_security.xml      |  3 ---
 .../lunch/wizard/lunch_order_cancel_view.xml  |  2 +-
 .../lunch/wizard/lunch_order_confirm_view.xml |  2 +-
 .../subscription/security/ir.model.access.csv | 10 +++----
 addons/subscription/subscription_view.xml     |  2 +-
 addons/survey/security/ir.model.access.csv    | 27 ++-----------------
 addons/survey/survey_view.xml                 | 14 +++++-----
 13 files changed, 25 insertions(+), 87 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index f7ddb8bf504..456c4dd1f7a 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -65,7 +65,7 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
+         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
 
     <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
@@ -90,7 +90,8 @@
 
     <menuitem name="Give Vote" parent="menu_ideas1"
         id="menu_give_vote"
-        action="action_idea_select"/>
+        action="action_idea_select"
+        groups="base.group_tool_user"/>
 
 
     <!-- Open Ideas Action  -->
@@ -382,12 +383,12 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
+    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager,base.group_tool_user"/>
 
     <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
-        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_manager,base.group_tool_user,base.group_system"/>
+        id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_user"/>
 
     <!-- Vote For Idea Action  -->
     <record model="ir.actions.act_window" id="action_idea_vote">
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 8418377065c..c68c829794b 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -91,7 +91,7 @@
             <field name="context">{'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
-        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager,base.group_system"/>
+        <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager"/>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index ef377c799c9..4b060c51e6c 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -2,10 +2,6 @@
 <openerp>
 	<data>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
    	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
@@ -13,7 +9,6 @@
         	<field name="name">Tools / User</field>
    	</record>
 
-
 	</data>
 </openerp>
 
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 30dc0850c3f..b76cc9bd58a 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,26 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_idea_category","idea.category","model_idea_category","base.group_user",1,1,1,1
-"access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
-"access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
-"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,1,1,1
-"access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
-"access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
-"access_idea_comment_base_user","idea.comment.base.user","model_idea_comment","base.group_user",1,1,1,1
-"access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
-"access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
-"access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
 "access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
 "access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
 "access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
-"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,1,1,1
-"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,1,1,1
 "access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
 "access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
 "access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
 "access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
-"access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
-"access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0
-"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
-"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
-"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
-"access_idea_comment_manager","idea.comment.manager","model_idea_comment","base.group_tool_manager",1,1,1,1
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 6b0e4c4b8c7..0ecdea5c017 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,14 +6,14 @@
               id="menu_lunch" sequence="1" />
 
           <menuitem name="Reporting" parent="base.menu_tools"
-              id="base.menu_lunch_reporting" sequence="6" groups="base.group_system,base.group_tool_manager"/>
+              id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
 
           <menuitem name="Lunch Orders"
               parent="base.menu_lunch_reporting"
               id="menu_lunch_reporting_order" sequence="1" />
 
           <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
 
           <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
               id="menu_lunch_category_root_configuration" sequence="1" />
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index b936b26a55e..59670a8d1b1 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,20 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_lunch_category","lunch.category","model_lunch_category","base.group_user",1,1,1,1
-"access_lunch_product","lunch.product","model_lunch_product","base.group_user",1,1,1,1
-"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox","base.group_user",1,1,1,1
-"access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
-"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
-"access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
 "access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,1,1,1
 "access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,1,1,1
 "access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
-"access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
-"access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
-"access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
-"access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
-"access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
+"access_lunch_category_manager","lunch.category.user","model_lunch_category","base.group_tool_user",1,1,1,1
 "access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
 "access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
 "access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 6c3559fa138..0014f38182b 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -2,9 +2,6 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
    	<record model="res.groups" id="base.group_tool_manager">
         	<field name="name">Tools / Manager</field>
    		</record>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index d47cc6d8ee9..e50f4ad222c 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -34,7 +34,7 @@
         <act_window id="action_lunch_order_cancel_values"
     		key2="client_action_multi" name="Cancel Order"
     		res_model="lunch.order.cancel" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
+    		view_mode="form" target="new" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index dabcd7d5e84..eba7d12c846 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -36,7 +36,7 @@
         <act_window id="action_lunch_order_confirm_values"
     		key2="client_action_multi" name="Confirm Order"
     		res_model="lunch.order.confirm" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
+    		view_mode="form" target="new" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index e19fdde993b..4d4f829092b 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,10 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_subscription_document,subscription.document,model_subscription_document,base.group_system,1,1,1,1
-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
-access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
-access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
 access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
-access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,0,0,0
 access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
-access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
 access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b27414bb60c..37841919b1b 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -212,7 +212,7 @@
             <field name="search_view_id" ref="view_subscription_document_filter" />
         </record>
         <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system" />
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" />
         <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
         <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
     </data>
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 5ea4017fb01..5d4501e36bd 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,41 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
 "access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
-"access_survey_manager","survey","model_survey","base.group_tool_manager",1,1,1,1
-"access_survey_system","survey","model_survey","base.group_system",1,0,0,0
 "access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
-"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
-"access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
-"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
 "access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
-"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
 "access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
-"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
 "access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
 "access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
 "access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
-"access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
 "access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
-"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,1,1,1
-"access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
-"access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
-"access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
-"access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
-"access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
-"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,1
 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
-"access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
-"access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
-"access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
 "access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
 "access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
 "access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
@@ -48,4 +24,5 @@
 "access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
 "access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_address_survey_user","survey.res.partner.address.survey.user","base.model_res_partner_address","group_survey_user",1,1,1,0
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_manager",1,1,1,1
+
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4fc58962442..b6cc394ad8a 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -4,11 +4,11 @@
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" sequence="2"/>
+                        groups="base.group_tool_user,group_survey_user" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"
+                 groups="base.group_tool_user,group_survey_user"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -292,7 +292,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
+            groups="base.group_tool_user,group_survey_user"/>
 
         <!--
             Survey Pages
@@ -492,7 +492,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
+            groups="base.group_tool_user,group_survey_user"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1126,7 +1126,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_tool_manager,base.group_tool_user,base.group_system,group_survey_user"/>
+            groups="base.group_tool_user,group_survey_user"/>
 
         <!--
             Survey Type
@@ -1193,7 +1193,7 @@
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_manager,base.group_tool_user,base.group_system,base.group_user,group_survey_user" icon="STOCK_INDEX"/>
+            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>

From ead307653d38c11699f31605a36541798d1a46e2 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 5 Oct 2010 19:12:28 +0530
Subject: [PATCH 316/632] [IMP, ADD] point_of_sale: Added access rules needed
 to complete pos order. Improved some rights for Close registers.

bzr revid: uco@tinyerp.com-20101005134228-1vdavxepj9oq8veq
---
 addons/mrp_repair/mrp_repair.py                   |  2 +-
 addons/point_of_sale/security/ir.model.access.csv | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f7a6837aace..5848fa7057c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -21,7 +21,7 @@
 
 from osv import fields,osv
 import netsvc
-from datetime import datetime, date
+from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from tools.translate import _
 import decimal_precision as dp
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 32b48c2a0e3..70a98128c2a 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -8,7 +8,7 @@
 "access_pos_config_journal_manager","pos.config.journal.manager","model_pos_config_journal","group_pos_manager",1,1,1,1
 "access_account_journal_pos_manager","account.journal pos_manager","account.model_account_journal","group_pos_manager",1,1,1,0
 "access_account_journal_pos_user","account.journal pos_user","account.model_account_journal","group_pos_user",1,0,0,0
-"access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,0,0,0
+"access_account_move_pos_user","account.move pos_user","account.model_account_move","group_pos_user",1,1,1,0
 "access_account_account_pos_user","account.account pos_user","account.model_account_account","group_pos_user",1,0,0,0
 "access_stock_picking_pos_user","stock.picking pos_user","stock.model_stock_picking","group_pos_user",1,1,1,1
 "access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","group_pos_user",1,0,0,0
@@ -27,6 +27,12 @@
 "access_account_bank_statement_manager","account.bank.statement manager","account.model_account_bank_statement","group_pos_manager",1,1,1,1
 "access_account_bank_statement_system","account.bank.statement system","account.model_account_bank_statement","base.group_system",1,0,0,0
 "access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","group_pos_user",1,1,1,0
+"access_account_invoice_pos","account.invoice pos user","account.model_account_invoice","group_pos_user",1,1,1,0
+"access_account_invoice_pos_manager","account.invoice pos manager","account.model_account_invoice","group_pos_manager",1,0,0,0
+"access_account_invoice_line_pos","account.invoice.line pos user","account.model_account_invoice_line","group_pos_user",1,1,1,0
+"access_account_invoice_line_pos_manager","account.invoice.line pos manager","account.model_account_invoice_line","group_pos_manager",1,0,0,0
+"access_account_invoice_tax_pos","account.invoice.tax pos user","account.model_account_invoice_tax","group_pos_user",1,1,1,0
+"access_account_invoice_tax_pos_manager","account.invoice.tax pos manager","account.model_account_invoice_tax","group_pos_manager",1,0,0,0
 "access_account_period_pos","account.period pos user","account.model_account_period","group_pos_user",1,1,1,0
 "access_account_period_pos_manager","account.period pos manager","account.model_account_period","group_pos_manager",1,0,0,0
 "access_account_period_pos_system","account.period pos system","account.model_account_period","base.group_system",1,0,0,0
@@ -41,7 +47,7 @@
 "access_product_template_pos_manager","product.template pos manager","product.model_product_template","group_pos_manager",1,1,1,1
 "access_account_move_line","account.move.line","account.model_account_move_line","group_pos_user",1,1,1,0
 "access_account_move_line_manager","account.move.line manager","account.model_account_move_line","group_pos_manager",1,1,1,1
-"access_account_move","account.move","account.model_account_move","group_pos_user",1,1,1,0
+"access_account_move","account.move","account.model_account_move","group_pos_manager",1,0,0,0
 "access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
 "access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
 "access_account_journal_system","account.journal system","account.model_account_journal","base.group_system",1,0,0,0

From 7f30ad68d56a78aee746389192a1acac245f67ac Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 5 Oct 2010 15:49:08 +0200
Subject: [PATCH 317/632] [FIX] orm.search: properly JOIN parent table when
 applying inherited ir.rules

bzr revid: odo@openerp.com-20101005134908-17yblagoww1orrtk
---
 bin/osv/orm.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index b003e5597d6..44a519f991e 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3927,8 +3927,12 @@ class orm(orm_template):
 
            :param query: the current query object
         """
-        def apply_rule(added_clause, added_params, added_tables):
+        def apply_rule(added_clause, added_params, added_tables, parent_model=None, child_object=None):
             if added_clause:
+                if parent_model and child_object:
+                    # as inherited rules are being applied, we need to add the missing JOIN
+                    # to reach the parent table (if it was not JOINed yet in the query)
+                    child_object._inherits_join_add(parent_model, query)
                 query.where_clause += added_clause
                 query.where_clause_params += added_params
                 for table in added_tables:
@@ -3941,13 +3945,11 @@ class orm(orm_template):
         rule_obj = self.pool.get('ir.rule')
         apply_rule(*rule_obj.domain_get(cr, uid, self._name, mode, context=context))
 
-        # apply ir.rules from the parents (through _inherits), adding the appropriate JOINs if needed
+        # apply ir.rules from the parents (through _inherits)
         for inherited_model in self._inherits:
-            if apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context)):
-                # if some rules were applied, need to add the missing JOIN for them to make sense, passing the previous
-                # list of table in case the inherited table was not in the list before (as that means the corresponding
-                # JOIN(s) was(were) not present)
-                self._inherits_join_add(inherited_model, query)
+            apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context),
+                       parent_model=inherited_model,
+                       child_object=self)
 
     def _generate_m2o_order_by(self, order_field, query):
         """

From 7267cabc3fa7ca0388bbf67d924ad3725624819b Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 5 Oct 2010 19:27:29 +0530
Subject: [PATCH 318/632] [IMP] Improve the form view of membership product

bzr revid: ara@tinyerp.com-20101005135729-brtyccam77h0d3uv
---
 addons/membership/membership_view.xml | 42 +++++++++++++++++++++------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index a4db3754cc4..711657d4e1a 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -29,15 +29,39 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership products">
-                    <field name="name"/>
-                    <field name="default_code"/>
-                    <field name="type"/>
-                    <field name="categ_id"/>
-                    <field name="membership_date_from" required="1"/>
-                    <field name="membership_date_to" required="1"/>
-                    <field name="list_price" string="Membership Fee"/>
+                	<group col="6">
+	                    <field name="name"/>
+	                    <field name="default_code"/>
+	                    <field name="active"/>
+	                    <field name="membership_date_from" required="1"/>
+	                    <field name="membership_date_to" required="1"/>
+	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <notebook colspan="4">
+	                    <page string="General">
+    		                <separator string="Accounting Info" colspan="2"/>
+            		        <separator string="Categorization" colspan="2"/>
+                    		<field name="price" />
+                    		<field name="type" />
+                    		<field name="property_account_income"/>
+                    		<field name="categ_id"/>
+                    		<separator string="Sale Taxes" colspan="2"/>
+                    		<newline/>
+                    		<field name="taxes_id" nolabel="1" colspan="4"/>
+	                    </page>
+	                    <page string="Description">
+                            <separator string="Description"/>
+                            <field colspan="4" name="description" nolabel="1"/>
+                            <separator string="Sale Description"/>
+                            <field colspan="4" name="description_sale" nolabel="1"/>
+                            <separator string="Purchase Description"/>
+                            <field colspan="4" name="description_purchase" nolabel="1"/>
+	                    </page>
+                    </notebook>
+                       <!--field name="list_price" string="Membership Fee"/>
                     <separator colspan="4" string="Customer Taxes:"/>
-                    <field name="taxes_id" colspan="4" nolabel="1"/>
+                    <field name="taxes_id" colspan="4" nolabel="1"/-->
+
                 </form>
             </field>
         </record>
@@ -81,7 +105,7 @@
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
-        <menuitem name="Memberships" parent="menu_membership"
+        <menuitem name="Membership Product" parent="menu_membership"
             id="menu_membership_products"
             action="action_membership_products" sequence="1"/>
 

From 073af37be1ee3467931d050fe00ab5c2f93ac2d9 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Tue, 5 Oct 2010 19:34:22 +0530
Subject: [PATCH 319/632] [IMP] Improve the reports of point of sale module

bzr revid: azaz.201186@gmail.com-20101005140422-b9p1og6n8sqlpfbl
---
 .../report/account_statement.rml              |  10 +-
 addons/point_of_sale/report/pos_details.rml   |  79 ++++----
 .../report/pos_details_summary.rml            |  39 ++--
 .../report/pos_payment_report.rml             |   6 +-
 .../report/pos_payment_report_date.rml        |  12 +-
 .../report/pos_payment_report_user.rml        | 141 +++++++--------
 .../report/pos_receipt_with_remboursment.rml  |   2 +-
 .../pos_receipt_without_remboursment.rml      |  14 +-
 .../point_of_sale/report/pos_sales_user.rml   | 137 +++++++-------
 .../report/pos_sales_user_today.rml           | 130 ++++++--------
 .../pos_sales_user_today_current_user.rml     | 169 +++++++++---------
 .../report/pos_users_product.rml              |  16 +-
 12 files changed, 378 insertions(+), 377 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index e4c3b99b6ee..a7f2a397d8b 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Statement" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -238,7 +238,7 @@
           <para style="terp_tblheader_Details">Partner</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Amount </para>
         </td>
       </tr>
     </blockTable>
@@ -253,7 +253,7 @@
           <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -268,7 +268,7 @@
           <para style="terp_default_Right_9_Bold">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -282,4 +282,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index f3bebade402..c86120779f6 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -20,9 +20,12 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
@@ -34,9 +37,12 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -102,19 +108,26 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,3" stop="0,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,4" stop="0,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,4" stop="1,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,5" stop="0,5"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,5" stop="1,5"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -162,7 +175,7 @@
     <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
+    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -171,11 +184,14 @@
           <para style="terp_tblheader_General_Centre">Print Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Period</para>
+          <para style="terp_tblheader_General_Centre">Start Period</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">End Period</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
+    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -184,7 +200,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]] </para>
+          <para style="terp_default_Centre_8">[[ formatLang(getperiod(data['form']),date = True) ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(getperiod2(data['form']),date = True) ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -203,16 +222,16 @@
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Price </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Disc </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Invoiced ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Centre">Invoiced </para>
         </td>
       </tr>
     </blockTable>
@@ -306,13 +325,13 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table7">
+    <blockTable colWidths="241.0,240.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Sales total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getsalestotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -320,7 +339,7 @@
           <para style="terp_default_Bold_9">Qty of product</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getqtytotal2(data['form'],user)) ]]</para>
         </td>
       </tr>
       <tr>
@@ -328,7 +347,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getsuminvoice2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -336,7 +355,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getsumdisc(objects)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(objects)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -344,7 +363,7 @@
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(getpaidtotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -352,7 +371,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(gettotalofthaday(data['form'])) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form'])) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -360,4 +379,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index aa559eb9961..dea0789b7be 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -80,18 +80,24 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,5" stop="0,5"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,5" stop="1,5"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <initialize>
@@ -100,6 +106,8 @@
     <paraStyle name="P1" fontName="Helvetica" fontSize="15.0" leading="19" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -138,8 +146,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Details of Sales</para>
-    <para style="terp_header">
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">Details of Sales</para>
+    <para style="P5">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="161.0,161.0,161.0" style="Table1">
@@ -247,7 +258,7 @@
           <para style="terp_default_Bold_9">Sales total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%d' % getsalestotal(objects) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]] [[company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -255,7 +266,7 @@
           <para style="terp_default_Bold_9">Qty of product</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%d' % getqtytotal(objects) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%d' % getqtytotal(objects) ]]</para>
         </td>
       </tr>
       <tr>
@@ -263,7 +274,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % getsuminvoice(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -271,7 +282,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % getsumdisc(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -279,7 +290,7 @@
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % getpaidtotal(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -287,7 +298,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % gettotalofthaday(objects) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -295,4 +306,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index e62b4bd1290..01fcdf355e1 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -161,10 +161,10 @@
           <para style="terp_tblheader_Details_Right">Disc. (%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Total</para>
         </td>
      </tr>
     </blockTable>
@@ -212,7 +212,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Net Total </para>
+          <para style="terp_tblheader_Details">Net Total:</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 846eaf1f861..c994e53d933 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -98,7 +98,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header_Centre">Payment</para>
+    <para style="terp_header_Centre">Sales Lines</para>
     <para style="Standard">
       <font color="white"> </font>
     </para>
@@ -140,10 +140,10 @@
           <para style="terp_tblheader_General_Right">Disc(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Unit Price ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_General_Right">Unit Price </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Total ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_General_Right">Total </para>
         </td>
       </tr>
     </blockTable>
@@ -187,7 +187,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Total</para>
+          <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
@@ -198,4 +198,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index fc874e52dac..a88813fac1f 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment by user" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,35 +10,29 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -46,9 +40,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -56,31 +49,26 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -90,8 +78,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -105,17 +93,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,268.0" style="Table3">
+    <para style="P2">Payment By User </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -125,7 +117,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="268.0,268.0" style="Table4">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -138,32 +130,31 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau6">
+    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          <para style="terp_tblheader_General_Right">Disc(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_General_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total</para>
+          <para style="terp_tblheader_General_Right">Total</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
     <section>
-
-      <para style="terp_default_8">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Tableau7">
+      <para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
+      <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -180,36 +171,36 @@
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
           </td>
-
         </tr>
       </blockTable>
-       </section>
-      <blockTable colWidths="288.0,51.0,57.0,67.0,73.0" style="Table1">
+    </section>
+    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_default_9">
+          <para style="Table Contents">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_9">
+          <para style="Table Contents">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_default_9">
+          <para style="Table Contents">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total : </para>
+          <para style="terp_tblheader_General_Right">Total</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]]</para>
         </td>
       </tr>
-      </blockTable>
-
-
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
index 32dea8dcd48..9c25d5f4a89 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
@@ -125,7 +125,7 @@
         </td>
       </tr>
     </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para>
   </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index 4e3b8ec64e1..44fa3bf60cc 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -125,14 +125,14 @@
         </td>
       </tr>
     </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para>
 
-	<section>
-		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]
-		<para style="P31">
-			Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].
-		</para>
-	</section>
+<!--	<section>-->
+<!--		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]-->
+<!--		<para style="P31">-->
+<!--			Ce bon est valide jusqu'au [[ time.strftime('%d/%m/%Y', time.strptime(o.date_validity,'%Y-%m-%d')) ]].-->
+<!--		</para>-->
+<!--	</section>-->
   </story>
 </document>
 
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index cb817035a46..9566957b4fa 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sales by user" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,35 +10,29 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -46,9 +40,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -56,32 +49,21 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-	<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -91,8 +73,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -106,17 +88,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,268.0" style="Table3">
+    <para style="P3">Sales Report</para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -126,7 +112,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="268.0,268.0" style="Table4">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -139,10 +125,10 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -151,23 +137,22 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">User</para>
+          <para style="P1">User</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">State</para>
+          <para style="terp_tblheader_General_Right">State</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Company</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
-     <section>
-
-      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+    <section>
+      <para style="P2">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table5">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+            <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -176,13 +161,19 @@
             <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+            <para style="terp_default_Right_9">[[ line_ids['state'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
           </td>
         </tr>
       </blockTable>
-       </section>
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 39f6ddacb4c..16c8f6f0b38 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Today's sales with users" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,35 +10,29 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -46,9 +40,8 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -56,31 +49,21 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -90,8 +73,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -105,17 +88,18 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="268.0,268.0" style="Table3">
+    <para style="P3">Todays Sales By User</para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -125,7 +109,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="268.0,268.0" style="Table4">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -138,10 +122,10 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau6">
+    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -150,23 +134,22 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">User</para>
+          <para style="P2">User</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">State</para>
+          <para style="terp_tblheader_General_Right">State</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Company</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
-     <section>
-
-      <para style="terp_default_8">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="218.0,101.0,87.0,57.0,73.0" style="Tableau7">
+    <section>
+      <para style="P1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="141.0,111.0,92.0,60.0,78.0" style="Table5">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['pos'] ]]</para>
+            <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -175,13 +158,16 @@
             <para style="terp_default_Right_9">[[ line_ids['user'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ line_ids['state'] ]]</para>
+            <para style="terp_default_Right_9">[[ line_ids['state'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ line_ids['name'] ]]</para>
           </td>
         </tr>
       </blockTable>
-       </section>
+      <para style="terp_default_8">
+        <font color="white"> </font>
+      </para>
+    </section>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index 475d045252b..c483fa80a65 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Today's sales with current user" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,76 +10,71 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Tableau7">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="2,0"/>
-
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -89,8 +84,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -104,17 +99,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-	<para style="terp_default_9">
+    <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="178.0,178.0,178.0" style="Table3">
+    <para style="P3">Sales By Current User(Todays)</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -127,7 +126,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="178.0,178.0,178.0" style="Table4">
+    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -136,17 +135,17 @@
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
         </td>
         <td>
-        	<para style="terp_default_Centre_8">[[ (get_user(user)) ]]</para>
+          <para style="terp_default_Centre_8">[[ (get_user(user)) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="Standard">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau6">
+    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -160,12 +159,11 @@
         <td>
           <para style="terp_tblheader_Details_Right">Total</para>
         </td>
-     </tr>
+      </tr>
     </blockTable>
-     <section>
-
-      <para style="terp_default_8">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
-      <blockTable colWidths="338.0,52.0,72.0,72.0" style="Tableau7">
+    <section>
+      <para style="P2">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
+      <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -181,22 +179,27 @@
           </td>
         </tr>
       </blockTable>
-       </section>
-       <blockTable colWidths="338.0,52.0,72.0,72.0" style="Table1">
-        <tr>
-          <td>
-            <para style="terp_default_9"></para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Total : </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
-          </td>
-          <td>
-           <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
+    </section>
+    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P1">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total : </para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index 24059dcbb0b..60bf67f19af 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Product by user" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -175,7 +175,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="320.0,79.0,83.0" style="Table3">
+    <blockTable colWidths="239.0,80.0,163.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -184,11 +184,11 @@
           <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Amount ([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_General_Right">Amount </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="320.0,79.0,83.0" style="Table4">
+    <blockTable colWidths="239.0,80.0,163.0" style="Table4">
       <tr>
         <td>
           <para style="P2">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
@@ -199,11 +199,11 @@
           <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="320.0,79.0,83.0" style="Table5">
+    <blockTable colWidths="319.0,80.0,83.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
@@ -214,7 +214,7 @@
           <para style="terp_tblheader_General_Right">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -222,4 +222,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From d6826c41d4635d9ff7acfb4c8b38d4cacc809397 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 6 Oct 2010 10:04:28 +0530
Subject: [PATCH 320/632] [REF] Membership: Menu string improve for membership
 product

bzr revid: mra@mra-laptop-20101006043428-sjkljkezi5h18fm8
---
 addons/membership/membership_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 711657d4e1a..afd0096fa86 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -67,7 +67,7 @@
         </record>
 
         <record model="ir.ui.view" id="product_normal_form_view">
-            <field name="name">Membership product</field>
+            <field name="name">Membership Products</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
@@ -105,7 +105,7 @@
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
-        <menuitem name="Membership Product" parent="menu_membership"
+        <menuitem name="Membership Products" parent="menu_membership"
             id="menu_membership_products"
             action="action_membership_products" sequence="1"/>
 

From c6e3a8621c96631727f9ed72bcfc2680cc10d265 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 6 Oct 2010 10:31:15 +0530
Subject: [PATCH 321/632] [IMP] Account: Partner ledger => Font

bzr revid: mra@mra-laptop-20101006050115-1rp50dhirbm8h7y6
---
 addons/account/report/account_partner_ledger.rml       | 2 +-
 addons/account/report/account_partner_ledger_other.rml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index ec03ccec8de..3eef3270dd5 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -167,7 +167,7 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0" />
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 4408c03a283..4a07a8ef53c 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -320,7 +320,7 @@
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="terp_default_Left_9" fontName="Helvetica" fontSize="8.3" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0" />
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>

From 0fb73fae460ce9d60306feb15f02edc91a95f1e9 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Wed, 6 Oct 2010 10:50:59 +0530
Subject: [PATCH 322/632] [FIX] account: import payment lines on bank statement
 wizard now taking correct account for move line

bzr revid: vth@tinyerp.com-20101006052059-sujoj1g4n72gofda
---
 addons/account/account_bank_statement.py                  | 2 ++
 addons/account/account_cash_statement.py                  | 3 ++-
 .../wizard/account_payment_populate_statement.py          | 8 +++++---
 addons/account_voucher/account_voucher.py                 | 5 ++++-
 .../wizard/account_statement_from_invoice.py              | 1 +
 .../wizard/account_statement_from_invoice_view.xml        | 4 ++--
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index bbcd6188327..fcd4aa95c09 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -55,6 +55,7 @@ class account_bank_statement(osv.osv):
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         context.update({'statement_id': ids[0]})
+
         return {
             'name': _('Import Invoice'),
             'context': context,
@@ -242,6 +243,7 @@ class account_bank_statement(osv.osv):
             account_id = st.journal_id.default_credit_account_id.id
         else:
             account_id = st.journal_id.default_debit_account_id.id
+
         acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
         amount = res_currency_obj.compute(cr, uid, st.currency.id,
                 company_currency_id, st_line.amount, context=context,
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 34c751072ce..86690b204b9 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -143,6 +143,7 @@ class account_cash_statement(osv.osv):
                         res[statement.id] -= res_currency_obj.compute(cursor,
                                 user, company_currency_id, currency_id,
                                 line.credit, context=context)
+
             if statement.state in ('draft', 'open'):
                 for line in statement.line_ids:
                     res[statement.id] += line.amount
@@ -383,7 +384,7 @@ class account_cash_statement(osv.osv):
             for end in st.ending_details_ids:
                 cash_box_line_pool.write(cr, uid, [end.id], {'number':0})
         return True
-    
+
 account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 7ebb9d933de..53c9f14b6e8 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -71,6 +71,10 @@ class account_payment_populate_statement(osv.osv_memory):
             ctx['date'] = line.ml_maturity_date # was value_date earlier,but this field exists no more now
             amount = currency_obj.compute(cr, uid, line.currency.id,
                     statement.currency.id, line.amount_currency, context=ctx)
+
+            context.update({'move_line_ids': [line.move_line_id.id]})
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context)
+
             if line.partner_id:
 #                line['partner_id'] = mv.partner_id.id
                 if amount < 0 :
@@ -83,7 +87,7 @@ class account_payment_populate_statement(osv.osv_memory):
                 'name': line.name,
                 'partner_id': line.partner_id.id,
                 'journal_id': statement.journal_id.id,
-                'account_id': account,
+                'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
                 'company_id': statement.company_id.id,
                 'currency_id': statement.currency.id,
                 'date': line.date or time.strftime('%Y-%m-%d'),
@@ -91,8 +95,6 @@ class account_payment_populate_statement(osv.osv_memory):
                 'period_id': statement.period_id.id
                 }
                 voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
-                context.update({'move_line_ids': [line.move_line_id.id]})
-                result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context)
                 voucher_line_dict =  False
                 if result['value']['line_ids']:
                     for line_dict in result['value']['line_ids']:
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 2ea6e4b39ab..aac2e92100c 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -349,7 +349,6 @@ class account_voucher(osv.osv):
 
         if context is None:
             context = {}
-
         currency_pool = self.pool.get('res.currency')
         move_pool = self.pool.get('account.move')
         line_pool = self.pool.get('account.voucher.line')
@@ -454,6 +453,7 @@ class account_voucher(osv.osv):
                 default['value']['pre_line'] = 1
             elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
                 default['value']['pre_line'] = 1
+
         return default
 
     def onchange_date(self, cr, user, ids, date, context={}):
@@ -674,6 +674,7 @@ class account_voucher(osv.osv):
                     move_line.update({
                         'account_tax_id':inv.tax_id.id,
                     })
+
                 master_line = move_line_pool.create(cr, uid, move_line)
                 if line.move_line_id.id:
                     rec_ids = [master_line, line.move_line_id.id]
@@ -697,6 +698,7 @@ class account_voucher(osv.osv):
                 else:
                     account_id = inv.partner_id.property_account_payable.id
                 move_line['account_id'] = account_id
+
                 move_line_id = move_line_pool.create(cr, uid, move_line)
 
             self.write(cr, uid, [inv.id], {
@@ -862,6 +864,7 @@ class account_bank_statement(osv.osv):
         voucher_obj = self.pool.get('account.voucher')
         wf_service = netsvc.LocalService("workflow")
         st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context)
+
         if st_line.voucher_id:
             voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
             wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr)
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 0853ccfdb20..2c5553488d0 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -171,6 +171,7 @@ class account_statement_from_invoice(osv.osv_memory):
 
         line_ids = line_obj.search(cr, uid, args,
             context=context)
+
         model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice_lines')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         return {
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 19805143855..1da95285c24 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -38,7 +38,7 @@
                 <form string="Import Entries">
                     <group colspan="4" expand="1">
                         <separator string="Payable and Receivables" colspan="4"/>
-                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']), ('reconcile_id','=',False), ('reconcile_partial_id','=',False)]"/>
+                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False)]"/>
                     </group>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
@@ -48,7 +48,7 @@
                </form>
             </field>
         </record>
-        
+
         <record id="action_view_account_statement_from_invoice_lines" model="ir.actions.act_window">
             <field name="name">Import Entries</field>
             <field name="res_model">account.statement.from.invoice.lines</field>

From d7b4d43bca151dec78674ade4b00fa4e784a0788 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Wed, 6 Oct 2010 10:57:56 +0530
Subject: [PATCH 323/632] [IMP] Improved the page nos. in header of reports

bzr revid: vro@tinyerp.com-20101006052756-8ma3nosmwzaitsoz
---
 addons/point_of_sale/report/account_statement.py          | 2 +-
 .../point_of_sale/report/all_closed_cashbox_of_the_day.py | 2 +-
 addons/point_of_sale/report/pos_details.py                | 2 +-
 addons/point_of_sale/report/pos_details_summary.py        | 2 +-
 addons/point_of_sale/report/pos_invoice.py                | 8 ++++----
 addons/point_of_sale/report/pos_lines.py                  | 2 +-
 addons/point_of_sale/report/pos_payment_report.py         | 2 +-
 addons/point_of_sale/report/pos_payment_report_date.py    | 2 +-
 addons/point_of_sale/report/pos_payment_report_user.py    | 2 +-
 addons/point_of_sale/report/pos_receipt.py                | 6 +++---
 .../point_of_sale/report/pos_receipt_with_remboursment.py | 6 +++---
 .../report/pos_receipt_without_remboursment.py            | 6 +++---
 addons/point_of_sale/report/pos_sales_user.py             | 2 +-
 addons/point_of_sale/report/pos_sales_user_today.py       | 2 +-
 .../report/pos_sales_user_today_current_user.py           | 2 +-
 addons/point_of_sale/report/pos_users_product.py          | 2 +-
 16 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
index dc492651bb2..79f86151198 100644
--- a/addons/point_of_sale/report/account_statement.py
+++ b/addons/point_of_sale/report/account_statement.py
@@ -26,7 +26,7 @@ from report import report_sxw
 class account_statement(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(account_statement, self).__init__(cr, uid, name, context)
+        super(account_statement, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 28b96f7aebe..337a121bd41 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -26,7 +26,7 @@ from report import report_sxw
 class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
     #TOFIX: sql injection problem: SQL Request must be pass from sql injection...
     def __init__(self, cr, uid, name, context):
-        super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context)
+        super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
                 'time': time,
                 'get_data':self._get_data,
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index d1e881befac..26d427a3036 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -177,7 +177,7 @@ class pos_details(report_sxw.rml_parse):
         return form['date_end']
 
     def __init__(self, cr, uid, name, context):
-        super(pos_details, self).__init__(cr, uid, name, context)
+        super(pos_details, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.qty = 0.0
         self.invoice_id = ''
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index ec68585e62b..a629929e204 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -25,7 +25,7 @@ from report import report_sxw
 
 class pos_details_summary(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
-        super(pos_details_summary, self).__init__(cr, uid, name, context)
+        super(pos_details_summary, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 649eb727f0c..7217b8be553 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,11 +28,11 @@ from tools.translate import _
 class pos_invoice(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_invoice, self).__init__(cr, uid, name, context)
+        super(pos_invoice, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
         })
-        
+
 
     def set_context(self, objects, data, ids, report_type=None):
         super(pos_invoice, self).set_context(objects, data, ids, report_type)
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index ad855087cad..cb45b107931 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -26,7 +26,7 @@ from report import report_sxw
 class pos_lines(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_lines, self).__init__(cr, uid, name, context)
+        super(pos_lines, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index 3d82025da89..dc5653551a2 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_payment_report(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_payment_report, self).__init__(cr, uid, name, context)
+        super(pos_payment_report, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
index e492e929b7c..362ff569f72 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_payment_report_date(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_payment_report_date, self).__init__(cr, uid, name, context)
+        super(pos_payment_report_date, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index c7f31ffcd6f..1a982457895 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -24,7 +24,7 @@ from report import report_sxw
 class pos_payment_report_user(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_payment_report_user, self).__init__(cr, uid, name, context)
+        super(pos_payment_report_user, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 51e8e4d0f1b..9be543fb89b 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -33,7 +33,7 @@ def titlize(journal_name):
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
index d96cad52097..3286f40c5b7 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@ import pooler
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
index a84b0588dae..58d7052b287 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@ import pooler
 class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(order, self).__init__(cr, uid, name, context)
+        super(order, self).__init__(cr, uid, name, context=context)
 
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         partner = user.company_id.partner_id
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index 4032f035bdf..a764fa112b9 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_sales_user(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_sales_user, self).__init__(cr, uid, name, context)
+        super(pos_sales_user, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
index 7c9b9b5a563..3a8b8bb1bba 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_sales_user_today(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_sales_user_today, self).__init__(cr, uid, name, context)
+        super(pos_sales_user_today, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.py b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
index 7f4a8f827f5..ed793b4277e 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.py
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_sales_user_today_current_user(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_sales_user_today_current_user, self).__init__(cr, uid, name, context)
+        super(pos_sales_user_today_current_user, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.qty = 0.0
         self.localcontext.update({
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 141445bcafe..83a02d49832 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_user_product(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_user_product, self).__init__(cr, uid, name, context)
+        super(pos_user_product, self).__init__(cr, uid, name, context=context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,

From bd32a92f914f9ca96fc02a07f960040d390e0ac0 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 6 Oct 2010 11:02:08 +0530
Subject: [PATCH 324/632] [REF] point_of_sale: Record rule corrected for
 Registers.

bzr revid: uco@tinyerp.com-20101006053208-eacftxqj3wud2ffm
---
 addons/point_of_sale/security/point_of_sale_security.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index c5c879fa3d3..6163d65a36f 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -12,9 +12,8 @@
     <record model="ir.rule" id="pos_cash_statement_rule">
         <field name="name">Registers</field>
         <field name="model_id" search="[('model','=','account.bank.statement')]" model="ir.model"/>
-        <field name="global" eval="False"/>
-        <field name="domain_force">[('user_id','=',[user.id])]</field>
-        <field name="groups" eval="[(6, 0, [ref('group_pos_user')])]"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">[('user_id','!=',['base.user_root'])]</field>
     </record>
 
 </data>

From 51ac23058c671c33fcdbaa50b006bff25157ef55 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Wed, 6 Oct 2010 11:31:52 +0530
Subject: [PATCH 325/632] [FIX] account: import payment lines on bank statement
 wizard now taking correct account for move line

bzr revid: vth@tinyerp.com-20101006060152-dyl1z2kyrqjn717w
---
 .../wizard/account_payment_populate_statement.py          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 7ebb9d933de..53c9f14b6e8 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -71,6 +71,10 @@ class account_payment_populate_statement(osv.osv_memory):
             ctx['date'] = line.ml_maturity_date # was value_date earlier,but this field exists no more now
             amount = currency_obj.compute(cr, uid, line.currency.id,
                     statement.currency.id, line.amount_currency, context=ctx)
+
+            context.update({'move_line_ids': [line.move_line_id.id]})
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context)
+
             if line.partner_id:
 #                line['partner_id'] = mv.partner_id.id
                 if amount < 0 :
@@ -83,7 +87,7 @@ class account_payment_populate_statement(osv.osv_memory):
                 'name': line.name,
                 'partner_id': line.partner_id.id,
                 'journal_id': statement.journal_id.id,
-                'account_id': account,
+                'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
                 'company_id': statement.company_id.id,
                 'currency_id': statement.currency.id,
                 'date': line.date or time.strftime('%Y-%m-%d'),
@@ -91,8 +95,6 @@ class account_payment_populate_statement(osv.osv_memory):
                 'period_id': statement.period_id.id
                 }
                 voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
-                context.update({'move_line_ids': [line.move_line_id.id]})
-                result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context)
                 voucher_line_dict =  False
                 if result['value']['line_ids']:
                     for line_dict in result['value']['line_ids']:

From 69ba991732cd26f0bbc097d9a40fdfc4ebe6b4da Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 6 Oct 2010 12:12:25 +0530
Subject: [PATCH 326/632] [FIX] point_of_sale: Avoid errors if quantity is 0.

bzr revid: uco@tinyerp.com-20101006064225-y31cvvd5hxq63opz
---
 addons/point_of_sale/pos.py               | 1 +
 addons/point_of_sale/wizard/pos_return.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 778c504337d..c8d276ef03f 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1043,6 +1043,7 @@ class pos_order_line(osv.osv):
                     tax_amount = 0.0
                     taxes = [t for t in line.product_id.taxes_id]
                     if line.qty == 0.0:
+                        res[line.id][f] = 0.0
                         continue
                     computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
                     for tax in computed_taxes:
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 6d926c8d408..96187d78ce2 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -209,7 +209,8 @@ class pos_return(osv.osv_memory):
                             'date': date_cur,
                             'date_planned': date_cur
                         })
-                        line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
+                        if qty != 0.0:
+                            line_obj.copy(cr, uid, line.id, {'qty': -qty, 'order_id': new_order})
                 statementl_obj.create(cr, uid, {
                                                 'name': 'Refund %s'%order_id.name,
                                                 'statement_id': order_id.statement_ids[0].statement_id.id,

From 50c7a36f603b69992cff5061e14b0d64eb21bf20 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 6 Oct 2010 12:27:45 +0530
Subject: [PATCH 327/632] [IMP] Improve the search view of membership members

bzr revid: ara@tinyerp.com-20101006065745-7pjxm806m23uz0jl
---
 addons/membership/__openerp__.py              |  3 +-
 addons/membership/membership_view.xml         | 27 +++++----
 .../wizard/membership_unpaid_invoice.py       | 59 -------------------
 .../wizard/membership_unpaid_invoice_view.xml | 36 -----------
 4 files changed, 17 insertions(+), 108 deletions(-)
 delete mode 100644 addons/membership/wizard/membership_unpaid_invoice.py
 delete mode 100644 addons/membership/wizard/membership_unpaid_invoice_view.xml

diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index fa9052f884c..2a6ce2b7eb6 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -44,11 +44,10 @@ invoice and send propositions for membership renewal.
         'wizard/membership_invoice_view.xml',
         'membership_view.xml',
         'report/report_membership_view.xml',
-        'wizard/membership_unpaid_invoice_view.xml',
         'process/membership_process.xml'
     ],
     'demo_xml': ['membership_demo.xml'],
-    'test': ['test/test_membership.yml'],             
+    'test': ['test/test_membership.yml'],
     'installable': True,
     'active': False,
     'certificate': '0042907796381',
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index afd0096fa86..6e2c158418c 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -123,10 +123,11 @@
             <field name="arch" type="xml">
                 <tree string="Members">
                     <field name="name"/>
+                    <field name="membership_state"/>
                     <field name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')]}"/>
                     <field name="membership_start"/>
                     <field name="membership_stop"/>
-                    <field name="membership_state"/>
+                    <field name="user_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -137,14 +138,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <field name="category_id" position="after">
-                       <filter icon="terp-personal" name="old" domain="[('membership_state', '=', 'old')]" string="Old Members" />
-                       <filter icon="terp-personal" name = "invoiced" domain="[('membership_state', '=', 'invoiced')]" string="Invoiced Members"/>
-                       <filter icon="terp-personal" domain="[('membership_state', '=', 'paid')]" string="Paid Members" />
-                       <filter icon="terp-personal" domain="[('membership_state', '=', 'waiting')]" string="Future Members" />
-                       <separator orientation="vertical"/>
-                       <field name="membership_state"/>
-                       <field name="membership_start"/>
-                       <newline/>
+					<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>
@@ -158,8 +160,10 @@
                 <field name="membership_start" position="after">
                 <newline/>
 	            <group expand="0" string="Group By" colspan="10" col="8">
-	                <filter string="Associate Member" name = "associate" icon="terp-personal" domain="[]" context="{'group_by':'associate_member'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+	            	<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" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
 	                <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
@@ -173,6 +177,7 @@
             <field name="res_model">res.partner</field>
             <field name="search_view_id" ref="view_res_partner_member_filter"/>
             <field name="context">{"search_default_old": 1}</field>
+            <field name="context">{"search_default_all_members": 1}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
diff --git a/addons/membership/wizard/membership_unpaid_invoice.py b/addons/membership/wizard/membership_unpaid_invoice.py
deleted file mode 100644
index 0dbbbb3c952..00000000000
--- a/addons/membership/wizard/membership_unpaid_invoice.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import time
-
-from osv import fields, osv
-
-class member_unpaid_invoice(osv.osv_memory):
-    _name = "membership.unpaid.invoice"
-    _description = "List of Unpaid Partner"
-    _columns ={
-        'product': fields.many2one('product.product','Membership', size=64,required=True, help='Select Membership.'),
-    }
-
-    def invoice_membership(self, cr, uid, ids, context):
-        model_obj = self.pool.get('ir.model.data')
-        partners = []
-        result = model_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = model_obj.read(cr, uid, result, ['res_id'], context=context)
-        for data in self.read(cr, uid, ids, context=context):
-            cr.execute('''select p.id from res_partner as p \
-                left join account_invoice as i on p.id=i.partner_id \
-                left join account_invoice_line as il on i.id=il.invoice_id \
-                left join product_product as pr on pr.id=il.product_id \
-                where i.state = 'open' and pr.id=%s \
-                group by p.id''' % (data['product']))
-        map(lambda x: partners.append(x[0]),cr.fetchall())
-
-        return {
-            'domain': [('id', 'in', partners)],
-            'name': 'Unpaid Members',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'res.partner',
-            'type': 'ir.actions.act_window',
-            'res_id' : partners,
-            'search_view_id' : res['res_id']
-        }
-
-member_unpaid_invoice()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/wizard/membership_unpaid_invoice_view.xml b/addons/membership/wizard/membership_unpaid_invoice_view.xml
deleted file mode 100644
index 9c5db96d5e3..00000000000
--- a/addons/membership/wizard/membership_unpaid_invoice_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-  	  <record id="view_unpaid_invoice_view" model="ir.ui.view">
-            <field name="name">unpaid.invoice.view.form</field>
-            <field name="model">membership.unpaid.invoice</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="List Unpaid Members">
-                	<group colspan="4" >
-                           <field name="product" domain="[('membership','=',True)]" widget="selection"/>
-                    </group>
-                    <group colspan="4" col="6">
-                    	<button  icon="gtk-close" special="cancel" string="Close"/>
-           				<button  icon="gtk-ok" string="Unpaid" name="invoice_membership" type="object"/>
-                   </group>
-               </form>
-            </field>
-  	  </record>
-
-       <record id="action_unpaid_invoice_view" model="ir.actions.act_window">
-           <field name="name">List Unpaid Members</field>
-           <field name="res_model">membership.unpaid.invoice</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-          <field name="view_id" ref="view_unpaid_invoice_view"/>
-          <field name="target">new</field>
-       </record>
-
-        <menuitem name="List Unpaid Members" id="menu_unpaid_invoice"
-			action="action_unpaid_invoice_view"
-			parent="menu_membership" />
-
-     </data>
-</openerp>

From 12c4b353f4f4ae4fb52a1c05862057f1ef36314b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 6 Oct 2010 12:52:19 +0530
Subject: [PATCH 328/632] [FIX] membership: Remove unpaid inovice import from
 init file

bzr revid: mra@mra-laptop-20101006072219-twq77xlem3d69rg7
---
 addons/membership/wizard/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/membership/wizard/__init__.py b/addons/membership/wizard/__init__.py
index 07d484d7125..7ad7cc32008 100644
--- a/addons/membership/wizard/__init__.py
+++ b/addons/membership/wizard/__init__.py
@@ -20,5 +20,4 @@
 ##############################################################################
 
 import membership_invoice
-import membership_unpaid_invoice
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 134c23e34b786f22be6a9ba16f8ce655f08f9e2c Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 6 Oct 2010 13:00:27 +0530
Subject: [PATCH 329/632] [REF] membership: improve title of memebership
 products

bzr revid: mra@mra-laptop-20101006073027-4l6dpf4vp1h6nkm3
---
 addons/membership/membership_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 6e2c158418c..6032655e297 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -24,7 +24,7 @@
         </record>
 
         <record model="ir.ui.view" id="membership_products_form">
-            <field name="name">Memberships</field>
+            <field name="name">Membership Products</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -83,7 +83,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_membership_products">
-            <field name="name">Memberships</field>
+            <field name="name">Membership Products</field>
             <field name="res_model">product.product</field>
             <field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
             <field name="context">{'membership':True, 'type':'service'}</field>

From 39d514218fa63ac51bd7fa46f7f61e4af1de1035 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Oct 2010 09:37:57 +0200
Subject: [PATCH 330/632] [FIX] orm: backwards compatibility with python2.5

bzr revid: odo@openerp.com-20101006073757-exs2vdgyvg3d3m0m
---
 bin/osv/orm.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 44a519f991e..c4195dc00fa 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3947,9 +3947,8 @@ class orm(orm_template):
 
         # apply ir.rules from the parents (through _inherits)
         for inherited_model in self._inherits:
-            apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context),
-                       parent_model=inherited_model,
-                       child_object=self)
+            kwargs = dict(parent_model=inherited_model, child_object=self) #workaround for python2.5
+            apply_rule(*rule_obj.domain_get(cr, uid, inherited_model, mode, context=context), **kwargs)
 
     def _generate_m2o_order_by(self, order_field, query):
         """

From c7572adda4ea8bc6fb8bd333411b017d8c50708a Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 6 Oct 2010 13:17:48 +0530
Subject: [PATCH 331/632] [REF] Event: removed warnings from autommated tests

bzr revid: mra@mra-laptop-20101006074748-x3r8s1m5n7rcvot7
---
 addons/event/event.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 88910f01914..63093099eea 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -19,12 +19,11 @@
 #
 ##############################################################################
 
+import time
+
 from crm import crm
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-import pooler
-import time
 import tools
 import decimal_precision as dp
 
@@ -354,11 +353,8 @@ class event_registration(osv.osv):
 
         val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
         val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-        partner_address_id = val_invoice['value']['address_invoice_id']
 
-        value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-
-        l = inv_lines_pool.read(cr, uid, lines)
+        inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
 
         val_invoice['value'].update({
                 'origin': reg.event_product,
@@ -595,7 +591,6 @@ class event_registration(osv.osv):
         addr_obj = self.pool.get('res.partner.address')
         job_obj = self.pool.get('res.partner.job')
 
-        contact_id = contact_obj.browse(cr, uid, contact)
         if partner:
             partner_addresses = addr_obj.search(cr, uid, [('partner_id', '=', partner)])
             job_ids = job_obj.search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)])
@@ -667,7 +662,6 @@ class event_registration(osv.osv):
                     data['contact_id'] = job_obj.browse(cr, uid, job_ids[0]).contact_id.id
                     d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part)
                     data.update(d['value'])
-        partner_data = res_obj.browse(cr, uid, part)
         return {'value': data}
 
     def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):

From 47dc76c8455caa89d8284ead32b4fa12e798838d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 6 Oct 2010 13:20:40 +0530
Subject: [PATCH 332/632] [IMP] membership: help on start and end date buttons

bzr revid: mra@mra-laptop-20101006075040-tvirtt3y3rdvujjt
---
 addons/membership/membership_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 6032655e297..dac2bd3be7d 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -165,8 +165,8 @@
 	                <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" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-	                <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+	                <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>
             </field>

From f1e82fabde91e5856e1d0a6d3a075e69ca864e1e Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Wed, 6 Oct 2010 13:30:25 +0530
Subject: [PATCH 333/632] [ADD] account_voucher: added act window for invoice
 payment through account voucher.

bzr revid: vra@tinyerp.com-20101006080025-4pt3bv23ev2hkfp6
---
 addons/account_voucher/account_voucher.py       | 11 ++++++++++-
 addons/account_voucher/account_voucher_view.xml |  9 ++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 2ea6e4b39ab..0d0dfafcb8c 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -112,6 +112,15 @@ class account_voucher(osv.osv):
         return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        if not view_id and context.get('invoice_type',False):
+            mod_obj = self.pool.get('ir.model.data')
+            act_obj = self.pool.get('ir.actions.act_window')
+            if context.get('invoice_type') in ('out_invoice','out_refund'): 
+                result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
+            else:
+                result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_payment_form')
+            result = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+            view_id = result
         res = super(account_voucher,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='partner_id']")
@@ -349,7 +358,6 @@ class account_voucher(osv.osv):
 
         if context is None:
             context = {}
-
         currency_pool = self.pool.get('res.currency')
         move_pool = self.pool.get('account.move')
         line_pool = self.pool.get('account.voucher.line')
@@ -384,6 +392,7 @@ class account_voucher(osv.osv):
             account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
 
         default['value']['account_id'] = account_id
+
         if journal.type not in ('cash', 'bank'):
             return default
 
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index d066c91ad0e..343211c264b 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -161,7 +161,6 @@
         <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
 
         <act_window
-
             id="act_journal_voucher_open"
             name="Voucher Entries"
             context="{'search_default_journal_id': active_id, 'type':type}"
@@ -219,6 +218,14 @@
             </field>
         </record>
 
+        <act_window
+            id="act_invoice_voucher_open"
+            name="Pay Invoice"
+            view_mode="form,tree"
+            domain="[('partner_id', '=', partner_id)]"
+            context="{'default_partner_id': partner_id, 'default_amount':amount_total, 'default_name':name, 'default_state': 'draft', 'invoice_type':type, 'default_type': type in ('out_invoice','out_refund') and 'receipt' or 'payment'}"
+            res_model="account.voucher"
+            src_model="account.invoice"/>
 
     </data>
 </openerp>

From ee3b30ab7a14c36b90dcd8549bc7bcf6f0dff4ff Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Wed, 6 Oct 2010 14:56:34 +0530
Subject: [PATCH 334/632] [IMP]account_voucher: passing residual amount instead
 of total amount in act window of voucher.

bzr revid: vra@tinyerp.com-20101006092634-6ntcl0fynuz0lk86
---
 addons/account_voucher/account_voucher_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 343211c264b..b089825da9b 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -223,7 +223,7 @@
             name="Pay Invoice"
             view_mode="form,tree"
             domain="[('partner_id', '=', partner_id)]"
-            context="{'default_partner_id': partner_id, 'default_amount':amount_total, 'default_name':name, 'default_state': 'draft', 'invoice_type':type, 'default_type': type in ('out_invoice','out_refund') and 'receipt' or 'payment'}"
+            context="{'default_partner_id': partner_id, 'default_amount':residual, 'default_name':name, 'default_state': 'draft', 'invoice_type':type, 'default_type': type in ('out_invoice','out_refund') and 'receipt' or 'payment'}"
             res_model="account.voucher"
             src_model="account.invoice"/>
 

From 5afbd9c6635ef08ba44cb9130997ce4e5326444d Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 6 Oct 2010 14:58:07 +0530
Subject: [PATCH 335/632] [MOD] Survey : Improvements in access rights

bzr revid: vir@tinyerp.com-20101006092807-yctppi8ub7t8jx8s
---
 addons/survey/security/ir.model.access.csv | 28 +++++++++++++++++-----
 addons/survey/survey_view.xml              | 15 ++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 5d4501e36bd..b44d52c6c08 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,17 +1,33 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
-"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
+"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
+"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
+"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
+"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
+"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
+"access_survey_type_user","survey.type.user","model_survey_type","base.group_tool_user",1,1,1,1
+"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
 "access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
 "access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
 "access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
-"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
 "access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
 "access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
 "access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
@@ -24,5 +40,5 @@
 "access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
 "access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_manager",1,1,1,1
-
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,0
+"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b6cc394ad8a..576ef37885e 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -3,12 +3,11 @@
     <data>
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
-            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="base.group_tool_user,group_survey_user" sequence="2"/>
+            <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="base.group_tool_user,group_survey_user"
+                 groups="base.group_tool_manager"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,group_survey_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_tool_user,base.group_tool_manager,group_survey_user"/>
             <menuitem name="Reporting" parent="base.menu_tools"
                 id="base.menu_lunch_reporting" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
@@ -292,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <!--
             Survey Pages
@@ -492,7 +491,7 @@
 
         <menuitem name="Survey Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1126,7 +1125,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="base.group_tool_user,group_survey_user"/>
+            groups="base.group_tool_manager"/>
 
         <!--
             Survey Type
@@ -1193,7 +1192,7 @@
             src_model="survey.question"/>
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
-            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,group_survey_user" icon="STOCK_INDEX"/>
+            action="action_view_survey_name" parent="menu_answer_surveys"            groups="base.group_tool_user,base.group_tool_manager,group_survey_user" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>

From 68bd00350401accf0a8bc5a8ca7fcd46197a069b Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Wed, 6 Oct 2010 14:58:41 +0530
Subject: [PATCH 336/632] [IMP]: Internal header in hr_timesheet_invoice's Cost
 Ledger report.

bzr revid: rch_open_erp-20101006092841-j0c50s5883ckqx0t
---
 addons/hr_timesheet_invoice/report/cost_ledger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py
index 8daf40fded6..18de548ad1c 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.py
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.py
@@ -167,7 +167,7 @@ report_sxw.report_sxw(
         'report.hr.timesheet.invoice.account.analytic.account.cost_ledger',
         'account.analytic.account',
         'addons/hr_timesheet_invoice/report/cost_ledger.rml',
-        parser=account_analytic_cost_ledger, header=False)
+        parser=account_analytic_cost_ledger, header='internal')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ef28e951f503fc2bef3003690d288d379dff5d81 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 15:01:47 +0530
Subject: [PATCH 337/632] [MOD/IMP] hr : Usability Improvenment in Accessrights

bzr revid: dbr@tinyerp.com-20101006093147-xaqdyfd23izwtfmm
---
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         | 10 ++++----
 addons/hr/security/ir.model.access.csv        | 23 ++++++++-----------
 .../report/holidays_summary_report.py         |  1 -
 .../wizard/hr_holidays_summary_department.py  |  1 -
 .../hr_holidays_summary_department_view.xml   |  1 -
 6 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index c80c0cd91d4..3e02c3e539c 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -67,7 +67,7 @@
             <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" groups="base.group_user"/>
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 496e24bbb08..628f631351d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,9 +4,9 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -151,7 +151,7 @@
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
 
         <!--
         =======================
@@ -284,7 +284,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
+            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended,base.group_user"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -399,7 +399,7 @@
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager,base.group_system"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index a9fb4fdaae3..4f29f004c50 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,20 +1,15 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
+"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
+"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,1,1,1
-"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,1,1,1
-"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
-"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
-"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,0,0,0
-"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
+"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
+"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
+"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
+"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
+"access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a14970b31e5..92dedd1a14d 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -100,7 +100,6 @@ class report_custom(report_rml):
         today=datetime.datetime.today()
 
         first_date=data['form']['date_from']
-
         som = strToDate(first_date)
         eom = som+datetime.timedelta(59)
         day_diff=eom-som
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index a7c0d274194..4409254c16e 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -29,7 +29,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _description = 'HR Holidays Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
-        'date_to': fields.date('To', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
         'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
     }
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index ca8e7e75dcf..cd7665be123 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -10,7 +10,6 @@
 			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
 				    <field name="date_from" />
-				    <field name="date_to" />
 				    <newline/>
 				    <field name="holiday_type" colspan="4"/>
 				    <newline/>

From d935a5d80efa93d9b79d61ce5c0b66e26111c47f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Oct 2010 11:40:03 +0200
Subject: [PATCH 338/632] [IMP] ir.filters: improve create_or_replace() and
 make unique constraint case insensitive

bzr revid: odo@openerp.com-20101006094003-dlj24xrmotnbwvhv
---
 bin/addons/base/ir/ir_filters.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index c9cdf16d31e..541dbdb60c6 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 
 class ir_filters(osv.osv):
     '''
@@ -36,30 +37,31 @@ class ir_filters(osv.osv):
         act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
         return my_acts
-    
+
     def create_or_replace(self, cr, uid, vals, context=None):
         filter_id = None
-        for filter in self.get_filters(cr, uid, vals['model_id']):
-            if filter['name'].lower() == vals['name'].lower():
-                filter_id = filter['id']
-                break
-        if filter_id:
-            return self.write(cr, uid, filter_id, vals, context)
+        lower_name = vals['name'].lower()
+        matching_filters = [x for x in self.get_filters(cr, uid, vals['model_id'])
+                                if x['name'].lower() == lower_name]
+        if matching_filters:
+            self.write(cr, uid, matching_filters[0]['id'], vals, context)
+            return False
         return self.create(cr, uid, vals, context)
 
+    def _auto_init(self, cr, context={}):
+        super(ir_filters, self)._auto_init(cr, context)
+        # Use unique index to implement unique constraint on the lowercase name (not possible using a constraint)
+        cr.execute("SELECT indexname FROM pg_indexes WHERE indexname = 'ir_filters_name_model_uid_unique_index'")
+        if not cr.fetchone():
+            cr.execute('CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters (lower(name), model_id, user_id)')
 
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True, required=True),
         'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
-        'model_id': fields.selection(_list_all_models, 'Model', required=True),
+        'model_id': fields.selection(_list_all_models, 'Object', required=True),
     }
-    
-    _sql_constraints = [
-        ('name_model_uid_uniq', 'UNIQUE(name, model_id, user_id)', 'Filter name must be unique!'),
-    ]
-
 
 ir_filters()
 

From e9f53ca45a18700d39327d54c348a6f6bfa6915d Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 15:30:33 +0530
Subject: [PATCH 339/632] improve

bzr revid: apa@tinyerp.com-20101006100033-26milqhu4fpm6ppm
---
 addons/survey/report/survey_analysis_report.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index c95bd33ac32..a5ad7276b00 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -46,9 +46,6 @@ class survey_analysis(report_rml):
                         <drawString x="1.3cm" y="28.3cm"> """+to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True))+"""</drawString>
                         <setFont name="DejaVu Sans Bold" size="10"/>
                         <drawString x="9.8cm" y="28.3cm">"""+ to_xml(company.name) +"""</drawString>
-                        <setFont name="DejaVu Sans" size="8"/>
-                        <drawRightString x="19.7cm" y="28.3cm"><pageNumber/> / </drawRightString>
-                        <drawString x="19.8cm" y="28.3cm"></drawString>
                         <stroke color="#000000"/>
                         <lines>1.3cm 28.1cm 20cm 28.1cm</lines>
                         </pageGraphics>

From e711609f2690505243522e7feae70cfc9b16ecbe Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 16:06:57 +0530
Subject: [PATCH 340/632] [MOD/IMP] survey : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006103657-2579vov188co0oc9
---
 addons/survey/security/ir.model.access.csv | 11 ++---------
 addons/survey/wizard/survey_selection.py   |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index b44d52c6c08..1a1c8cab818 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -15,7 +15,6 @@
 "access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
 "access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
 "access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
-"access_survey_type_user","survey.type.user","model_survey_type","base.group_tool_user",1,1,1,1
 "access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
 "access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
 "access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
@@ -23,22 +22,16 @@
 "access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
 "access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
 "access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
-"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
 "access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
 "access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
 "access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
 "access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
-"access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
 "access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
-"access_survey_request_survey_user","survey.request.survey.user","model_survey_request","group_survey_user",1,1,1,1
 "access_survey_question_survey_user","survey.question.survey.user","model_survey_question","group_survey_user",1,1,1,1
 "access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","group_survey_user",1,1,1,1
 "access_survey_response_survey_user","survey.response.survey.user","model_survey_response","group_survey_user",1,1,1,1
 "access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","group_survey_user",1,1,1,1
 "access_survey_history_survey_user","survey.history.survey.user","model_survey_history","group_survey_user",1,1,1,1
-"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
-"access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
 "access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,0
-"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
+"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 92097d99333..69cc8e10796 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -62,7 +62,7 @@ class survey_name_wiz(osv.osv_memory):
             for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
                 result.append((sur.id, sur.title))
             return result
-        group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User'))])
+        group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
         user_obj = self.pool.get('res.users')
         user_rec = user_obj.read(cr, uid, uid)
         for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):

From e4bec778cce05791adcf767c58613a179fb439f2 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 6 Oct 2010 16:42:55 +0530
Subject: [PATCH 341/632] [IMP] Improve the search view of membership analysis

bzr revid: ara@tinyerp.com-20101006111255-bz9al2pgkfu6adve
---
 .../report/report_membership_view.xml         | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 962345cf1ae..3caa110e1cf 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -27,6 +27,7 @@
                     <field name="year" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="company_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -43,19 +44,8 @@
                         <filter string="Last 30 Days" icon="terp-go-month" name="month"
                             domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
-		                <filter icon="terp-camera_test"
-		                    string="Invoiced"
-		                    domain="[('state','=','invoiced')]"/>
-		                <filter icon="terp-check"
-                            string="Paid"
-                            domain="[('state','=','paid')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Waiting"
-                            default="1" name="none"
-                            domain="[('state','=', 'waiting')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="partner_id"/>
-                        <field name="membership_id"/>
+                        <field name="state"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="12">
@@ -63,24 +53,24 @@
                             domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" name="partner"
                             domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>       
+                        <separator orientation="vertical"/>
                         <filter string="Membership Product" icon="terp-product" name="product"
-                            domain="[]" context="{'group_by':'membership_id'}"/>    
+                            domain="[]" context="{'group_by':'membership_id'}"/>
                         <filter string="Membership State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical" groups="base.group_multi_company"/>       
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home"
                             domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>       
+                        <separator orientation="vertical"/>
                         <filter string="Year" name="year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}"/>
                         <filter string="Month" name="month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}"/>    
+                            domain="[]" context="{'group_by':'month'}"/>
                     </group>
                 </search>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_report_membership_graph1">
             <field name="name">report.membership.graph1</field>
             <field name="model">report.membership</field>
@@ -123,4 +113,4 @@
             id="menu_report_membership"/>
 
     </data>
-</openerp>            
+</openerp>

From 99c74952a7f3676dcf92573d2646a28b8bffd6e8 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 6 Oct 2010 16:45:17 +0530
Subject: [PATCH 342/632] [MOD] hr,hr_attendance : Improvements in access
 rights

bzr revid: vir@tinyerp.com-20101006111517-91jab3steqyimmev
---
 addons/hr/hr_view.xml                                    | 6 +++---
 addons/hr/security/ir.model.access.csv                   | 4 ++--
 addons/hr_attendance/hr_attendance_view.xml              | 8 ++++----
 addons/hr_attendance/security/hr_security.xml            | 4 ----
 addons/hr_attendance/security/ir.model.access.csv        | 9 ---------
 .../wizard/hr_attendance_sign_in_out_view.xml            | 2 +-
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 628f631351d..b47bf23d6fc 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
-        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
         <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
@@ -399,7 +399,7 @@
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 4f29f004c50..0b9a721e1ea 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -3,13 +3,13 @@
 "access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
 "access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
 "access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
+"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
 "access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c49c25cd5fc..44d09bec6cd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -81,7 +81,7 @@
 
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" groups="base.group_hr_user" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -89,8 +89,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Define attendance reason">
-                    <field colspan="4" name="name"  />
-                    <field name="action_type" />
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="action_type" select="1"/>
                 </form>
             </field>
         </record>
@@ -101,7 +101,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Attendance reasons">
-                    <field name="name"/>
+                    <field name="name" />
                     <field name="action_type"/>
                 </tree>
             </field>
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
index 15c4ec2693c..39f923a895b 100644
--- a/addons/hr_attendance/security/hr_security.xml
+++ b/addons/hr_attendance/security/hr_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.group_hr_attendance" model="res.groups">
-            <field name="name">Human Resources / Attendances User</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index e5ff0997db2..edcc675b8ef 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,13 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_attendance","hr.action.reason.attendance","model_hr_action_reason","base.group_hr_attendance",1,0,0,0
 "access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
 "access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
 "access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
-"access_hr_attendance_attendance","hr.attendance.attendance","model_hr_attendance","base.group_hr_attendance",1,1,1,1
-"access_hr_employee_attendance","hr.employee.attendance","hr.model_hr_employee","base.group_hr_attendance",1,0,0,0
-"access_resource_resource_attendance","resource.resource.attendance","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1
-"access_hr_job_attendance","hr.job.attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0
-"access_hr_department_attendance","hr.department attendance","hr.model_hr_department","base.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_system","hr.action.reason.system","model_hr_action_reason","base.group_system",1,1,1,1
-"access_hr_attendance_system","hr.attendance.system","model_hr_attendance","base.group_system",1,0,0,0
-"access_hr_attendance_employee","hr.attendance.employee","model_hr_attendance","base.group_user",1,0,0,0
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index cf86710ac93..dbabd9463f1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -47,7 +47,7 @@
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_attendance" sequence="4" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance"/>
+            parent="menu_hr_attendance" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>

From 2a4c1e50cb967d4599507ed63424b4f85c7753ea Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 6 Oct 2010 17:00:17 +0530
Subject: [PATCH 343/632] [IMP] Membership: code cleaning and implement store =
 {.....} on state field

bzr revid: psi@tinyerp.co.in-20101006113017-bugl9ock8irplrvh
---
 addons/membership/membership.py | 78 +++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 1e92d3c619b..2ae25eae13d 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -49,6 +49,14 @@ STATE_PRIOR = {
 class membership_line(osv.osv):
     '''Member line'''
 
+    def _get_membership_lines(self, cr, uid, ids, context=None):
+            list_membership_line = []
+            member_line_obj = self.pool.get('membership.membership_line')
+            for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
+                if invoice.invoice_line:
+                    list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context)
+            return list_membership_line
+
     def _check_membership_date(self, cr, uid, ids, context=None):
         """Check if membership product is not in the past
         @param self: The object pointer
@@ -84,7 +92,7 @@ class membership_line(osv.osv):
         @param return: Dictionary of state Value
         """
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             cr.execute('''
             SELECT i.state, i.id FROM
             account_invoice i
@@ -111,7 +119,7 @@ class membership_line(osv.osv):
                 state = 'invoiced'
             elif istate == 'paid':
                 state = 'paid'
-                inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1])
+                inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1], context=context)
                 for payment in inv.payment_ids:
                     if payment.invoice and payment.invoice.type == 'out_refund':
                         state = 'canceled'
@@ -133,7 +141,12 @@ class membership_line(osv.osv):
         'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
-        'state': fields.function(_state, method=True, string='Membership State', type='selection', selection=STATE, store=True),
+        'state': fields.function(
+                        _state, method=True,
+                        string='Membership State', type='selection',
+                        selection=STATE, store = {
+                        'account.invoice':(_get_membership_lines, ['state'], 10),
+                        }),
         'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True)
     }
     _rec_name = 'partner'
@@ -152,7 +165,7 @@ class Partner(osv.osv):
     def _get_partner_id(self, cr, uid, ids, context=None):
         member_line_obj = self.pool.get('membership.membership_line')
         res_obj =  self.pool.get('res.partner')
-        data_inv = member_line_obj.browse(cr, uid, ids, context)
+        data_inv = member_line_obj.browse(cr, uid, ids, context=context)
         list_partner = []
         for data in data_inv:
             list_partner.append(data.partner.id)
@@ -165,7 +178,7 @@ class Partner(osv.osv):
     def _get_invoice_partner(self, cr, uid, ids, context=None):
         inv_obj = self.pool.get('account.invoice')
         res_obj = self.pool.get('res.partner')
-        data_inv = inv_obj.browse(cr, uid, ids, context)
+        data_inv = inv_obj.browse(cr, uid, ids, context=context)
         list_partner = []
         for data in data_inv:
             list_partner.append(data.partner_id.id)
@@ -190,7 +203,7 @@ class Partner(osv.osv):
             res[id] = 'none'
         today = time.strftime('%Y-%m-%d')
         for id in ids:
-            partner_data = self.browse(cr, uid, id)
+            partner_data = self.browse(cr, uid, id, context=context)
             if partner_data.membership_cancel and today > partner_data.membership_cancel:
                 res[id] = 'canceled'
                 continue
@@ -237,7 +250,7 @@ class Partner(osv.osv):
             if partner_data.free_member and s!=0:
                 res[id] = 'free'
             if partner_data.associate_member:
-                res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context)
+                res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context)
                 res[id] = res_state[partner_data.associate_member.id]
         return res
 
@@ -249,7 +262,7 @@ class Partner(osv.osv):
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
 
-        for partner in self.browse(cr, uid, ids):
+        for partner in self.browse(cr, uid, ids, context=context):
 
             if partner.associate_member:
                  partner_id = partner.associate_member.id
@@ -264,22 +277,22 @@ class Partner(osv.osv):
 
             if name == 'membership_start':
                 line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                            limit=1, order='date_from')
+                            limit=1, order='date_from', context=context)
                 if line_id:
                         res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
-                                ['date_from'])['date_from']
+                                ['date_from'], context=context)['date_from']
 
             if name == 'membership_stop':
                 line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
-                            limit=1, order='date_to desc')
+                            limit=1, order='date_to desc', context=context)
                 if line_id1:
                       res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
-                                ['date_to'])['date_to']
+                                ['date_to'], context=context)['date_to']
             if name == 'membership_cancel':
                 if partner.membership_state == 'canceled':
-                    line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)],limit=1, order='date_cancel')
+                    line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
                     if line_id2:
-                        res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0],['date_cancel'])['date_cancel']
+                        res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
 
         return res
 
@@ -366,7 +379,7 @@ class Partner(osv.osv):
             context = {}
         default = default.copy()
         default['member_lines'] = []
-        return super(Partner, self).copy(cr, uid, id, default, context)
+        return super(Partner, self).copy(cr, uid, id, default, context=context)
 
     def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
         """ Create Customer Invoice of Membership for partners.
@@ -411,8 +424,7 @@ class Partner(osv.osv):
                 'address_invoice_id': addr.get('invoice', False),
                 'account_id': account_id,
                 'fiscal_position': fpos_id or False
-                }
-            )
+                }, context=context)
             line_value['invoice_id'] = invoice_id
             invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
             invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
@@ -438,8 +450,8 @@ class Product(osv.osv):
         model_obj = self.pool.get('ir.model.data')
 
         if ('product' in context) and (context['product']=='membership_product'):
-            model_data_ids_form = model_obj.search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])])
-            resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id','name'])
+            model_data_ids_form = model_obj.search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])], context=context)
+            resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id','name'], context=context)
             dict_model={}
             for i in resource_id_form:
                 dict_model[i['name']]=i['res_id']
@@ -468,18 +480,16 @@ class Invoice(osv.osv):
 
     _inherit = 'account.invoice'
 
-    def action_cancel(self, cr, uid, ids, context=None):
+    def action_cancel(self, cr, uid, ids, *args):
         '''Create a 'date_cancel' on the membership_line object'''
-        if context is None:
-            context = {}
         member_line_obj = self.pool.get('membership.membership_line')
         today = time.strftime('%Y-%m-%d')
         for invoice in self.browse(cr, uid, ids):
             mlines = member_line_obj.search(cr, uid,
                     [('account_invoice_line','in',
-                        [ l.id for l in invoice.invoice_line])], context)
-            member_line_obj.write(cr, uid, mlines, {'date_cancel':today}, context)
-        return super(Invoice, self).action_cancel(cr, uid, ids, context)
+                        [ l.id for l in invoice.invoice_line])])
+            member_line_obj.write(cr, uid, mlines, {'date_cancel':today})
+        return super(Invoice, self).action_cancel(cr, uid, ids)
 Invoice()
 
 class account_invoice_line(osv.osv):
@@ -492,9 +502,9 @@ class account_invoice_line(osv.osv):
             context={}
         res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
         member_line_obj = self.pool.get('membership.membership_line')
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.invoice_id.type == 'out_invoice':
-                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context)
                 if line.product_id and line.product_id.membership and not ml_ids:
                     # Product line has changed to a membership product
                     date_from = line.product_id.membership_date_from
@@ -509,7 +519,7 @@ class account_invoice_line(osv.osv):
                         'date_from': date_from,
                         'date_to': date_to,
                         'account_invoice_line': line.id,
-                        })
+                        }, context=context)
                 if line.product_id and not line.product_id.membership and ml_ids:
                     # Product line has changed to a non membership product
                     member_line_obj.unlink(cr, uid, ml_ids, context=context)
@@ -522,19 +532,19 @@ class account_invoice_line(osv.osv):
             context={}
         member_line_obj = self.pool.get('membership.membership_line')
         for id in ids:
-            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',id)])
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',id)], context=context)
             member_line_obj.unlink(cr, uid, ml_ids, context=context)
         return super(account_invoice_line, self).unlink(cr, uid, ids, context=context)
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         """Overrides orm create method
         """
-        result = super(account_invoice_line, self).create(cr, uid, vals, context)
-        line = self.browse(cr, uid, result)
+        result = super(account_invoice_line, self).create(cr, uid, vals, context=context)
+        line = self.browse(cr, uid, result, context=context)
         member_line_obj = self.pool.get('membership.membership_line')
         if line.invoice_id.type == 'out_invoice':
 
-            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+            ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context)
             if line.product_id and line.product_id.membership and not ml_ids:
                 # Product line is a membership product
                 date_from = line.product_id.membership_date_from
@@ -549,7 +559,7 @@ class account_invoice_line(osv.osv):
                             'date_from': date_from,
                             'date_to': date_to,
                             'account_invoice_line': line.id,
-                        })
+                        }, context=context)
         return result
 
 account_invoice_line()

From a2e845565959a1b3ccc53bc0f0860e6cc2f2f11a Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 6 Oct 2010 17:11:03 +0530
Subject: [PATCH 344/632] [IMP] point_of_sale, mrp, auction: Domain on 'Month
 -1' button corrected for analysis reports.

bzr revid: uco@tinyerp.com-20101006114103-34ld85qzsoqpd2ki
---
 addons/auction/report/report_auction_view.xml | 23 ++++++++++---------
 .../mrp/report/mrp_production_order_view.xml  |  2 +-
 .../report/report_cash_register_view.xml      |  2 +-
 .../report/report_pos_order_view.xml          |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/auction/report/report_auction_view.xml b/addons/auction/report/report_auction_view.xml
index 8153314e877..ec4f36ceb70 100644
--- a/addons/auction/report/report_auction_view.xml
+++ b/addons/auction/report/report_auction_view.xml
@@ -37,23 +37,24 @@
         <field name="arch" type="xml">
             <search string="Auction Summary">
                 <group>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Auction in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
+                    <filter icon="terp-go-year" string="Year"
+                        domain="[('year','=',time.strftime('%%Y'))]"
+                        help="Auction during current year."/>
+                    <filter icon="terp-go-month" string="Month"
                         name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Auction in last 30 days"/>
+                        domain="[('month','=',time.strftime('%%m'))]"
+                        help="Auction during current month."/>
                     <filter icon="terp-go-week"
-                         string="    7 Days    "
+                         string="Month -1"
                          separator="1"
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Auction during last 7 days"/>
+                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+                         help="Auction during last month."/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Draft"
                         domain="[('state','=','draft')]"/>
                     <filter icon="terp-dolar"
+                        name="sold"
                         string="Sold"
                         domain="[('state','=', 'sold')]"/>
                     <separator orientation="vertical"/>
@@ -74,7 +75,7 @@
                     <filter string="Buyer" icon="terp-personal" name="buyer" context="{'group_by':'buyer'}"/>
                     <filter string="Seller" icon="terp-personal" name="seller" context="{'group_by':'seller'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Auction" icon="terp-project" name="auction" context="{'group_by':'auction'}"/>
+                    <filter string="Auction" icon="terp-project" name="auction_date" context="{'group_by':'auction'}"/>
                     <separator orientation="vertical" />
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Type"
@@ -113,7 +114,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_report_auction_search"/>
-        <field name="context">{'search_default_month':1}</field>
+        <field name="context">{'search_default_month':1,'search_default_sold':1,'search_default_auction_date':1, 'group_by':[], 'group_by_no_leaf':1}</field>
     </record>
 
     <menuitem name="Auction Analysis" action="action_report_auction" id="menu_report_auction" parent="auction.auction_report_menu"/>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index ea1f15bc3ea..24a2fb0057f 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -58,7 +58,7 @@
 		                <filter icon="terp-go-week"
 	                            string="Month -1"
 	                            separator="1"
-	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                            domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
 	                            help="Production during last month"/>
                       <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index fb498336fb5..df0dfc877de 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -36,7 +36,7 @@
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
 	                         help="Cash Analysis created in last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index b149ebf3fb8..1ca4e9876ea 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -47,7 +47,7 @@
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
 	                         help="POS ordered created last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"

From 382669fa1c46d9b8d5ba96b58153c6be8330e840 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 17:28:06 +0530
Subject: [PATCH 345/632] improved for pageCount in like survey type report

bzr revid: apa@tinyerp.com-20101006115806-2ub94u9sfrspo9w8
---
 bin/report/interface.py               | 8 ++++++++
 bin/report/render/rml2pdf/trml2pdf.py | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 0ee9f432883..0a42d8d74b0 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -70,6 +70,7 @@ class report_rml(report_int):
     def __init__(self, name, table, tmpl, xsl):
         super(report_rml, self).__init__(name)
         self.table = table
+        self.pageCount=False
         self.tmpl = tmpl
         self.xsl = xsl
         self.bin_datas = {}
@@ -174,6 +175,13 @@ class report_rml(report_int):
         return xml
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
+        if not localcontext:
+            localcontext={}
+            if self.tmpl=='' and not self.pageCount:
+                self.pageCount=True
+            else:
+              self.pageCount=False
+            localcontext.update({'header':self.pageCount})
         if logo:
             self.bin_datas['logo'] = logo
         else:
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 51461ec36fc..1cd5a9b938a 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -820,8 +820,9 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
         self.localcontext = localcontext
-        if not self.localcontext:
-            self.localcontext={'header':'internal'}
+        if not self.localcontext or not self.localcontext.get('header',False):
+            self.localcontext={}
+            self.localcontext.update({'header':'internal'})
         self.images= images
         self.path = path
         self.title = title

From b6017946cb548bcba8ffcfaf63b8d157d0f98597 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 6 Oct 2010 17:35:48 +0530
Subject: [PATCH 346/632] [IMP,ADD] auction: Added user/manager group. Improved
 access rules accordingly.

bzr revid: uco@tinyerp.com-20101006120548-bgj5ipqvr8sgu9g2
---
 addons/auction/__openerp__.py                |  1 +
 addons/auction/auction_view.xml              | 11 +++--
 addons/auction/security/auction_security.xml | 13 ++++++
 addons/auction/security/ir.model.access.csv  | 45 ++++++++++++++------
 4 files changed, 52 insertions(+), 18 deletions(-)
 create mode 100644 addons/auction/security/auction_security.xml

diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 7105102b385..c26a1f1bbfb 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -42,6 +42,7 @@
     'depends': ['base', 'account', 'hr_attendance'],
     'init_xml': ['auction_sequence.xml', 'auction_data.xml'],
     'update_xml': [
+        'security/auction_security.xml',
         'security/ir.model.access.csv',
         'wizard/auction_lots_make_invoice_buyer_view.xml',
         'wizard/auction_lots_make_invoice_view.xml',
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index c3068753a6e..4e5436a9bee 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system"/>
-    <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
+    <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" 
+                groups="base.group_system,group_auction_manager,group_auction_user"/>
+    <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="base.group_system,group_auction_manager"/>
     <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
     <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
 
@@ -80,7 +81,8 @@
         <field name="view_id" ref="view_auction_object_categories_tree"/>
     </record>
 
-    <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
+    <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" 
+                id="menu_auction_object_cat" groups="base.group_system,group_auction_manager"/>
 
    <!--  Auction Management/Auction Dates/New Auction Dates  -->
 
@@ -485,6 +487,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_all_objects">
+        <field name="name">Objects</field>
         <field name="res_model">auction.lots</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,graph</field>
@@ -762,7 +765,7 @@
     <menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
     <menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
 
-    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
+    <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="base.group_system,group_auction_manager"/>
 
     <act_window name="Deposit slip"
         context="{'search_default_partner_id': [active_id]}"
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
new file mode 100644
index 00000000000..32fdf0d64f3
--- /dev/null
+++ b/addons/auction/security/auction_security.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record id="group_auction_manager" model="res.groups">
+        <field name="name">Auction / Manager</field>
+    </record>
+    <record id="group_auction_user" model="res.groups">
+        <field name="name">Auction / User</field>
+    </record>
+    
+</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index cd4ec1a77f0..31f3182fa04 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -1,18 +1,23 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_auction_artists","auction.artists","model_auction_artists","base.group_user",1,1,1,1
-"access_auction_dates","auction.dates","model_auction_dates","base.group_user",1,1,1,1
-"access_auction_deposit","auction.deposit","model_auction_deposit","base.group_user",1,1,1,1
-"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","base.group_user",1,1,1,1
-"access_auction_lot_category","auction.lot.category","model_auction_lot_category","base.group_user",1,1,1,1
-"access_auction_lots","auction.lots","model_auction_lots","base.group_user",1,1,1,1
-"access_auction_bid","auction.bid","model_auction_bid","base.group_user",1,1,1,1
-"access_auction_bid_line","auction.bid.line","model_auction_bid_line","base.group_user",1,1,1,1
-"access_auction_lot_history","auction.lot.history","model_auction_lot_history","base.group_user",1,1,1,1
-"access_report_auction","report.auction","model_report_auction","base.group_user",1,0,0,0
-"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","base.group_user",1,0,0,0
-"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","base.group_user",1,0,0,0
-"access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
-"access_aie_category","aie.category","model_aie_category","base.group_user",1,0,0,0
+"access_auction_artists","auction.artists","model_auction_artists","group_auction_manager",1,1,1,1
+"access_auction_dates_manager","auction.dates manager","model_auction_dates","group_auction_manager",1,1,1,1
+"access_auction_deposit_manager","auction.deposit manager","model_auction_deposit","group_auction_manager",1,1,1,1
+"access_auction_deposit_cost","auction.deposit.cost","model_auction_deposit_cost","group_auction_manager",1,1,1,1
+"access_auction_lot_category","auction.lot.category","model_auction_lot_category","group_auction_user",1,0,0,0
+"access_auction_lot_category_manager","auction.lot.category manager","model_auction_lot_category","group_auction_manager",1,1,1,1
+"access_auction_lots","auction.lots","model_auction_lots","group_auction_user",1,1,1,1
+"access_auction_lots_manager","auction.lots manager","model_auction_lots","group_auction_manager",1,0,0,0
+"access_auction_bid","auction.bid","model_auction_bid","group_auction_user",1,1,1,1
+"access_auction_bid_manager","auction.bid manager","model_auction_bid","group_auction_manager",1,0,0,0
+"access_auction_bid_line","auction.bid.line","model_auction_bid_line","group_auction_user",1,1,1,1
+"access_auction_bid_line_manager","auction.bid.line manager","model_auction_bid_line","group_auction_manager",1,0,0,0
+"access_auction_lot_history","auction.lot.history","model_auction_lot_history","group_auction_user",1,1,1,1
+"access_auction_lot_history_manager","auction.lot.history manager","model_auction_lot_history","group_auction_manager",1,0,0,0
+"access_report_auction","report.auction","model_report_auction","group_auction_manager",1,1,1,1
+"access_report_auction_object_date","report.auction.object.date","model_report_auction_object_date","group_auction_manager",1,1,1,1
+"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
+"access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
+"access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
 "access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0
 "access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0
 "access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0
@@ -22,3 +27,15 @@
 "access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0
 "access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0
 "access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0
+"access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
+"access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
+"access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
+"access_auction_account_invoice","account.invoice manager","account.model_account_invoice","group_auction_manager",1,1,1,0
+"access_auction_account_invoice_line","account.invoice.line manager","account.model_account_invoice_line","group_auction_manager",1,1,1,0
+"access_auction_account_invoice_tax","account.invoice.tax manager","account.model_account_invoice_tax","group_auction_manager",1,1,1,0
+"access_auction_account_analytic_journal","account.analytic.journal manager","account.model_account_analytic_journal","group_auction_manager",1,1,1,0
+"access_auction_account_period","account.period manager","account.model_account_period","group_auction_manager",1,1,1,0
+"access_auction_account_move","account.move manager","account.model_account_move","group_auction_manager",1,1,1,0
+"access_auction_account_move_line","account.move.line manager","account.model_account_move_line","group_auction_manager",1,1,1,0
+"access_auction_account_journal_period","account.journal.period manager","account.model_account_journal_period","group_auction_manager",1,1,1,0
+"access_auction_account_analytic_line","account.analytic.line manager","account.model_account_analytic_line","group_auction_manager",1,1,1,1

From 1cbfb6fdf9066eeefe415a84ba1e0e057c85cf6c Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 17:59:49 +0530
Subject: [PATCH 347/632] improved

bzr revid: apa@tinyerp.com-20101006122949-u2h74kq5hrvuuvkw
---
 bin/report/interface.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 0a42d8d74b0..28197c7872d 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -70,7 +70,7 @@ class report_rml(report_int):
     def __init__(self, name, table, tmpl, xsl):
         super(report_rml, self).__init__(name)
         self.table = table
-        self.pageCount=False
+        self.pageCount=True
         self.tmpl = tmpl
         self.xsl = xsl
         self.bin_datas = {}
@@ -180,8 +180,9 @@ class report_rml(report_int):
             if self.tmpl=='' and not self.pageCount:
                 self.pageCount=True
             else:
-              self.pageCount=False
+                self.pageCount=False
             localcontext.update({'header':self.pageCount})
+
         if logo:
             self.bin_datas['logo'] = logo
         else:
@@ -189,6 +190,7 @@ class report_rml(report_int):
                 del self.bin_datas['logo']
         obj = render.rml(rml, localcontext, self.bin_datas, tools.config['root_path'],title)
         obj.render()
+        self.pageCount=True
         return obj.get()
 
     def create_html(self, rml, localcontext = None, logo=None, title=None):

From f98f9559956cae0ac26098f3720d7b49a291355b Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 18:00:01 +0530
Subject: [PATCH 348/632] improve

bzr revid: apa@tinyerp.com-20101006123001-43cuuw1q39hzq3pn
---
 addons/survey/report/survey_analysis_report.py | 1 +
 addons/survey/report/survey_browse_response.py | 3 ++-
 addons/survey/report/survey_form.py            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index a5ad7276b00..4aa4b099c57 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -423,6 +423,7 @@ class survey_analysis(report_rml):
         rml += """</document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
+        self.pageCount=True
         pdf = create_doc(rml, title=self.title)
 
         return (pdf, report_type)
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index a8bfa906c90..d024e410d0e 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -273,7 +273,7 @@ class survey_browse_response(report_rml):
                                         style = 'tbl_white'
                                     else:
                                         style = 'tbl_gainsboro'
-                                    i +=1 
+                                    i +=1
                                     rml += """<blockTable colWidths=" """ + str(colWidths) + """ " style='"""+style+"""'><tr>"""
                                     table_data = col_heading.browse(cr, uid, col_heading.search(cr, uid, [('response_table_id', '=', answer[0].id), ('name', '=', row)]))
                                     for column in matrix_ans:
@@ -520,6 +520,7 @@ class survey_browse_response(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
+        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
 
         return (pdf, report_type)
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 5a7d5e283e3..5836be2d399 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -389,8 +389,8 @@ class survey_form(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
+        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
-
         return (pdf, report_type)
 
 survey_form('report.survey.form', 'survey','','')

From a1932d0f639e0caf1a483321297910b26fcb425e Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Wed, 6 Oct 2010 18:00:08 +0530
Subject: [PATCH 349/632] [ADD] membership: added three filter in membership
 report.

bzr revid: vra@tinyerp.com-20101006123008-2rsbe6envqitig42
---
 .../report/report_membership_view.xml         | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 3caa110e1cf..2d8b4255d1a 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -10,20 +10,20 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');black:state in ('open','free');gray:state in ('done','cancel') " string="Membership">
-                    <field name="state"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="membership_id"/>
-                    <field name="num_canceled"/>
-                    <field name="num_waiting"/>
-                    <field name="num_invoiced"/>
-                    <field name="tot_pending"/>
-                    <field name="num_paid"/>
-                    <field name="num_old"/>
-                    <field name="tot_earned"/>
-                    <field name="num_free"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
+                    <field name="state" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="partner_id" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="user_id" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="membership_id" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="num_canceled" invisible="context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="num_waiting" invisible="context.get('free_cancel_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="num_invoiced" invisible="context.get('free_cancel_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="tot_pending" invisible="context.get('free_cancel_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="num_paid" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False)"/>
+                    <field name="num_old" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False)"/>
+                    <field name="tot_earned" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False)"/>
+                    <field name="num_free" invisible="context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="date_from" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+                    <field name="date_to" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
                     <field name="year" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="company_id" invisible="1"/>
@@ -44,6 +44,22 @@
                         <filter string="Last 30 Days" icon="terp-go-month" name="month"
                             domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
+		                <filter icon="terp-camera_test"
+		                    string="Invoiced"
+		                    domain="[('state','=','invoiced')]"/>
+		                <filter icon="terp-check"
+                            string="Paid"
+                            domain="[('state','=','paid')]"/>
+                        <filter icon="terp-gtk-media-pause"
+                            string="Waiting"
+                            default="1" name="none"
+                            domain="[('state','=', 'waiting')]"/>
+                        <filter string="Cancel And Free" icon="terp-check" context="{'free_cancel_visible':1}"/>
+                        <filter string="Forecast" icon="terp-check" context="{'waiting_invoiced_totpending_visible':1}"/>
+                        <filter string="Revenue Done" name="Revenue" icon="terp-check" context="{'paid_old_totearned_visible':1}"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="membership_id"/>
                         <field name="state"/>
                         <field name="user_id"/>
                     </group>
@@ -90,7 +106,7 @@
             <field name="res_model">report.membership</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_report_membership_search"/>
-            <field name="context">{"search_default_member":1}</field>
+            <field name="context">{"search_default_member":1, 'search_default_Revenue':1}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_membership_tree_view1">

From 34a533beba83349e46c3cfed13f33d3600e49ef5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 18:01:08 +0530
Subject: [PATCH 350/632] [MOD/IMP] hr_contract : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006123108-zdrz31iewg7xfpvq
---
 addons/hr_contract/hr_contract_view.xml       |  4 +--
 .../hr_contract/security/ir.model.access.csv  | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0f38a783d73..ede2c11c5bb 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -57,7 +57,7 @@
             <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_system"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_hr_manager"/>
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56" sequence="7"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
@@ -277,7 +277,7 @@
         </record>
 
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_system,base.group_hr_manager,base.group_hr_contract"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window 
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 9ed14b14755..00b1410ffa3 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,20 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_contract_wage_type_period_manager","hr.contract.wage.type.period.manager","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
+"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
 "access_hr_contract_wage_type_manager","hr.contract.wage.type.manager","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_contract","hr.contract.wage.type.contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period.contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1
-"access_hr_contract_contract","hr.contract.contract","model_hr_contract","base.group_hr_contract",1,1,1,1
-"access_hr_employee_contract_contract","hr.employee.contract.contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1
-"access_hr_resource_contract","hr.employee.resource.contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1
-"access_hr_resource_calendar_contract","hr.employee.resource.calendar.contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1
-"access_hr_job_contract","hr.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1
-"access_hr_contract_type_contract","hr.contract.type.contract","model_hr_contract_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_system","hr.contract.wage.type.system","model_hr_contract_wage_type","base.group_system",1,1,1,1
-"access_hr_contract_wage_type_period_system","hr.contract.wage.type.period.system","model_hr_contract_wage_type_period","base.group_system",1,1,1,1
-"access_hr_contract_type_system","hr.contract.type.system","model_hr_contract_type","base.group_system",1,1,1,1
-"access_hr_contract_system","hr.contract.system","model_hr_contract","base.group_system",1,1,1,1
-"access_hr_employee_category_contract","hr.employee.category.contract","hr.model_hr_employee_category","base.group_hr_contract",1,1,1,1
-"access_hr_department_contract","hr.department.contract","hr.model_hr_department","base.group_hr_contract",1,1,1,1
+"access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
 "access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
 "access_hr_contract_employee","hr.contract.employee","model_hr_contract","base.group_user",1,0,0,0
+"access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
+"access_hr_employee_contract_manager","hr.employee.contract.manager","hr.model_hr_employee","base.group_hr_manager",1,1,1,1
+"access_hr_employee_category_manager","hr.employee.category.manager","hr.model_hr_employee_category","base.group_hr_manager",1,1,1,1
+"access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
+"access_hr_resource_calendar_manager","hr.employee.resource.calendar.manager","resource.model_resource_calendar","base.group_hr_manager",1,1,1,1
+"access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
+"access_hr_job_manager","hr.job manager","hr.model_hr_job","base.group_hr_manager",1,1,1,1
+"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
+"access_hr_department_manager","hr.department.manager","hr.model_hr_department","base.group_hr_manager",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1

From 11ad651b0cff827e0a0727513fdcbb0171afc9b0 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Wed, 6 Oct 2010 18:13:57 +0530
Subject: [PATCH 351/632] [IMP]membership: provide proper help msg and applied
 someremaining changes in membership report.

bzr revid: vra@tinyerp.com-20101006124357-dhi34uv7un3k5c68
---
 .../membership/report/report_membership_view.xml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 2d8b4255d1a..abe8b44bcba 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -44,19 +44,9 @@
                         <filter string="Last 30 Days" icon="terp-go-month" name="month"
                             domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
-		                <filter icon="terp-camera_test"
-		                    string="Invoiced"
-		                    domain="[('state','=','invoiced')]"/>
-		                <filter icon="terp-check"
-                            string="Paid"
-                            domain="[('state','=','paid')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Waiting"
-                            default="1" name="none"
-                            domain="[('state','=', 'waiting')]"/>
-                        <filter string="Cancel And Free" icon="terp-check" context="{'free_cancel_visible':1}"/>
-                        <filter string="Forecast" icon="terp-check" context="{'waiting_invoiced_totpending_visible':1}"/>
-                        <filter string="Revenue Done" name="Revenue" icon="terp-check" context="{'paid_old_totearned_visible':1}"/>
+                        <filter string="Cancel &amp; Free" icon="terp-check" context="{'free_cancel_visible':1}" help="This will display free and cancel column"/>
+                        <filter string="Forecast" icon="terp-check" context="{'waiting_invoiced_totpending_visible':1}" help="This will display waiting, invoiced and total pending columns"/>
+                        <filter string="Revenue Done" name="Revenue" icon="terp-check" context="{'paid_old_totearned_visible':1}" help="This will display paid, old and total earned columns"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>

From 15792bb9fa9ba8523318e4f1490dda0d5d186ec6 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 6 Oct 2010 18:14:54 +0530
Subject: [PATCH 352/632] [IMP]: improve the hr_payroll module make it fully
 independent of account and hr_expanse module Accounting functionalities to
 payroll will be added by the hr_payroll_account module.

bzr revid: mga@tinyerp.com-20101006124454-t1vgn6879dnu62ou
---
 addons/hr_payroll/__openerp__.py              |  13 +-
 addons/hr_payroll/hr_payroll.py               | 375 ++++++------------
 addons/hr_payroll/hr_payroll_demo.xml         | 120 +-----
 addons/hr_payroll/hr_payroll_view.xml         | 168 ++++----
 .../hr_payroll/security/ir.model.access.csv   |  12 -
 addons/hr_payroll/wizard/__init__.py          |   2 +-
 .../wizard/hr_payroll_create_analytic.py      | 101 -----
 .../wizard/hr_payroll_create_analytic.xml     |  32 --
 8 files changed, 198 insertions(+), 625 deletions(-)
 delete mode 100644 addons/hr_payroll/wizard/hr_payroll_create_analytic.py
 delete mode 100644 addons/hr_payroll/wizard/hr_payroll_create_analytic.xml

diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index ab814ed80c2..c9339ce013c 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -37,10 +37,8 @@
     'website':'http://www.openerp.com',
     'depends': [
         'hr',
-        'account',
         'hr_contract',
-        'hr_holidays',
-        'hr_expense'
+        'hr_holidays'
     ],
     'init_xml': [
     ],
@@ -52,15 +50,14 @@
         'hr_paroll_report.xml',
         'hr_payroll_data.xml',
         'security/ir.model.access.csv',
-        'wizard/hr_payroll_create_analytic.xml',
         'wizard/hr_payroll_employees_detail.xml',
         'wizard/hr_payroll_year_salary.xml',
     ],
     'test': [
-         'test/payslip.yml',
-         'test/payment_advice.yml',
-         'test/payroll_register.yml',
-         'test/hr_payroll_report.yml',
+#         'test/payslip.yml',
+#         'test/payment_advice.yml',
+#         'test/payroll_register.yml',
+#         'test/hr_payroll_report.yml',
     ],
     'demo_xml': [
         'hr_payroll_demo.xml'
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index d7de7efbcbc..8643c2301af 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -21,15 +21,15 @@
 ##############################################################################
 
 import time
-from datetime import date, datetime, timedelta
-import netsvc
+from datetime import date
+from datetime import datetime
+from datetime import timedelta
 
+import netsvc
 from osv import fields, osv
 from tools import config
 from tools.translate import _
 
-
-
 def prev_bounds(cdate=False):
     when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
     this_first = date(when.year, when.month, 1)
@@ -64,7 +64,6 @@ class hr_passport(osv.osv):
 
     _name = 'hr.passport'
     _description = 'Passport Detail'
-
     _columns = {
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
         'name':fields.char('Passport No', size=64, required=True, readonly=False),
@@ -75,6 +74,9 @@ class hr_passport(osv.osv):
         'contracts_ids':fields.one2many('hr.contract', 'passport_id', 'Contracts', required=False, readonly=True),
         'note': fields.text('Description'),
     }
+    _sql_constraints = [
+        ('passport_no_uniq', 'unique (employee_id, name)', 'The Passport No must be unique !'),
+    ]
 hr_passport()
 
 class hr_payroll_structure(osv.osv):
@@ -84,15 +86,13 @@ class hr_payroll_structure(osv.osv):
     - Allowlance
     - Deductions
     """
-
+    
     _name = 'hr.payroll.structure'
     _description = 'Salary Structure'
-
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True, readonly=False),
         'line_ids':fields.one2many('hr.payslip.line', 'function_id', 'Salary Structure', required=False),
-        'account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'note': fields.text('Description'),
     }
@@ -136,8 +136,7 @@ class hr_contract(osv.osv):
 
     _columns = {
         'permit_no':fields.char('Work Permit No', size=256, required=False, readonly=False),
-#        'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
-        'passport_id':fields.char('Passport',size=64, required=False),
+        'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
         'visa_no':fields.char('Visa No', size=64, required=False, readonly=False),
         'visa_expire': fields.date('Visa Expire Date'),
         'struct_id' : fields.many2one('hr.payroll.structure', 'Salary Structure'),
@@ -146,14 +145,6 @@ class hr_contract(osv.osv):
     _defaults = {
         'working_days_per_week': lambda *a: 5,
     }
-
-    def on_change_employee_id(self, cr, uid, ids, employee_id):
-        v = {}
-        passport = self.pool.get('hr.employee').browse(cr, uid, employee_id).passport_id
-        if passport:
-            v['passport_id'] = passport
-        return {'value': v}
-
 hr_contract()
 
 class payroll_register(osv.osv):
@@ -198,16 +189,14 @@ class payroll_register(osv.osv):
             ('done','Paid Salary'),
             ('cancel','Reject'),
         ],'State', select=True, readonly=True),
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal', required=True),
-        'bank_journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
         'active':fields.boolean('Active', required=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
         'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 4)),
         'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 4)),
         'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 4)),
         'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, 4)),
         'note': fields.text('Description'),
+        'bank_id':fields.many2one('res.bank', 'Bank', required=False, help="Select the Bank Address from whcih the salary is going to be paid"),
     }
 
     _defaults = {
@@ -228,8 +217,7 @@ class payroll_register(osv.osv):
         if context is None:
             context = {}
 
-        vals = self.browse(cr, uid, ids, context=context)[0]
-
+        vals = self.browse(cr, uid, ids[0], context=context)
         emp_ids = emp_pool.search(cr, uid, [], context=context)
 
         for emp in emp_pool.browse(cr, uid, emp_ids, context=context):
@@ -245,8 +233,6 @@ class payroll_register(osv.osv):
                     'register_id':ids[0],
                     'name':vals.name,
                     'date':vals.date,
-                    'journal_id':vals.journal_id.id,
-                    'bank_journal_id':vals.bank_journal_id.id
                 }
                 slip_id = slip_pool.create(cr, uid, res, context=context)
                 wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
@@ -283,26 +269,22 @@ class payroll_register(osv.osv):
             wf_service = netsvc.LocalService("workflow")
             for sid in sids:
                 wf_service.trg_validate(uid, 'hr.payslip', sid, 'final_verify_sheet', cr)
-
+        
+        company_name = users_pool.browse(cr, uid, uid, context=context).company_id.name
         for reg in self.browse(cr, uid, ids, context=context):
-            accs = {}
+            advice = {
+                'name': 'Payment Advice from %s' % (company_name),
+                'number': sequence_pool.get(cr, uid, 'payment.advice'),
+                'register_id':reg.id
+            }
+            pid = advice_pool.create(cr, uid, advice, context=context)
+            
             for slip in reg.line_ids:
-                pid = False
-                if accs.get(slip.employee_id.property_bank_account.code, False) == False:
-                    advice = {
-                        'name': 'Payment Advice from %s / Bank Account %s' % (users_pool.browse(cr, uid, uid, context=context).company_id.name, slip.employee_id.property_bank_account.name),
-                        'number': sequence_pool.get(cr, uid, 'payment.advice'),
-                        'register_id':reg.id,
-                        'account_id':slip.employee_id.property_bank_account.id
-                    }
-                    pid = advice_pool.create(cr, uid, advice, context=context)
-                    accs[slip.employee_id.property_bank_account.code] = pid
-                else:
-                    pid = accs[slip.employee_id.property_bank_account.code]
-
+                if not slip.employee_id.bank_account_id:
+                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee' % (slip.employee_id.name)))
                 pline = {
                     'advice_id':pid,
-                    'name':slip.employee_id.identification_id,
+                    'name':slip.employee_id.bank_account_id.acc_number,
                     'employee_id':slip.employee_id.id,
                     'amount':slip.other_pay + slip.net,
                     'bysal':slip.net
@@ -332,17 +314,6 @@ class payroll_advice(osv.osv):
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice Note'
 
-    def _get_bank(self, cr, uid, ids, field_name, args, context=None):
-        res = {}
-        if context is None:
-            context = {}
-        for rec in self.browse(cr, uid, ids, context=context):
-            if rec.company_id and rec.company_id.partner_id.bank_ids:
-                res[rec.id] = rec.company_id.partner_id.bank_ids[0].bank.name
-            else:
-                res[rec.id] = ''
-        return res
-
     _columns = {
         'register_id':fields.many2one('hr.payroll.register', 'Payroll Register', required=False),
         'name':fields.char('Name', size=2048, required=True, readonly=False),
@@ -356,11 +327,9 @@ class payroll_advice(osv.osv):
         'number':fields.char('Number', size=64, required=False, readonly=True),
         'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', required=False),
         'chaque_nos':fields.char('Chaque Nos', size=256, required=False, readonly=False),
-        'account_id': fields.many2one('account.account', 'Account', required=True),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'bank': fields.function(_get_bank, method=True, string='Bank', type="char"),
+        'bank_id': fields.related('register_id','bank_id', type='many2one', relation='res.bank', string='Bank', help="Select the Bank Address from whcih the salary is going to be paid"),
     }
-
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
@@ -398,8 +367,6 @@ class payroll_advice(osv.osv):
         return {
             'value':res
         }
-
-
 payroll_advice()
 
 class payroll_advice_line(osv.osv):
@@ -447,48 +414,29 @@ class contrib_register(osv.osv):
     _name = 'hr.contibution.register'
     _description = 'Contribution Register'
 
-    def _total_contrib(self, cr, uid, ids, field_names, arg, context=None):
+    def _total_contrib(self, cr, uid, ids, field_names, arg, context={}):
         line_pool = self.pool.get('hr.contibution.register.line')
-        if context is None:
-            context = {}
-        period_id = self.pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d')),('date_stop','>=',time.strftime('%Y-%m-%d'))], context=context)[0]
-        fiscalyear_id = self.pool.get('account.period').browse(cr, uid, period_id, context=context).fiscalyear_id
+
         res = {}
         for cur in self.browse(cr, uid, ids, context=context):
-            current = line_pool.search(cr, uid, [('period_id','=',period_id),('register_id','=',cur.id)], context=context)
-            years = line_pool.search(cr, uid, [('period_id.fiscalyear_id','=',fiscalyear_id.id), ('register_id','=',cur.id)], context=context)
-
+            current = line_pool.search(cr, uid, [('register_id','=',cur.id)], context=context)
             e_month = 0.0
             c_month = 0.0
             for i in line_pool.browse(cr, uid, current, context=context):
                 e_month += i.emp_deduction
                 c_month += i.comp_deduction
-
-            e_year = 0.0
-            c_year = 0.0
-            for j in line_pool.browse(cr, uid, years, context=context):
-                e_year += i.emp_deduction
-                c_year += i.comp_deduction
-
             res[cur.id]={
                 'monthly_total_by_emp':e_month,
                 'monthly_total_by_comp':c_month,
-                'yearly_total_by_emp':e_year,
-                'yearly_total_by_comp':c_year
             }
-
         return res
 
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'account_id': fields.many2one('account.account', 'Account', required=True),
-        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'register_line_ids':fields.one2many('hr.contibution.register.line', 'register_id', 'Register Line', readonly=True),
-        'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
-        'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
-        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
-        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
+        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', string='Total By Employee', digits=(16, 4)),
+        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', string='Total By Company', digits=(16, 4)),
         'note': fields.text('Description'),
     }
     _defaults = {
@@ -518,11 +466,14 @@ class contrib_register_line(osv.osv):
         'register_id':fields.many2one('hr.contibution.register', 'Register', required=False),
         'code':fields.char('Code', size=64, required=False, readonly=False),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
-        'period_id': fields.many2one('account.period', 'Period'),
+        'date': fields.date('Date'),
         'emp_deduction': fields.float('Employee Deduction', digits=(16, 4)),
         'comp_deduction': fields.float('Company Deduction', digits=(16, 4)),
         'total': fields.function(_total, method=True, store=True,  string='Total', digits=(16, 4)),
     }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+    }
 contrib_register_line()
 
 class payment_category(osv.osv):
@@ -605,8 +556,8 @@ class company_contribution(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
     }
-
-    def execute_function(self, cr, uid, id, value, context=None):
+    
+    def _execute_function(self, cr, uid, id, value, context=None):
         """
         self: pointer to self object
         cr: cursor to database
@@ -624,7 +575,16 @@ class company_contribution(osv.osv):
         else:
             res = line_pool.browse(cr, uid, ids, context=context)[0].value
         return res
-
+        
+    def compute(self, cr, uid, id, value, context={}):
+        contrib = self.browse(cr, uid, id, context)
+        if contrib.amount_type == 'fix':
+            return contrib.contribute_per
+        elif contrib.amount_type == 'per':
+            return value * contrib.contribute_per
+        elif contrib.amount_type == 'func':
+            return self._execute_function(cr, uid, id, value, context)
+        return 0.0
 company_contribution()
 
 class company_contribution_line(osv.osv):
@@ -639,7 +599,6 @@ class company_contribution_line(osv.osv):
     _columns = {
         'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),
         'name':fields.char('Name', size=64, required=False, readonly=False),
-        'umo_id':fields.many2one('product.uom', 'Unite', required=False),
         'from_val': fields.float('From', digits=(16, 4)),
         'to_val': fields.float('To', digits=(16, 4)),
         'amount_type':fields.selection([
@@ -660,8 +619,6 @@ class hr_holidays_status(osv.osv):
             ('unpaid','Un-Paid Holiday'),
             ('halfpaid','Half-Pay Holiday')
             ], string='Payment'),
-        'account_id': fields.many2one('account.account', 'Account', required=False),
-        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'head_id': fields.many2one('hr.allounce.deduction.categoty', 'Payroll Head', domain=[('type','=','deduction')]),
         'code':fields.char('Code', size=64, required=False, readonly=False),
     }
@@ -673,14 +630,6 @@ class hr_holidays_status(osv.osv):
     }
 hr_holidays_status()
 
-class hr_expense_expense(osv.osv):
-    _inherit = "hr.expense.expense"
-    _description = "Expense"
-    _columns = {
-        'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Payroll Head', domain=[('type','=','other')]),
-    }
-hr_expense_expense()
-
 class hr_payslip(osv.osv):
     '''
     Pay Slip
@@ -697,36 +646,23 @@ class hr_payslip(osv.osv):
             allow = 0.0
             deduct = 0.0
             others = 0.0
-
-            obj = {
-                'basic':rs.basic
-            }
+            obj = {'basic':rs.basic}
             if rs.igross > 0:
-                obj.update({
-                    'gross':rs.igross
-                })
+                obj['gross'] = rs.igross
             if rs.inet > 0:
-                obj.update({
-                    'net':rs.inet
-                })
-
+                obj['net'] = rs.inet
             for line in rs.line_ids:
                 amount = 0.0
-
                 if line.amount_type == 'per':
                     try:
                         amount = line.amount * eval(str(line.category_id.base), obj)
                     except Exception, e:
                         raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
-
                 elif line.amount_type in ('fix', 'func'):
                     amount = line.amount
-
                 cd = line.category_id.code.lower()
                 obj[cd] = amount
-
                 contrib = 0.0
-
                 if line.type == 'allowance':
                     allow += amount
                     others += contrib
@@ -741,7 +677,6 @@ class hr_payslip(osv.osv):
                     others += amount
                 elif line.type == 'otherpay':
                     others += amount
-
                 slip_line_obj.write(cr, uid, [line.id], {'total':amount}, context=context)
 
             record = {
@@ -753,18 +688,15 @@ class hr_payslip(osv.osv):
                 'total_pay':round(rs.basic + allow - deduct)
             }
             res[rs.id] = record
-
         return res
 
     _columns = {
-        'deg_id':fields.many2one('hr.payroll.structure', 'Designation', required=False),
-        'register_id':fields.many2one('hr.payroll.register', 'Register', required=False),
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal', required=True),
-        'bank_journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
-        'name':fields.char('Name', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
+        'deg_id':fields.many2one('hr.payroll.structure', 'Designation', readonly=True, states={'draft': [('readonly', False)]}),
+        'register_id':fields.many2one('hr.payroll.register', 'Register', required=False, readonly=True, states={'new': [('readonly', False)]}),
+        'name':fields.char('Name', size=64, required=False, readonly=True, states={'new': [('readonly', False)]}),
         'number':fields.char('Number', size=64, required=False, readonly=True),
-        'employee_id':fields.many2one('hr.employee', 'Employee', required=True),
-        'date': fields.date('Date'),
+        'employee_id':fields.many2one('hr.employee', 'Employee', required=True, readonly=True, states={'new': [('readonly', False)]}),
+        'date': fields.date('Date', readonly=True, states={'new': [('readonly', False)]}),
         'state':fields.selection([
             ('new','New Slip'),
             ('draft','Wating for Verification'),
@@ -784,16 +716,15 @@ class hr_payslip(osv.osv):
         'other_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Others', digits=(16, 2)),
         'total_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Total Payment', digits=(16, 2)),
         'line_ids':fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
-        'company_id':fields.many2one('res.company', 'Company', required=False),
-        'holiday_days': fields.integer('No of Leaves', readonly=True),
-        'worked_days': fields.integer('Worked Day', readonly=True),
-        'working_days': fields.integer('Working Days', readonly=True),
-        'paid':fields.boolean('Paid ? ', required=False),
+        'company_id':fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
+        'holiday_days': fields.float('No of Leaves', readonly=True),
+        'worked_days': fields.float('Worked Day', readonly=True),
+        'working_days': fields.float('Working Days', readonly=True),
+        'paid':fields.boolean('Paid ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'note':fields.text('Description'),
-        'contract_id':fields.many2one('hr.contract', 'Contract', required=False),
+        'contract_id':fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'igross': fields.float('Calculaton Field', readonly=True,  digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
         'inet': fields.float('Calculaton Field', readonly=True,  digits=(16, 2), help="Calculation field used for internal calculation, do not place this on form"),
-        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
@@ -858,12 +789,37 @@ class hr_payslip(osv.osv):
     def process_sheet(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        self.write(cr, uid, ids, {'state':'done'}, context=context)
+        self.write(cr, uid, ids, {'paid':True, 'state':'done'}, context=context)
         return True
-
-    def verify_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
+    
+    def verify_sheet(self, cr, uid, ids, context={}):
+        payslip_pool = self.pool.get('hr.payslip.line')
+        register_pool = self.pool.get('company.contribution')
+        register_line_pool = self.pool.get('hr.contibution.register.line')
+        
+        for slip in self.browse(cr, uid, ids, context=context):
+            base = {
+                'basic':slip.basic,
+                'net':slip.net,
+                'gross':slip.grows,
+            }
+            for line in slip.line_ids:
+                base[line.code.lower()] = line.total
+                for contrib in line.category_id.contribute_ids:
+                    if contrib.register_id:
+                        value = eval(line.category_id.base, base)
+                        company_contrib = register_pool.compute(cr, uid, contrib.id, value, context)
+                        reg_line = {
+                            'name':line.name,
+                            'register_id': contrib.register_id.id,
+                            'code':line.code,
+                            'employee_id':slip.employee_id.id,
+                            'emp_deduction':line.total,
+                            'comp_deduction':company_contrib,
+                            'total':line.total + line.total
+                        }
+                        register_line_pool.create(cr, uid, reg_line)
+                        
         self.write(cr, uid, ids, {'state':'confirm'}, context=context)
         return True
 
@@ -939,15 +895,16 @@ class hr_payslip(osv.osv):
             return count
 
         for slip in self.browse(cr, uid, ids, context=context):
-            contracts = self.get_contract(cr, uid, slip.employee_id, date, context)
-
-            if contracts.get('id', False) == False:
+            
+            old_slip_ids = slip_line_pool.search(cr, uid, [('slip_id','=',slip.id)], context=context)
+            slip_line_pool.unlink(cr, uid, old_slip_ids, context=context)
+            
+            if not slip.employee_id.contract_id:
                 continue
 
-            contract = contract_obj.browse(cr, uid, contracts.get('id'), context=context)
+            contract = slip.employee_id.contract_id
             sal_type = contract.wage_type_id.type
             function = contract.struct_id.id
-
             lines = []
             if function:
                 func = func_pool.read(cr, uid, function, ['line_ids'], context=context)
@@ -955,9 +912,6 @@ class hr_payslip(osv.osv):
 
             lines += slip.employee_id.line_ids
 
-            old_slip_ids = slip_line_pool.search(cr, uid, [('slip_id','=',slip.id)], context=context)
-            slip_line_pool.unlink(cr, uid, old_slip_ids, context=context)
-
             ad = []
             lns = {}
             all_per = 0.0
@@ -965,13 +919,8 @@ class hr_payslip(osv.osv):
             all_fix = 0.0
             ded_fix = 0.0
 
-            obj = {
-                'basic':0.0
-            }
-            update = {
-
-            }
-
+            obj = {'basic':0.0}
+            update = {}
             if contract.wage_type_id.type == 'gross':
                 obj['gross'] = contract.wage
                 update['igross'] = contract.wage
@@ -982,22 +931,16 @@ class hr_payslip(osv.osv):
                 obj['basic'] = contract.wage
                 update['basic'] = contract.wage
 
-            c_type = {
-
-            }
-
+            c_type = { }
             for line in lines:
                 cd = line.code.lower()
                 obj[cd] = line.amount or 0.0
 
             for line in lines:
-
                 if line.category_id.code in ad:
                     continue
-
                 ad.append(line.category_id.code)
                 cd = line.category_id.code.lower()
-
                 calculate = False
                 try:
                     exp = line.category_id.condition
@@ -1023,36 +966,29 @@ class hr_payslip(osv.osv):
                 if sal_type in ('gross', 'net'):
                     if line.amount_type == 'per':
                         percent = line.amount
-
                         if amt > 1:
                             value = percent * amt
                         elif amt > 0 and amt <= 1:
                             percent = percent * amt
-
                         if value > 0:
                             percent = 0.0
-
                     elif line.amount_type == 'fix':
                         value = line.amount
-
                     elif line.amount_type == 'func':
                         value = slip_line_pool.execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
                 else:
                     if line.amount_type in ('fix', 'per'):
                         value = line.amount
-
                     elif line.amount_type == 'func':
                         value = slip_line_pool.execute_function(cr, uid, line.id, amt, context)
                         line.amount = value
-
                 if line.type == 'allowance':
                     all_per += percent
                     all_fix += value
                 elif line.type == 'deduction':
                     ded_per += percent
                     ded_fix += value
-
                 vals = {
                     'amount':line.amount,
                     'slip_id':slip.id,
@@ -1061,7 +997,6 @@ class hr_payslip(osv.osv):
                     'base':base
                 }
                 slip_line_pool.copy(cr, uid, line.id, vals, {})
-
             if sal_type in ('gross', 'net'):
                 sal = contract.wage
                 if sal_type == 'net':
@@ -1094,29 +1029,23 @@ class hr_payslip(osv.osv):
             self.write(cr, uid, [slip.id], update, context=context)
 
         for slip in self.browse(cr, uid, ids, context=context):
-
-            if not slip.contract_id :
+            if not slip.employee_id.contract_id:
                 continue
 
             basic_before_leaves = slip.basic
-
             working_day = 0
             off_days = 0
             dates = prev_bounds(slip.date)
 
             days_arr = [0, 1, 2, 3, 4, 5, 6]
-            for dy in range(contract.working_days_per_week, 7):
+            for dy in range(slip.employee_id.contract_id.working_days_per_week, 7):
                 off_days += get_days(1, dates[1].day, dates[1].month, dates[1].year, days_arr[dy])
-
             total_off = off_days
             working_day = dates[1].day - total_off
             perday = slip.net / working_day
-
             total = 0.0
             leave = 0.0
-
             leave_ids = self._get_leaves(cr, uid, slip, slip.employee_id, context)
-
             total_leave = 0.0
             paid_leave = 0.0
             for hday in holiday_pool.browse(cr, uid, leave_ids, context=context):
@@ -1126,19 +1055,21 @@ class hr_payslip(osv.osv):
                     'code':hday.holiday_status_id.code,
                     'amount_type':'fix',
                     'category_id':hday.holiday_status_id.head_id.id,
-                    'account_id':hday.holiday_status_id.account_id.id,
-                    'analytic_account_id':hday.holiday_status_id.analytic_account_id.id
+                    'sequence':hday.holiday_status_id.head_id.sequence
                 }
-
                 days = hday.number_of_days
                 if hday.number_of_days < 0:
                     days = hday.number_of_days * -1
-
                 total_leave += days
                 if hday.holiday_status_id.type == 'paid':
                     paid_leave += days
                     continue
-
+#                    res['name'] = hday.holiday_status_id.name + '-%s' % (days)
+#                    res['amount'] = perday * days
+#                    res['type'] = 'allowance'
+#                    leave += days
+#                    total += perday * days
+                
                 elif hday.holiday_status_id.type == 'halfpaid':
                     paid_leave += (days / 2)
                     res['name'] = hday.holiday_status_id.name + '-%s/2' % (days)
@@ -1156,8 +1087,8 @@ class hr_payslip(osv.osv):
                 slip_line_pool.create(cr, uid, res, context=context)
             basic = basic - total
             leaves = total
-
             update.update({
+                'basic':basic,
                 'basic_before_leaves': round(basic_before_leaves),
                 'leaves':total,
                 'holiday_days':leave,
@@ -1165,43 +1096,9 @@ class hr_payslip(osv.osv):
                 'working_days':working_day,
             })
             self.write(cr, uid, [slip.id], update, context=context)
-
         return True
-
 hr_payslip()
 
-class account_move_link_slip(osv.osv):
-    '''
-    Account Move Link to Pay Slip
-    '''
-    _name = 'hr.payslip.account.move'
-    _description = 'Account Move Link to Pay Slip'
-    _columns = {
-        'name':fields.char('Name', size=256, required=True, readonly=False),
-        'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
-        'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
-        'sequence': fields.integer('Sequence'),
-    }
-account_move_link_slip()
-
-class line_condition(osv.osv):
-    '''
-    Line Condition
-    '''
-    _name = 'hr.payslip.line.condition'
-    _description = 'Line Condition'
-
-    _columns = {
-        'name':fields.char('Name', size=64, required=False, readonly=False),
-        'date_start': fields.date('Start Date'),
-        'date_end': fields.date('End Date'),
-        'state':fields.selection([
-            ('total','Override By'),
-            ('add','Add to Structure')
-        ],'Condition', select=True, readonly=False),
-    }
-line_condition()
-
 class hr_payslip_line(osv.osv):
     '''
     Payslip Line
@@ -1232,7 +1129,6 @@ class hr_payslip_line(osv.osv):
 
     _columns = {
         'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
-        'condition_id':fields.many2one('hr.payslip.line.condition', 'Condition', required=False),
         'function_id':fields.many2one('hr.payroll.structure', 'Function', required=False),
         'employee_id':fields.many2one('hr.employee', 'Employee', required=False),
         'name':fields.char('Name', size=256, required=True, readonly=False),
@@ -1255,12 +1151,8 @@ class hr_payslip_line(osv.osv):
             ('func','Function Value'),
         ],'Amount Type', select=True),
         'amount': fields.float('Amount / Percentage', digits=(16, 4)),
-        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=False),
-        'account_id':fields.many2one('account.account', 'General Account', required=True),
         'total': fields.float('Sub Total', readonly=True, digits=(16, 4)),
-        #'total': fields.function(_calculate, method=True, type='float', string='Label', store=True),
         'company_contrib': fields.float('Company Contribution', readonly=True, digits=(16, 4)),
-        'expanse_id': fields.many2one('hr.expense.expense', 'Expense'),
         'sequence': fields.integer('Sequence'),
         'note':fields.text('Description'),
         'line_ids':fields.one2many('hr.payslip.line.line', 'slipline_id', 'Calculations', required=False)
@@ -1273,10 +1165,8 @@ class hr_payslip_line(osv.osv):
         line_pool = self.pool.get('hr.payslip.line.line')
         res = 0
         ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value), ('to_val','>=',value)], context=context)
-
         if not ids:
             ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value)], context=context)
-
         if not ids:
             return res
 
@@ -1296,7 +1186,6 @@ class hr_payslip_line_line(osv.osv):
     _columns = {
         'slipline_id':fields.many2one('hr.payslip.line', 'Slip Line', required=False),
         'name':fields.char('Name', size=64, required=False, readonly=False),
-        'umo_id':fields.many2one('product.uom', 'Unite', required=False),
         'from_val': fields.float('From', digits=(16, 4)),
         'to_val': fields.float('To', digits=(16, 4)),
         'amount_type':fields.selection([
@@ -1315,53 +1204,15 @@ class hr_employee(osv.osv):
     _description = 'Employee'
 
     _columns = {
-#        'pan_no':fields.char('PAN No', size=64, required=False, readonly=False),
-        'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False, help="EPS Account"),
-        'pf_account':fields.char('PF Account', size=64, required=False, readonly=False, help="Providend Fund Account"),
+        'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False, help="EPS Account Number"),
+        'pf_account':fields.char('PF Account', size=64, required=False, readonly=False, help="Providend Fund Account Number"),
         'pg_joining': fields.date('PF Join Date'),
-        'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False, help="ESI Account"),
+        'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False, help="ESI Account Number"),
         'hospital_id':fields.many2one('res.partner.address', 'ESI Hospital', required=False),
-        'passport_id':fields.char('Passport', size=64),
-        'otherid':fields.char('Other Id', size=64, required=False),
-        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', required=False, readonly=False),
+        'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
+        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
-        'property_bank_account': fields.property(
-            'account.account',
-            type='many2one',
-            relation='account.account',
-            string="Bank Account",
-            method=True,
-            view_load=True,
-            help="Select Bank Account from where Salary Expanse will be Paid",
-            required=True),
-        'salary_account':fields.property(
-            'account.account',
-            type='many2one',
-            relation='account.account',
-            string="Salary Account",
-            method=True,
-            view_load=True,
-            help="Expanse account when Salary Expanse will be recorded",
-            required=True),
-        'employee_account':fields.property(
-            'account.account',
-            type='many2one',
-            relation='account.account',
-            string="Employee Account",
-            method=True,
-            view_load=True,
-            help="Employee Payable Account",
-            required=True),
-        'analytic_account':fields.property(
-            'account.analytic.account',
-            type='many2one',
-            relation='account.analytic.account',
-            string="Analytic Account",
-            method=True,
-            view_load=True,
-            help="Analytic Account for Salary Analysis",
-            required=False),
     }
 hr_employee()
 
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 02efe0c53e8..4c125f2284b 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -11,7 +11,7 @@
 
         <record id="hr_payslip_line_houserantallowance1" model="hr.payslip.line">
             <field name="amount_type">per</field>
-            <field name="account_id" ref="account.a_expense"/>
+<!--            <field name="account_id" ref="account.a_expense"/>-->
             <field eval="5" name="sequence"/>
             <field eval="0.4" name="amount"/>
             <field name="code">HRA</field>
@@ -23,7 +23,7 @@
 
         <record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
             <field name="amount_type">fix</field>
-            <field name="account_id" ref="account.a_expense"/>
+<!--            <field name="account_id" ref="account.a_expense"/>-->
             <field eval="10" name="sequence"/>
             <field eval="800.0" name="amount"/>
             <field name="code">CA</field>
@@ -35,7 +35,7 @@
 
         <record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
             <field name="amount_type">fix</field>
-            <field name="account_id" ref="account.a_pay"/>
+<!--            <field name="account_id" ref="account.a_pay"/>-->
             <field eval="15" name="sequence"/>
             <field eval="200.0" name="amount"/>
             <field name="code">PT</field>
@@ -47,7 +47,7 @@
 
         <record id="hr_payslip_line_providentfund1" model="hr.payslip.line">
             <field name="amount_type">per</field>
-            <field name="account_id" ref="account.a_pay"/>
+<!--            <field name="account_id" ref="account.a_pay"/>-->
             <field eval="20" name="sequence"/>
             <field eval="0.125" name="amount"/>
             <field name="code">PF</field>
@@ -84,122 +84,14 @@
         <!-- Payslip -->
         <record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
             <field name="number">SLIP/001</field>
-            <field name="journal_id" ref="account.expenses_journal"/>
+<!--            <field name="journal_id" ref="account.expenses_journal"/>-->
             <field name="deg_id" ref="hr_payroll.structure_001"/>
             <field name="employee_id" ref="hr_employee_bonamy0"/>
             <field name="contract_id" ref="hr_contract_firstcontract1"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="date" eval="time.strftime('%Y-%m')+'-5'"/>
-            <field name="bank_journal_id" ref="account.bank_journal"/>
+<!--            <field name="bank_journal_id" ref="account.bank_journal"/>-->
             <field name="name">Salary Slip of Bonamy for June-2010</field>
         </record>
-
-        <record id="ir_property_salaryaccount0" model="ir.property">
-            <field name="name">salary_account</field>
-            <field name="res_id">hr.employee,1</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
-            <field name="value_reference">account.account,27</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_employeeaccount0" model="ir.property">
-            <field name="name">employee_account</field>
-            <field name="res_id">hr.employee,1</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
-            <field name="value_reference">account.account,22</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_propertybankaccount0" model="ir.property">
-            <field name="name">property_bank_account</field>
-            <field name="res_id">hr.employee,1</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
-            <field name="value_reference">account.account,11</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_salaryaccount2" model="ir.property">
-            <field name="name">salary_account</field>
-            <field name="res_id">hr.employee,2</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
-            <field name="value_reference">account.account,27</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_employeeaccount2" model="ir.property">
-            <field name="name">employee_account</field>
-            <field name="res_id">hr.employee,2</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
-            <field name="value_reference">account.account,22</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_propertybankaccount2" model="ir.property">
-            <field name="name">property_bank_account</field>
-            <field name="res_id">hr.employee,2</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
-            <field name="value_reference">account.account,11</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_salaryaccount3" model="ir.property">
-            <field name="name">salary_account</field>
-            <field name="res_id">hr.employee,3</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
-            <field name="value_reference">account.account,27</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_employeeaccount3" model="ir.property">
-            <field name="name">employee_account</field>
-            <field name="res_id">hr.employee,3</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
-            <field name="value_reference">account.account,22</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_propertybankaccount3" model="ir.property">
-            <field name="name">property_bank_account</field>
-            <field name="res_id">hr.employee,3</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
-            <field name="value_reference">account.account,11</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_salaryaccount4" model="ir.property">
-            <field name="name">salary_account</field>
-            <field name="res_id">hr.employee,10</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
-            <field name="value_reference">account.account,27</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_employeeaccount4" model="ir.property">
-            <field name="name">employee_account</field>
-            <field name="res_id">hr.employee,10</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
-            <field name="value_reference">account.account,22</field>
-            <field name="type">many2one</field>
-        </record>
-
-        <record id="ir_property_propertybankaccount4" model="ir.property">
-            <field name="name">property_bank_account</field>
-            <field name="res_id">hr.employee,10</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
-            <field name="value_reference">account.account,11</field>
-            <field name="type">many2one</field>
-        </record>
     </data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ab9c16a45b5..62b63b86bb8 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -32,7 +32,7 @@
                             <separator string="Description" colspan="2"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Contracts">
+                        <page string="Contracts" groups="base.group_extended">
                             <field name="contracts_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
@@ -87,6 +87,19 @@
         <!-- End Passport Views -->
 
         <!-- Employee View -->
+        
+        <record id="view_employee_bank_form" model="ir.ui.view">
+            <field name="name">res.partner.bank.form</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_bank_form"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="replace">
+                    <field name="partner_id" invisible="context.get('display_partner', False)"/>
+                </field>
+            </field>
+        </record>
+        
         <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
@@ -97,8 +110,7 @@
                     <page string="Miscellaneous">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
-                            <field name="otherid" select="1"/>
-                            <field name="bank_account_id"/>
+                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
                             <field name="place_of_birth"/>
                             <field name="children"/>
                         </group>
@@ -108,20 +120,20 @@
                             <field name="vehicle" select="1"/>
                             <field name="vehicle_distance" select="1"/>
                         </group>
-                        <group col="2" colspan="2">
+                        <group col="2" colspan="2" groups="base.group_extended">
                             <separator colspan="2" string="ESI Information"/>
                             <field name="esi_account" string="Account"/>
                             <field name="hospital_id" string="Hospital"/>
                             <field name="medic_exam" select="1" string="Medical Examination"/>
                             <field name="esp_account" select="1"/>
                         </group>
-                        <group col="2" colspan="2">
+                        <group col="2" colspan="2" groups="base.group_extended">
                             <separator colspan="2" string="Providend Fund"/>
                             <field name="pf_account" string="Account"/>
                             <field name="pg_joining" string="Join Date"/>
                         </group>
                     </page>
-                    <page string="Contracts">
+                    <page string="Contracts" groups="base.group_extended">
                         <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
                             <tree string="Contracts">
                                 <field name="name"/>
@@ -142,7 +154,7 @@
                                     <field name="type_id" widget="selection"/>
                                 </group>
                                 <notebook colspan="4">
-                                    <page string="Main Data">
+                                    <page string="Contract Details">
                                         <group col="2" colspan="2">
                                             <separator colspan="2" string="Duration"/>
                                             <field name="date_start" select="1"/>
@@ -156,28 +168,29 @@
                                             <field name="advantages_gross"/>
                                             <field name="advantages" nolabel="1" colspan="2"/>
                                         </group>
+                                        
                                     </page>
                                     <page string="Work Permit">
                                         <group col="2" colspan="2">
                                             <separator colspan="2" string="Passport"/>
-                                            <field name="passport_id"/>
+                                            <field name="passport_id" domain="[('employee_id','=',parent.id)]"/>
                                         </group>
                                         <group col="2" colspan="2">
                                             <separator colspan="2" string="Valid for"/>
-                                            <field name="visa_no"/>
-                                            <field name="permit_no"/>
-                                            <field name="visa_expire"/>
+                                            <field name="visa_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
+                                            <field name="permit_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
+                                            <field name="visa_expire" attrs="{'required': [('passport_id','!=',False), ]}"/>
                                         </group>
                                     </page>
+                                    <separator colspan="4" string="Notes"/>
+                                    <field colspan="4" name="notes" nolabel="1"/>
                                 </notebook>
-                                <separator colspan="4" string="Notes"/>
-                                <field colspan="4" name="notes" nolabel="1"/>
                             </form>
                         </field>
                     </page>
                 </xpath>
                 <xpath expr="/form/notebook/page[@string='Notes']" position="before">
-                    <page string="Salary Structure">
+                    <page string="Salary Structure" groups="base.group_extended">
                         <field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
                             <tree string="Salary Structure" editable="bottom">
                                 <field name="category_id" on_change="onchange_category(category_id)"/>
@@ -187,17 +200,26 @@
                                 <field name="type"/>
                                 <field name="amount_type"/>
                                 <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
-                                <field name="account_id"/>
-                                <field name="analytic_account_id" groups="base.group_extended"/>
                             </tree>
                         </field>
                     </page>
-                    <page string="Accounting">
-                        <field name="property_bank_account"/>
-                        <field name="salary_account"/>
-                        <field name="employee_account"/>
-                        <field name="analytic_account" groups="base.group_extended"/>
-                        <field name="slip_ids" colspan="4" nolabel="1"/>
+                    <page string="Salary Slips" groups="base.group_extended">
+                        <field name="slip_ids" colspan="4" nolabel="1" readonly="True">
+                            <tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
+                                <field name="number"/>
+                                <field name="name"/>
+                                <field name="date"/>
+                                <field name="register_id"/>
+                                <field name="basic"/>
+                                <field name="allounce"/>
+                                <field name="grows"/>
+                                <field name="deduction"/>
+                                <field name="net"/>
+                                <field name="total_pay" sum="Total Salary Paid"/>
+                                <field name="state"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </tree>
+                        </field>
                     </page>
                 </xpath>
             </data>
@@ -216,6 +238,7 @@
             </field>
         </record>
         <!-- End Employee View -->
+        
         <!-- Contract View -->
         <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
@@ -225,7 +248,7 @@
                 <form string="Contract">
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
-                        <field name="employee_id" select="1" on_change="on_change_employee_id(employee_id)"/>
+                        <field name="employee_id" select="1"/>
                         <field name="job_id"/>
                         <field name="wage"/>
                         <field name="wage_type_id" widget="selection"/>
@@ -282,7 +305,7 @@
                     <field name="name"/>
                     <field name="code"/>
                     <field name="line_ids"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
         </record>
@@ -296,8 +319,7 @@
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                        <field name="company_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Salary Structure">
@@ -331,10 +353,8 @@
                 <field name="color_name" position="after">
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Payroll Accounting"/>
-                        <field name="company_id" widget="selection" select="2"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/>
                         <field name="code"/>
-                        <field name="analytic_account_id" groups="base.group_extended"/>
-                        <field name="account_id"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Payroll Configurtion"/>
@@ -360,8 +380,6 @@
                     <field name="type"/>
                     <field name="amount_type"/>
                     <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
-                    <field name="account_id"/>
-                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 </tree>
             </field>
         </record>
@@ -387,9 +405,9 @@
                         <field name="sequence"/>
                     </group>
                     <group col="2" colspan="2">
-                        <separator colspan="4" string="Accounting Informations"/>
-                        <field name="account_id"/>
-                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+<!--                        <separator colspan="4" string="Accounting Informations"/>-->
+<!--                        <field name="account_id"/>-->
+<!--                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>-->
                         <separator colspan="4" string="Company contribution"/>
                         <field name="company_contrib"/>
                     </group>
@@ -420,7 +438,7 @@
             <field name="model">hr.payslip</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
+                <tree colors="blue:state in ('confirm','hr_check','accont_check');black:state in ('new');gray:state in('cancel')" string="Payslip">
                     <field name="number"/>
                     <field name="employee_id"/>
                     <field name="register_id" invisible="1"/>
@@ -429,7 +447,7 @@
                     <field name="grows"/>
                     <field name="net"/>
                     <field name="state"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
         </record>
@@ -444,12 +462,10 @@
                         <field name="employee_id"/>
                         <field name="name"/>
                         <field name="number" select="1"/>
-                        <field name="journal_id"/>
-                        <field name="bank_journal_id" domain="[('type','=','cash')]"/>
                         <field name="date"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Salary Detail">
+                        <page string="Salary Computation">
                             <field name="line_ids" colspan="4" nolabel="1">
                                 <tree string="Salary Structure" editable="bottom">
                                     <field name="category_id" on_change="onchange_category(category_id)"/>
@@ -460,38 +476,32 @@
                                     <field name="amount_type"/>
                                     <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
                                     <field name="total"/>
-                                    <field name="account_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
                                 </tree>
                             </field>
-
                             <group col="6" colspan="4">
                                 <separator string="Computation Overview" colspan="6"/>
                                 <field name="working_days"/>
                                 <field name="holiday_days"/>
                                 <field name="worked_days"/>
-
                                 <field name="basic_before_leaves"/>
                                 <field name="leaves"/>
                                 <field name="basic"/>
-
                                 <field name="allounce"/>
                                 <field name="deduction"/>
                                 <field name="other_pay"/>
-
                                 <field name="grows"/>
                                 <field name="net"/>
                                 <field name="total_pay"/>
                             </group>
                         </page>
-                        <page string="Accounting Details">
+                        <page string="Other Informations">
                             <group col="2" colspan="1">
                                 <separator colspan="2" string="Other Informations"/>
                                 <field name="paid" readonly="1"/>
-                                <field name="company_id"/>
-                                <field name="register_id"/>
-                                <field name="deg_id"/>
-                                <field name="contract_id" domain="[('employee_id','=',employee_id)]"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="register_id" groups="base.group_extended"/>
+                                <field name="deg_id" groups="base.group_extended"/>
+                                <field name="contract_id" groups="base.group_extended" domain="[('employee_id','=',employee_id)]"/>
                             </group>
                             <newline/>
                             <separator colspan="4" string="Description"/>
@@ -550,8 +560,6 @@
         </record>
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
 
-
-
         <!-- Payment Heads -->
         <record id="hr_allounce_deduction_categoty_form" model="ir.ui.view">
             <field name="name">hr.allounce.deduction.categoty.form</field>
@@ -655,7 +663,7 @@
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Other Information"/>
-                        <field name="company_id" select="1"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" select="1"/>
                         <field name="active" select="1"/>
                     </group>
                     <notebook colspan="4">
@@ -694,7 +702,7 @@
             </field>
         </record>
 
-    <record id="view_hr_company_contribution_filter" model="ir.ui.view">
+        <record id="view_hr_company_contribution_filter" model="ir.ui.view">
             <field name="name">company.contribution.select</field>
              <field name="model">company.contribution</field>
             <field name="type">search</field>
@@ -737,10 +745,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Bank Advice">
+                    <field name="number" select="1"/>
                     <field name="name" select="1"/>
                     <field name="date" select="1"/>
-                    <field name="number" select="1"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
         </record>
@@ -753,11 +761,9 @@
                 <form string="Bank Advice">
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
-                        <field name="account_id" select="1"/>
-                        <newline/>
-                        <field name="date" select="1"/>
                         <field name="number" select="1"/>
                         <field name="register_id"/>
+                        <field name="bank_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Paymeny Lines">
@@ -773,9 +779,9 @@
                         </page>
                         <page string="Letter Content">
                             <group colspan="4" col="6">
-                              <field name="company_id" on_change="onchange_company_id(company_id)"/>
+                              <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
                               <field name="chaque_nos"/>
-                              <field name="bank"/>
+                              <field name="date" select="1"/>
                             </group>
                             <separator colspan="4" string="Letter Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
@@ -812,8 +818,6 @@
                     <field name="number"/>
                     <field name="name"/>
                     <field name="date"/>
-                    <field name="journal_id"/>
-                    <field name="bank_journal_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -825,12 +829,10 @@
             <field name="arch" type="xml">
                 <form string="Payroll Register">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="date" select="1"/>
+                        <field name="name" colspan="4" select="1"/>
                         <field name="number" select="1"/>
-                        <field name="journal_id"/>
-                        <field name="bank_journal_id"/>
-                        <field name="active"/>
+                        <field name="bank_id"/>
+                        <field name="date" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Payslips">
@@ -894,11 +896,9 @@
             <field name="arch" type="xml">
                 <tree string="Contribution Registers">
                     <field name="name" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <field name="monthly_total_by_emp"/>
                     <field name="monthly_total_by_comp"/>
-                    <field name="yearly_total_by_emp"/>
-                    <field name="yearly_total_by_comp"/>
                 </tree>
             </field>
         </record>
@@ -909,16 +909,14 @@
             <field name="arch" type="xml">
                 <form string="Contribution">
                     <field name="name" select="1"/>
-                    <field name="account_id"/>
-                    <field name="analytic_account_id" groups="base.group_extended"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     <notebook colspan="4">
                         <page string="Contribution Lines">
                             <field colspan="4" name="register_line_ids" nolabel="1" select="1">
                                 <tree string="Register Lines" editable="top">
                                     <field name="code"/>
+                                    <field name="name"/>
                                     <field name="employee_id"/>
-                                    <field name="period_id"/>
                                     <field name="emp_deduction"/>
                                     <field name="comp_deduction"/>
                                     <field name="total"/>
@@ -930,11 +928,6 @@
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Year"/>
-                        <field name="yearly_total_by_emp"/>
-                        <field name="yearly_total_by_comp"/>
-                    </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Month"/>
                         <field name="monthly_total_by_emp"/>
@@ -963,27 +956,12 @@
                       <field name="name"/>
                       <field name="code"/>
                       <field name="employee_id"/>
-                      <field name="period_id"/>
                       <field name="emp_deduction"/>
                       <field name="comp_deduction"/>
                       <field name="total"/>
                 </form>
             </field>
         </record>
-
-        <record id="hr_payslip_line_condition_tree" model="ir.ui.view">
-            <field name="name">hr.payslip.line.condition.tree</field>
-            <field name="model">hr.payslip.line.condition</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <form string="Condition">
-                    <field name="name"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                    <field name="state"/>
-                </form>
-            </field>
-        </record>
     </data>
 </openerp>
 
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index f628fad1f1d..073cd6954c8 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -14,16 +14,9 @@
 "access_company_contribution","company.contribution","model_company_contribution","group_hr_payroll",1,1,1,1
 "access_company_contribution_line","company.contribution.line","model_company_contribution_line","group_hr_payroll",1,1,1,1
 "access_hr_holidays_status","hr.holidays.status","hr_holidays.model_hr_holidays_status","group_hr_payroll",1,0,0,0
-"access_hr_expense_expense","hr.expense.expense","hr_expense.model_hr_expense_expense","group_hr_payroll",1,0,0,0
 "access_hr_payslip","hr.payslip","model_hr_payslip","group_hr_payroll",1,1,1,1
-"access_hr_payslip_account_move","hr.payslip.account.move","model_hr_payslip_account_move","group_hr_payroll",1,1,1,1
-"access_hr_payslip_line_condition","hr.payslip.line.condition","model_hr_payslip_line_condition","group_hr_payroll",1,1,1,1
 "access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","group_hr_payroll",1,1,1,1
 "access_hr_payslip_line_line","hr.payslip.line.line","model_hr_payslip_line_line","group_hr_payroll",1,1,1,1
-"access_account_journal_payroll","hr.payroll.journal","account.model_account_journal","group_hr_payroll",1,0,0,0
-"access_account_journal_view_payroll","account.journal.view.payroll","account.model_account_journal_view","group_hr_payroll",1,0,0,0
-"access_account_journal_column_payroll","account.journal.column.payroll","account.model_account_journal_column","group_hr_payroll",1,0,0,0
-"access_account_fiscalyear_payroll","account.fiscalyear.payroll","account.model_account_fiscalyear","group_hr_payroll",1,0,0,0
 "access_hr_payslip_contract","hr.payslip.contract","model_hr_payslip","base.group_hr_contract",1,0,0,0
 "access_hr_payroll_structure_system","hr.payroll.structure.system","model_hr_payroll_structure","base.group_system",1,1,1,1
 "access_company_contribution","company.contribution","model_company_contribution","base.group_system",1,1,1,1
@@ -32,20 +25,15 @@
 "access_hr_contibution_register_system","hr.contibution.register.system","model_hr_contibution_register","base.group_system",1,1,1,1
 "access_hr_contibution_register_line_system","hr.contibution.register.line.system","model_hr_contibution_register_line","base.group_system",1,1,1,1
 "access_hr_allounce_deduction_category_system","hr.allounce.deduction.category.system","model_hr_allounce_deduction_categoty","base.group_system",1,1,1,1
-"access_account_fiscalyear_manager","account.fiscalyear.payroll.manager","account.model_account_fiscalyear","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
 "access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1
 "access_hr_allounce_deduction_category_manager","hr.allounce.deduction.category.manager","model_hr_allounce_deduction_categoty","base.group_hr_manager",1,1,1,1
 "access_hr_passport_manager","hr.passport.manager","model_hr_passport","base.group_hr_manager",1,1,1,1
-"access_account_journal_manager","account.journal.manager","account.model_account_journal","base.group_hr_manager",1,1,1,1
-"access_account_journal_column_manager","account.journal.column.manager","account.model_account_journal_column","base.group_hr_manager",1,1,1,1
-"access_account_journal_view_manager","account.journal.view.manager","account.model_account_journal_view","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_employee","hr.payslip.employee","model_hr_payslip","base.group_user",1,0,0,0
 "access_hr_payroll_register_system","hr.payroll.register.system","model_hr_payroll_register","base.group_system",1,0,0,0
 "access_hr_payroll_advice_system","hr.payroll.advice.system","model_hr_payroll_advice","base.group_system",1,0,0,0
 "access_hr_payslip_line_system","hr.payslip.line.system","model_hr_payslip_line","base.group_system",1,1,1,1
-"access_hr_payslip_account_move_system","hr.payslip.account.move.system","model_hr_payslip_account_move","base.group_system",1,0,0,0
 "access_hr_payroll_structure_contract","hr.payroll.structure.contract","model_hr_payroll_structure","base.group_hr_contract",1,1,1,1
 "access_hr_payslip_line_user","hr.payslip.line.user","model_hr_payslip_line","base.group_hr_user",1,1,1,0
 "access_hr_allounce_deduction_category_hr_user","hr.allounce.deduction.category.hr.user","model_hr_allounce_deduction_categoty","base.group_hr_user",1,1,1,0
diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py
index 085903ad562..93222a2e343 100755
--- a/addons/hr_payroll/wizard/__init__.py
+++ b/addons/hr_payroll/wizard/__init__.py
@@ -22,5 +22,5 @@
 
 
 import hr_payroll_employees_detail
-import hr_payroll_create_analytic
+#import hr_payroll_create_analytic
 import hr_payroll_year_salary
diff --git a/addons/hr_payroll/wizard/hr_payroll_create_analytic.py b/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
deleted file mode 100644
index 45c2d2c495e..00000000000
--- a/addons/hr_payroll/wizard/hr_payroll_create_analytic.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from osv import fields, osv
-from tools.translate import _
-
-class hr_payroll_create_analytic(osv.osv_memory):
-   _name = "hr.payroll.create.analytic"
-   _columns = {
-        'company_id': fields.many2one('res.company', 'Company'),
-        'type': fields.selection([('bydeg','By Employee Function'), ('byallded','By Allownce / Deduction')],'Type'),
-       }
-
-   def do_duplicate(self, cr, uid, ids, context=None):
-        account_pool = self.pool.get('account.analytic.account')
-        func_pool = self.pool.get('hr.employee.grade')
-        ad_pool = self.pool.get('hr.allounce.deduction.categoty')
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids, context=context)[0]
-        tpy = data['type']
-        company = data['company_id']
-
-        function_ids = func_pool.search(cr, uid, [], context=context)
-        ad_ids = ad_pool.search(cr, uid, [], context=context)
-
-        if tpy == 'bydeg':
-            for function in func_pool.browse(cr, uid, function_ids, context=context):
-                res = {
-                    'name':function.name,
-                    'company_id':company
-                }
-                fid = account_pool.create(cr, uid, res, context=context)
-                res = {
-                    'name':'Basic Salary',
-                    'company_id':company,
-                    'parent_id': fid
-                }
-                account_pool.create(cr, uid, res, context=context)
-                for ad in ad_pool.browse(cr, uid, ad_ids, context=context):
-                    res = {
-                        'name':ad.name,
-                        'company_id':company,
-                        'parent_id': fid
-                    }
-                    account_pool.create(cr, uid, res, context=context)
-
-
-
-        elif tpy == 'byallded':
-            res = {
-                'name':'Basic Salary',
-                'company_id':company
-            }
-            adid = account_pool.create(cr, uid, res, context=context)
-            for function in func_pool.browse(cr, uid, function_ids, context=context):
-                res = {
-                    'name':function.name,
-                    'company_id':company,
-                    'parent_id': adid
-                }
-                account_pool.create(cr, uid, res, context=context)
-
-            for ad in ad_pool.browse(cr, uid, ad_ids, context=context):
-                res = {
-                    'name':ad.name,
-                    'company_id':company,
-                }
-                adid = account_pool.create(cr, uid, res, context=context)
-                for function in func_pool.browse(cr, uid, function_ids, context=context):
-                    res = {
-                        'name':function.name,
-                        'company_id':company,
-                        'parent_id': adid
-                    }
-                    account_pool.create(cr, uid, res, context=context)
-
-        return {}
-hr_payroll_create_analytic()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml b/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml
deleted file mode 100644
index 8ef12aa586a..00000000000
--- a/addons/hr_payroll/wizard/hr_payroll_create_analytic.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-		<record id="view_hr_payroll_create_form" model="ir.ui.view">
-            <field name="name">Create Analytic</field>
-            <field name="model">hr.payroll.create.analytic</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-			<form string="Process Form">
-		 	     <field name="company_id"/>
-		        <field name="type"/>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_duplicate" string="Process" colspan="1" type="object"  icon="gtk-yes"/>
-				</group>
-			</form>
-            </field>
-        </record>
-
-        <record id="action_view_hr_payroll_create" model="ir.actions.act_window">
-            <field name="name">Create Analytic Structure</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.payroll.create.analytic</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-	</data>
-</openerp>
\ No newline at end of file

From b797146a8aead43acb556b86f07a8ed58526f0e9 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 6 Oct 2010 18:18:23 +0530
Subject: [PATCH 353/632] [FIX] Account voucher: If you cancel bank statement
 line it will not unlink the voucher but just cancel it and after you confirm
 same bank statement it will repost it and make the entries reconciled

bzr revid: mra@mra-laptop-20101006124823-oxraar0k7ox8relz
---
 addons/account_voucher/account_voucher.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index e8df6c04d52..6d3a70dd333 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -115,7 +115,7 @@ class account_voucher(osv.osv):
         if not view_id and context.get('invoice_type',False):
             mod_obj = self.pool.get('ir.model.data')
             act_obj = self.pool.get('ir.actions.act_window')
-            if context.get('invoice_type') in ('out_invoice','out_refund'): 
+            if context.get('invoice_type') in ('out_invoice','out_refund'):
                 result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
             else:
                 result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_payment_form')
@@ -867,16 +867,16 @@ class account_bank_statement(osv.osv):
                 if line.voucher_id:
                     voucher_ids.append(line.voucher_id.id)
             self.pool.get('account.voucher').cancel_voucher(cr, uid, voucher_ids, context)
-            self.pool.get('account.voucher').unlink(cr, uid, voucher_ids, context)
         return super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context)
 
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None):
         voucher_obj = self.pool.get('account.voucher')
         wf_service = netsvc.LocalService("workflow")
         st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context)
-
         if st_line.voucher_id:
             voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
+            if st_line.voucher_id.state == 'cancel':
+                voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context)
             wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr)
             return self.pool.get('account.move.line').write(cr, uid, [x.id for x in st_line.voucher_id.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
         return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)

From a3efd4f1a02c2c7ffd113a20d4633caaba8b7355 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 18:21:28 +0530
Subject: [PATCH 354/632] [MOD/IMP] hr_expence : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006125128-85urgfc27zuhvcx7
---
 addons/hr_expense/security/ir.model.access.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index f0208425ba8..ec44936c3b4 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -7,7 +7,6 @@
 "access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
 "access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
 "access_hr_expense_expense_manager","hr.expense.expense.manager","model_hr_expense_expense","base.group_hr_manager",1,1,1,1
-"access_hr_expense_expense_system","hr.expense.expense.system","model_hr_expense_expense","base.group_system",1,0,0,0
 "access_hr_expense_line_manager","hr.expense.line.manager","model_hr_expense_line","base.group_hr_manager",1,1,1,1
 "access_product_product_hr_expense_manager","product.product.hr.expense.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
 "access_product_template_hr_expense_manager","product.template.hr.expense.manager","product.model_product_template","base.group_hr_manager",1,1,1,1

From 43daab4f4eaef6b7561e6c06770f019a854b1438 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Wed, 6 Oct 2010 18:49:33 +0530
Subject: [PATCH 355/632] [REF]

bzr revid: vth@tinyerp.com-20101006131933-wvbkdfgd7qat519q
---
 addons/membership/membership_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index dac2bd3be7d..2fcd2151899 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -190,6 +190,7 @@
         <record model="ir.actions.act_window.view" id="action_membership_members_view_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
+            <field name="view_id" ref="view_partner_form"/>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 

From 10bb97ea320ee60d67c1d85c1ac7039d969a1cad Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 6 Oct 2010 18:55:34 +0530
Subject: [PATCH 356/632] improved

bzr revid: apa@tinyerp.com-20101006132534-6nzxh5d8ngby0fy0
---
 bin/report/render/rml2pdf/trml2pdf.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 1cd5a9b938a..b88bbbb0050 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -819,10 +819,11 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
+        if not localcontext:
+            localcontext={'header':'internal'}
+        if not localcontext.get('header',True):
+            localcontext.update({'header':'internal'})
         self.localcontext = localcontext
-        if not self.localcontext or not self.localcontext.get('header',False):
-            self.localcontext={}
-            self.localcontext.update({'header':'internal'})
         self.images= images
         self.path = path
         self.title = title

From 40410b075b0096879c0583b8dddd9fde5cdfbcbc Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 6 Oct 2010 19:07:19 +0530
Subject: [PATCH 357/632] [IMP] membership: Update demo data and add membership
 field in view

bzr revid: psi@tinyerp.co.in-20101006133719-ffwws6ya5xj42sxs
---
 addons/membership/membership_demo.xml |  8 ++--
 addons/membership/membership_view.xml | 65 ++++++++++++++-------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index fa8dda9e5cb..9479543305a 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -6,7 +6,7 @@
     <record id="membership_0" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-06-01')" name="membership_date_to"/>
+        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
         <field name="name">Golden Membership</field>
         <field name="list_price">180</field>
         <field name="categ_id" ref="product.cat1"/>
@@ -15,7 +15,7 @@
     <record id="membership_1" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-08-01')" name="membership_date_to"/>
+        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
         <field name="name">Silver Membership</field>
         <field name="categ_id" ref="product.cat1"/>
         <field name="list_price">80</field>
@@ -24,7 +24,7 @@
     <record id="membership_2" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-08-01')" name="membership_date_to"/>
+        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
         <field name="name">Basic Membership</field>
         <field name="categ_id" ref="product.cat1"/>
         <field name="list_price">40</field>
@@ -33,7 +33,7 @@
 
 <!-- Join Memberships  -->
     <function model="res.partner" name="create_membership_invoice" eval="(ref('base.res_partner_agrolait'), ref('membership_0'), {'amount':180})"/>
-    
+
 <!-- Demo data for free member -->
     <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
         <field name="free_member">True</field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 2fcd2151899..9df10dbfb77 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -29,34 +29,35 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership products">
-                	<group col="6">
-	                    <field name="name"/>
-	                    <field name="default_code"/>
-	                    <field name="active"/>
-	                    <field name="membership_date_from" required="1"/>
-	                    <field name="membership_date_to" required="1"/>
-	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                  <group col="6">
+                      <field name="name"/>
+                      <field name="default_code"/>
+                      <field name="active"/>
+                      <field name="membership_date_from" required="1"/>
+                      <field name="membership_date_to" required="1"/>
+                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                      <field name="membership"/>
                     </group>
                     <notebook colspan="4">
-	                    <page string="General">
-    		                <separator string="Accounting Info" colspan="2"/>
-            		        <separator string="Categorization" colspan="2"/>
-                    		<field name="price" />
-                    		<field name="type" />
-                    		<field name="property_account_income"/>
-                    		<field name="categ_id"/>
-                    		<separator string="Sale Taxes" colspan="2"/>
-                    		<newline/>
-                    		<field name="taxes_id" nolabel="1" colspan="4"/>
-	                    </page>
-	                    <page string="Description">
+                      <page string="General">
+                        <separator string="Accounting Info" colspan="2"/>
+                        <separator string="Categorization" colspan="2"/>
+                        <field name="price" />
+                        <field name="type" />
+                        <field name="property_account_income"/>
+                        <field name="categ_id"/>
+                        <separator string="Sale Taxes" colspan="2"/>
+                        <newline/>
+                        <field name="taxes_id" nolabel="1" colspan="4"/>
+                      </page>
+                      <page string="Description">
                             <separator string="Description"/>
                             <field colspan="4" name="description" nolabel="1"/>
                             <separator string="Sale Description"/>
                             <field colspan="4" name="description_sale" nolabel="1"/>
                             <separator string="Purchase Description"/>
                             <field colspan="4" name="description_purchase" nolabel="1"/>
-	                    </page>
+                      </page>
                     </notebook>
                        <!--field name="list_price" string="Membership Fee"/>
                     <separator colspan="4" string="Customer Taxes:"/>
@@ -138,12 +139,12 @@
             <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"/>
+          <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/>
@@ -159,14 +160,14 @@
             <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"/>
+              <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'}"/>
+                  <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>
             </field>

From c14910003c28fa892a724396eb140a7ba8680028 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Wed, 6 Oct 2010 19:13:29 +0530
Subject: [PATCH 358/632] [Fix] Add Search view, Fixes for views.

bzr revid: vda@tinyerp.com-20101006134329-bb9xbojglh0zqbth
---
 bin/addons/base/res/res_widget.py       |  1 +
 bin/addons/base/res/res_widget_view.xml | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 80706084df1..978a092c5db 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -23,6 +23,7 @@ from osv import fields,osv
 
 class res_widget(osv.osv):
     _name = "res.widget"
+    _rec_name = "title"
     _columns = {
                 'title' : fields.char('Title', size=64),
                 'content': fields.text('Content')
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 690d456691c..69c801e14a7 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="view_res_widget_search" model="ir.ui.view">
+            <field name="name">res.widget.search</field>
+            <field name="model">res.widget</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Widget">
+                    <field name="title" />
+                 </search>
+            </field>
+        </record>
+        
         <record id="res_widget_form" model="ir.ui.view">
             <field name="name">res.widget.form</field>
             <field name="model">res.widget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="OpenERP Favourites">
+                <form string="Widgets">
                     <field name="title"/>
                     <field name="content"/>
                 </form>
@@ -17,17 +28,18 @@
             <field name="model">res.widget</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="OpenERP Favourites">
+                <tree string="Widgets">
                     <field name="title"/>
                 </tree>
             </field>
         </record>
 
         <record id="res_widget_act_window" model="ir.actions.act_window">
-            <field name="name">OpenERP Favourites</field>
+            <field name="name">Widgets</field>
             <field name="res_model">res.widget</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="res_widget_tree"/>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_res_widget_search"/>
         </record>
         
         <menuitem

From 9860aa21c1fe5c45980f9f219fe454f393bf69ed Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Wed, 6 Oct 2010 19:17:24 +0530
Subject: [PATCH 359/632] [FIX]: fix a small code that will allow user to
 prepare a slip for any contract based on the date

bzr revid: mga@tinyerp.com-20101006134724-24ki3h7m6k8gjloo
---
 addons/hr_payroll/hr_payroll.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 8643c2301af..7195fc8d3be 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -894,12 +894,22 @@ class hr_payslip(osv.osv):
                     count += 1
             return count
 
-        for slip in self.browse(cr, uid, ids, context=context):
-            
+        for slip in self.browse(cr, uid, ids, context=context):            
             old_slip_ids = slip_line_pool.search(cr, uid, [('slip_id','=',slip.id)], context=context)
             slip_line_pool.unlink(cr, uid, old_slip_ids, context=context)
-            
-            if not slip.employee_id.contract_id:
+            update = {}
+            ttyme = datetime.fromtimestamp(time.mktime(time.strptime(slip.date,"%Y-%m-%d")))
+            contracts = self.get_contract(cr, uid, slip.employee_id, date, context)
+            if contracts.get('id', False) == False:
+                update.update({
+                    'basic': round(0.0),
+                    'basic_before_leaves': round(0.0),
+                    'name':'Salary Slip of %s for %s' % (slip.employee_id.name, ttyme.strftime('%B-%Y')),
+                    'state':'draft',
+                    'contract_id':False,
+                    'company_id':slip.employee_id.company_id.id
+                })
+                self.write(cr, uid, [slip.id], update, context=context)
                 continue
 
             contract = slip.employee_id.contract_id
@@ -920,7 +930,6 @@ class hr_payslip(osv.osv):
             ded_fix = 0.0
 
             obj = {'basic':0.0}
-            update = {}
             if contract.wage_type_id.type == 'gross':
                 obj['gross'] = contract.wage
                 update['igross'] = contract.wage
@@ -958,7 +967,7 @@ class hr_payslip(osv.osv):
                 base = line.category_id.base
 
                 try:
-                    # Please have a look at the configuration guide for rules and restrictions
+                    #Please have a look at the configuration guide.
                     amt = eval(base, obj)
                 except Exception, e:
                     raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
@@ -1015,7 +1024,6 @@ class hr_payslip(osv.osv):
                 basic = contract.wage
 
             number = sequence_obj.get(cr, uid, 'salary.slip')
-            ttyme = datetime.fromtimestamp(time.mktime(time.strptime(slip.date,"%Y-%m-%d")))
             update.update({
                 'deg_id':function,
                 'number':number,
@@ -1029,7 +1037,7 @@ class hr_payslip(osv.osv):
             self.write(cr, uid, [slip.id], update, context=context)
 
         for slip in self.browse(cr, uid, ids, context=context):
-            if not slip.employee_id.contract_id:
+            if not slip.contract_id:
                 continue
 
             basic_before_leaves = slip.basic

From cfc10e27a2b3e9edbdd2be1cb4aab0d329e41ac1 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 6 Oct 2010 19:14:04 +0530
Subject: [PATCH 360/632] [IMP] Change the currency code to currency symbol in
 currency coloumn of account_payment_report

bzr revid: ara@tinyerp.com-20101006134404-9c6z9y5jqopil1xo
---
 addons/account_payment/report/order.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index c8db1e37831..908b3523af0 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -237,7 +237,7 @@
             <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[get_company_currency_symbol()]]  </para>
           </td>
         </tr>
       </blockTable>
@@ -256,7 +256,7 @@
           <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[ line.currency.name ]] </para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]]  </para>
         </td>
       </tr>
     </blockTable>

From a74c490c6d38224ab3365e09b17eb227fe0d696e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 6 Oct 2010 19:21:54 +0530
Subject: [PATCH 361/632] [MOD/IMP] hr_holidays : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101006135154-oovxhs611nk4tzso
---
 addons/hr_attendance/security/ir.model.access.csv   | 1 +
 addons/hr_expense/board_hr_expense_manager_view.xml | 8 ++++----
 addons/hr_holidays/hr_holidays_view.xml             | 2 +-
 addons/hr_holidays/security/ir.model.access.csv     | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index edcc675b8ef..838a8d6e2f7 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
+"access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
 "access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
 "access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index 9063ac32458..f0b3c26dfc4 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -9,14 +9,14 @@
             <field name="domain">[('state','in',('confirm', 'accepted'))]</field>
             <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
         </record>
-        
+
         <record id="board_hr_manager_expense_form" model="ir.ui.view">
             <field name="name">board.hr.manager.expense.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_manager_form"/>              
+			<field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
+      		<xpath expr="/form/hpaned/child1" position="inside">
 				 <action colspan="4" height="220" name="%(action_employee_expense)d" string="All Employee Expenses" />
 			</xpath>
             </field>
@@ -26,7 +26,7 @@
             icon="terp-graph"
             id="base.menu_hr_manager"
             parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager"
+            groups = "base.group_hr_manager,base.group_hr_user"
             sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ca3d940f858..9f8e5409e8d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -380,7 +380,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_system"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_hr_manager"/>
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 238d526bf5e..ccc766ac2c7 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -7,8 +7,6 @@
 "access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
 "access_hr_holidays_remaining_leaves_manager","hr.hr.holidays.remaining.leaves.manager","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,1,1,1
 "access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holydays_status_system","hr.holidays.status.system","model_hr_holidays_status","base.group_system",1,1,1,1
-"access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
 "access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
 "access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1

From 9f2d1a15a0be0ccd96ff150a8fd87d9da64f1a1f Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 6 Oct 2010 19:41:09 +0530
Subject: [PATCH 362/632] [IMP]:added a function field on ir.actions.act_window
 to show/hide the menu action tips on that action.

bzr revid: nch@tinyerp.com-20101006141109-peuk7j2mh8hqig5e
---
 bin/addons/base/ir/ir_actions.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 074bfa04f85..297aebaf5dc 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -214,6 +214,10 @@ class act_window(osv.osv):
                 res[act.id] = str(form_arch)
         return res
 
+    def _get_help_status(self, cr, uid, ids, name, arg, context={}):
+        activate_tips = self.pool.get('res.users').browse(cr, uid, uid).menu_tips
+        return dict([(id, activate_tips) for id in ids])
+
     _columns = {
         'name': fields.char('Action Name', size=64, translate=True),
         'type': fields.char('Action Type', size=32, required=True),
@@ -246,7 +250,8 @@ class act_window(osv.osv):
         'menus': fields.char('Menus', size=4096),
         'help': fields.text('Action description',
             help='Optional help text for the users with a description of the target view, such as its usage and purpose.'),
-
+        'display_menu_tip':fields.function(_get_help_status, type='boolean', method=True, string='Display Menu Tips',
+            help='It gives the status if the tip has to be displayed or not when a user executes an action')
     }
     _defaults = {
         'type': lambda *a: 'ir.actions.act_window',

From 4ab62afb16475d096c5e850718d1e3da3ef9e426 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 6 Oct 2010 18:12:34 +0200
Subject: [PATCH 363/632] [IMP] procurement,stock_location: improve module
 description + some code cleanup in procurement wkf

bzr revid: odo@openerp.com-20101006161234-sm86b86v584u0rpq
---
 addons/procurement/procurement.py    | 21 ++---------
 addons/stock_location/__openerp__.py | 55 ++++++++++++++++++++++++----
 addons/stock_location/mrp_pull.py    |  1 -
 3 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index e85602d79aa..318e572d597 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -157,34 +157,19 @@ class procurement_order(osv.osv):
         """ Checks product type.
         @return: True or False
         """
-        for procurement in self.browse(cr, uid, ids):
-            if procurement.product_id.type in ('product', 'consu'):
-                return True
-        return False
+        return all(procurement.product_id.type in ('product', 'consu') for procurement in self.browse(cr, uid, ids))
 
     def check_move_cancel(self, cr, uid, ids, context={}):
         """ Checks if move is cancelled or not.
         @return: True or False.
         """
-        res = True
-        ok = False
-        for procurement in self.browse(cr, uid, ids, context):
-            if procurement.move_id:
-                ok = True
-                if not procurement.move_id.state == 'cancel':
-                    res = False
-        return res and ok
+        return all(procurement.move_id.state != 'cancel' for procurement in self.browse(cr, uid, ids))
 
     def check_move_done(self, cr, uid, ids, context={}):
         """ Checks if move is done or not.
         @return: True or False.
         """
-        res = True
-        for proc in self.browse(cr, uid, ids, context):
-            if proc.move_id:
-                if not proc.move_id.state == 'done':
-                    res = False
-        return res
+        return all(procurement.move_id.state == 'done' for procurement in self.browse(cr, uid, ids))
 
     #
     # This method may be overrided by objects that override procurement.order
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index beb24997fb8..bb9651bb1eb 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -21,20 +21,59 @@
 
 
 {
-    'name': 'Stock Location Paths',
+    'name': 'Warehouse Locations Paths',
     'version': '1.0',
     'category': 'Generic Modules/Inventory Control',
     'description': """
-Manages product's path in locations.
+This module supplements the Warehouse application by adding support for per-product
+location paths, effectively implementing Push and Pull inventory flows.
 
-This module may be useful for different purposes:
-* Manages the product in his whole manufacturing chain
-* Manages different default locations by products
-* Define paths within the warehouse to route products based on operations:
+Typically this could be used to:
+* Manage product manufacturing chains
+* Manage default locations per product
+* Define routes within your warehouse according to business needs, such as:
    - Quality Control
    - After Sales Services
-   - Supplier Return
-* Manage products to be rent.
+   - Supplier Returns
+* Help rental management, by generating automated return moves for rented products
+
+Once this module is installed, an additional tab appear on the product form, where you can add
+Push and Pull flow specifications.
+
+Push flows
+----------
+Push flows are useful when the arrival of certain products in a given location should always
+be followed by a corresponding move to another location, optionally after a certain delay.
+The original Warehouse application already supports such Push flow specifications on the
+Locations themselves, but these cannot be refined per-product.
+
+A push flow specification indicates which location is chained with which location, and with
+what parameters. As soon as a given quantity of products is moved in the source location,
+a chained move is automatically foreseen according to the parameters set on the flow specification
+(destination location, delay, type of move, journal, etc.) The new move can be automatically
+processed, or require a manual confirmation, depending on the parameters.
+
+Pull flows
+----------
+Pull flows are a bit different from Pull flows, in the sense that they are not related to
+the processing of product moves, but rather to the processing of procurement orders.
+What is being pulled is a need, not directly products.
+A classical example of Push flow is when you have an Outlet company, with a parent Company
+that is responsible for the supplies of the Outlet.
+
+  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]
+
+When a new procurement order (A, coming from the confirmation of a Sale Order for example) arrives
+in the Outlet, it is converted into another procurement (B, via a Push flow of type 'move')
+requested from the Holding. When procurement order B is processed by the Holding company, and
+if the product is out of stock, it can be converted into a Purchase Order (C) from the Supplier
+(Push flow of type Purchase). The result is that the procurement order, the need, is pushed
+all the way between the Customer and Supplier.
+
+Technically, Pull flows allow to process procurement orders differently, not only depending on
+the product being considered, but also depending on which location holds the "need" for that
+product (i.e. the destination location of that procurement order).
+
     """,
     'author': 'OpenERP SA',
     'depends': ['procurement','stock'],
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 231a814e671..489d2281746 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -32,7 +32,6 @@ class procurement_order(osv.osv):
     def check_buy(self, cr, uid, ids, context=None):
         for procurement in self.browse(cr, uid, ids):
             for line in procurement.product_id.flow_pull_ids:
-                
                 if line.location_id==procurement.location_id:
                     return line.type_proc=='buy'
         return super(procurement_order, self).check_buy(cr, uid, ids)

From 51a12143a05e8944c33d88efb092ff5b8d55a784 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 6 Oct 2010 18:16:26 +0200
Subject: [PATCH 364/632] modifs

bzr revid: fp@tinyerp.com-20101006161626-bs6vbh8lv0y68xld
---
 bin/addons/base/base_update.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7f6cb5e58df..e89106bb8f3 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -359,6 +359,7 @@
         </record>
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
+            <field name="restart">always</field>
             <field name="sequence">1</field>
         </record>
     </data>

From 40ed04d094f5654333d638112cec8c06a8f07cf2 Mon Sep 17 00:00:00 2001
From: "Anup,Jay" <>
Date: Wed, 6 Oct 2010 23:34:32 +0530
Subject: [PATCH 365/632] [FIX] Expression : Corrected operator handling for
 domains containing Many2one fields

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

bzr revid: jvo@tinyerp.com-20101006180432-mkaqstcuvakci7hq
---
 bin/osv/expression.py | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index f251f0bc444..26ac7ec4faa 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -284,11 +284,16 @@ class expression(object):
                             context = {}                        
                         c = context.copy()
                         c['active_test'] = False
-                        dict_op = {'not in':'!=','in':'='}
+                        #Special treatment to ill-formed domains
+                        operator = ( operator in ['<','>','<=','>='] ) and 'in' or operator
+                        
+                        dict_op = {'not in':'!=','in':'=','=':'in','!=':'not in','<>':'not in'}
                         if isinstance(right,tuple):
                             right = list(right)
                         if (not isinstance(right,list)) and operator in ['not in','in']:
                             operator = dict_op[operator]
+                        elif isinstance(right,list) and operator in ['<>','!=','=']: #for domain (FIELD,'=',['value1','value2'])
+                            operator = dict_op[operator]
                         res_ids = field_obj.name_search(cr, uid, right, [], operator, limit=None, context=c)
                         if not res_ids:
                            return ('id','=',0)
@@ -297,14 +302,22 @@ class expression(object):
                             return (left, 'in', right)
 
                     m2o_str = False
-                    if isinstance(right, basestring): # and not isinstance(field, fields.related):
-                        m2o_str = True
-                    elif isinstance(right, list) or isinstance(right, tuple):
-                        m2o_str = True
-                        for ele in right:
-                            if not isinstance(ele, basestring): 
-                                m2o_str = False
-                                break
+                    if right:
+                        if isinstance(right, basestring): # and not isinstance(field, fields.related):
+                            m2o_str = True
+                        elif isinstance(right,(list,tuple)):
+                            m2o_str = True
+                            for ele in right:
+                                if not isinstance(ele, basestring): 
+                                    m2o_str = False
+                                    break
+                    else:
+                        new_op = '='
+                        if operator in  ['not like','not ilike','not in','<>','!=']:
+                            new_op = '!='
+                        #Is it ok to put 'left' and not 'id' ?
+                        self.__exp[i] = (left,new_op,False)
+                        
                     if m2o_str:
                         self.__exp[i] = _get_expression(field_obj,cr, uid, left, right, operator, context=context)
             else:

From fa99a1d9c04f0859a4d185a55a27780f4d2da4c1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 09:59:19 +0530
Subject: [PATCH 366/632] [Fix] stock_location: Fixed pylint warnings

bzr revid: sbh@tinyerp.com-20101007042919-y4cq1qlpm59e210s
---
 addons/stock_location/mrp_pull.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 489d2281746..4ad3f445763 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -18,13 +18,8 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import tools
-import ir
-import pooler
+from osv import osv
 import netsvc
-from mx import DateTime
-import time
 from tools.translate import _
 
 class procurement_order(osv.osv):
@@ -56,6 +51,7 @@ class procurement_order(osv.osv):
         proc_obj = self.pool.get('procurement.order')
         move_obj = self.pool.get('stock.move')
         location_obj = self.pool.get('stock.location')
+        picking_obj=self.pool.get('stock.picking')
         wf_service = netsvc.LocalService("workflow")
         for proc in proc_obj.browse(cr, uid, ids, context=context):
             line = None
@@ -64,7 +60,7 @@ class procurement_order(osv.osv):
                     break
             assert line, 'Line can not be False if we are on this state of the workflow'
             origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
-            picking_id = self.pool.get('stock.picking').create(cr, uid, {
+            picking_id =picking_obj.create(cr, uid, {
                 'origin': origin,
                 'company_id': line.company_id and line.company_id.id or False,
                 'type': line.picking_type,
@@ -74,7 +70,7 @@ class procurement_order(osv.osv):
                 'note': line.name, # TODO: note on procurement ?
                 'invoice_state': line.invoice_state,
             })
-            move_id = self.pool.get('stock.move').create(cr, uid, {
+            move_id =move_obj.create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
                 'company_id':  line.company_id and line.company_id.id or False,
@@ -96,10 +92,10 @@ class procurement_order(osv.osv):
                 'note': line.name, # TODO: same as above
             })
             if proc.move_id and proc.move_id.state in ('confirmed'):
-                self.pool.get('stock.move').write(cr,uid, [proc.move_id.id],  {
+                move_obj.write(cr,uid, [proc.move_id.id],  {
                     'state':'waiting'
                 }, context=context)
-            proc_id = self.pool.get('procurement.order').create(cr, uid, {
+            proc_id = proc_obj.create(cr, uid, {
                 'name': line.name,
                 'origin': origin,
                 'company_id':  line.company_id and line.company_id.id or False,
@@ -119,7 +115,7 @@ class procurement_order(osv.osv):
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
             wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
             if proc.move_id:
-                self.pool.get('stock.move').write(cr, uid, [proc.move_id.id],
+                move_obj.write(cr, uid, [proc.move_id.id],
                     {'location_id':proc.location_id.id})
 
             self.write(cr, uid, [proc.id], {'state':'running','message':_('Moved from other location')})

From 47409685f8e7fb0cc0cb4bb5eb450302f6c7b750 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 10:36:06 +0530
Subject: [PATCH 367/632] [Fix] stock: set  grouped by partner_id  in incoming
 shipment

bzr revid: sbh@tinyerp.com-20101007050606-r42yqhjcccq7dfg6
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f5f1c854d6f..93925e6a9da 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1406,7 +1406,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <separator orientation="vertical" />
                         <filter icon="terp-stock_effects-object-colorize" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />

From a32b9d28efd4d4cbcbb71c71ced33e77f1c1502e Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 10:39:37 +0530
Subject: [PATCH 368/632] [IMP]Improve the pos reports and yml files

bzr revid: azaz.201186@gmail.com-20101007050937-8lp2i9qsm5zl5v7n
---
 .../report/account_statement.rml              |  11 +-
 .../report/all_closed_cashbox_of_the_day.rml  | 328 ++++++++----------
 addons/point_of_sale/report/pos_details.rml   |   1 -
 .../report/pos_details_summary.rml            |   9 +-
 addons/point_of_sale/report/pos_lines.rml     |  15 +-
 .../report/pos_payment_report_user.rml        |  12 +-
 .../pos_receipt_without_remboursment.rml      |   2 +-
 .../report/pos_sales_user_today.rml           |  12 +-
 .../pos_sales_user_today_current_user.rml     |   6 +-
 addons/point_of_sale/statement_report.xml     |  13 +-
 addons/point_of_sale/test/pos_report.yml      |  29 +-
 11 files changed, 201 insertions(+), 237 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index 301370ccb59..e777bdfd8f1 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -216,10 +216,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real)]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -247,14 +247,13 @@
         <td>
           <para style="P2">[[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
           <para style="P2">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-          <!--<para style="terp_default_9">[[ line_ids.name ]]</para>-->
-          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+          <para style="terp_default_9">[[ line_ids.name ]]</para>
         </td>
         <td>
           <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -269,7 +268,7 @@
           <para style="terp_default_Right_9_Bold">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids), digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index f75c08dbadb..04689e0e059 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Cashbox of the day" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -10,134 +10,86 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="statement_tbl">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="statement_data">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="statement_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="statement_data1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1_detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="1,0"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="Table2_detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="statement_total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8_centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -151,34 +103,21 @@
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman"/>
-    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
-
+    <para style="terp_default_8">[[ repeatIn(objects,'statement') ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="258.0,258.0" style="statement_tbl">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header_Centre">Today's Closed Cashbox</para>
+    <para style="terp_header_Centre">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -186,11 +125,9 @@
         <td>
           <para style="terp_tblheader_General_Centre">User</para>
         </td>
-            </tr>
+      </tr>
     </blockTable>
-
-
-    <blockTable colWidths="258.0,258.0" style="statement_data">
+    <blockTable colWidths="241.0,241.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -200,10 +137,10 @@
         </td>
       </tr>
     </blockTable>
- <para style="terp_default_8">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1">
+    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">St.Name</para>
@@ -224,76 +161,89 @@
           <para style="terp_tblheader_General_Right">Ending Balance</para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_General">Total : </para>
+          <para style="terp_tblheader_General">Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre"></para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre"></para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre"></para>
+          <para style="Table Contents">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]]</u></para>
+          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]]</u></para>
+          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
-
- <section>
-<para style="terp_default_8">[[ repeatIn(get_data(user),'statement') ]]</para>
-    <blockTable colWidths="70.0,90.0,100.0,100.0,80.0,80.0" style="Table1_detail">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_8_centre">[[ statement['journal'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_8_centre">[[ statement['date'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_8_centre">[[ statement['closing_date'] ]]</para>
-        </td>
-         <td>
-          <para style="terp_default_Bold_8_right"><u> [[ (get_bal(statement)) or '0.00' ]]</u></para>
-        </td>
-        <td>
-        	<para style="terp_default_Bold_8_right"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]]</u></para>
-        </td>
-      </tr>
-    </blockTable>
-
-	<section>
-	<para style="terp_default_9">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
-     <blockTable colWidths="129.0,150.0,83.0,80.0,80.0" style="Table2_detail">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_9"><font>[[ get_partner(line_ids) or removeParentNode('font') ]]</font></para>
-        </td>
-		<td>
-		   <para style="terp_default_9"><font>[[ get_user(line_ids) or removeParentNode('font') ]]</font></para>
-		</td>
-		<td></td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]]</para>
-        </td>
-      </tr>
-     </blockTable>
-</section>
+    <section>
+      <para style="terp_default_Bold_8">[[ repeatIn(get_data(user),'statement') ]]</para>
+      <blockTable colWidths="56.0,94.0,71.0,74.0,97.0,90.0" style="Table7">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['journal'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['date'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
+          </td>
+          <td>
+            <para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para>
+          </td>
+          <td>
+            <para style="P1">[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="Standard">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
+        <blockTable colWidths="94.0,126.0,121.0,3.0,138.0" style="Table5">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+              <para style="terp_default_9">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ get_partner(line_ids) or removeParentNode('font') ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ get_user(line_ids) or removeParentNode('font') ]]</para>
+            </td>
+            <td>
+              <para style="Table Contents">
+                <font color="white"> </font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="Standard">
+          <font color="white"> </font>
+        </para>
+      </section>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index c86120779f6..786d2cb0b4d 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -125,7 +125,6 @@
       <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,4" stop="1,4"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,5" stop="0,5"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,5" stop="1,5"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 7fc8f0cc42b..309f128d229 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -82,9 +82,10 @@
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index fd3bbf9c43c..17f722c1c17 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
     </pageTemplate>
@@ -73,7 +73,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -184,16 +183,16 @@
             <para style="terp_default_Right_9">[[taxes(l)]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -221,7 +220,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Net Total :</para>
+          <para style="terp_default_9">Net Total </para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
@@ -249,7 +248,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Taxes :</para>
+          <para style="terp_default_9">Taxes</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
@@ -277,7 +276,7 @@
           </para>
         </td>
         <td>
-          <para style="P1">Total :</para>
+          <para style="terp_default_9">Total</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index a88813fac1f..3c93c9731a1 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -133,7 +133,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3">
+    <blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -154,7 +154,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6">
+      <blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -169,12 +169,12 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5">
+    <blockTable colWidths="241.0,56.0,61.0,61.0,64.0" style="Table5">
       <tr>
         <td>
           <para style="Table Contents">
@@ -192,10 +192,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Total</para>
+          <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index 44fa3bf60cc..ff6ebc3132c 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -125,7 +125,7 @@
         </td>
       </tr>
     </blockTable>
-        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[1] ]]</para>
+        <para style="terp_default_Centre_9">[[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]</para>
 
 <!--	<section>-->
 <!--		[[ repeatIn((o.state=='cancel' and o.statement_ids) and [1] or [], 'p') ]]-->
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 16c8f6f0b38..52ac1eb6f49 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -54,8 +54,9 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -98,7 +99,10 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P3">Todays Sales By User</para>
+    <para style="P2">Today's Sales By User</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="241.0,241.0" style="Table1">
       <tr>
         <td>
@@ -134,7 +138,7 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="P2">User</para>
+          <para style="P3">User</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Right">State</para>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index c483fa80a65..d0499f1743b 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -109,7 +109,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">Sales By Current User(Todays)</para>
+    <para style="P3">Today's Sales By Current User</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -175,7 +175,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
@@ -194,7 +194,7 @@
           <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index fb1be16419e..a81d51a2679 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -25,7 +25,7 @@
 
         <report
             id="all_closed_cashbox_of_the_day"
-            string="All Cloded CashBOx"
+            string="All Closed CashBox"
             model="account.bank.statement"
             name="all.closed.cashbox.of.the.day"
             auto="False"
@@ -54,16 +54,7 @@
             rml="point_of_sale/report/account_statement.rml"
              />
 
-        <report
-            id="all_closed_cashbox_of_the_day"
-            string="All Cloded CashBOx"
-            model="account.bank.statement"
-            name="all.closed.cashbox.of.the.day"
-            auto="False"
-            multi="True"
-            menu = 'False'
-            rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
-             />
+
 
     </data>
 </openerp>
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 08052356104..2fe288c2df1 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -7,12 +7,26 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
 
+
+- 
+  I open the register.
+- 
+  !record {model: pos.open.statement, id: pos_open_statement_0}:
+    {}
+- 
+  I open the statement.
+- 
+  !python {model: pos.open.statement}: |
+    self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
+      "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz":
+      False, "active_id": ref("point_of_sale.menu_open_statement"), })
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report
 -
   !python {model: pos.order}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1, 'journal':pos_open_statement_0,}}    
+    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
 
@@ -52,7 +66,7 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report Report
+  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report
 -
   !python {model: ir.ui.menu}: |
     import netsvc, tools, os, time
@@ -84,6 +98,13 @@
     balance_end_real: 0.0
     date: '2010-05-19'
     journal_id: account_journal_cash0
+    line_ids:
+        - name: statement
+          date: "2010-10-13"
+          type: customer
+          account_id: account_account_sales0
+          amount: 100
+          partner_id: base.res_partner_agrolait
     period_id: account.period_5
     state: 'draft'
 -
@@ -133,7 +154,7 @@
 -
   !python {model: pos.order}: |
     import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+    (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.pos_order_pos0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_report'+format), 'wb+').write(data)
 -
@@ -152,4 +173,4 @@
     import netsvc, tools, os, time
     (data, format) = netsvc.LocalService('report.pos.sales.user.today.current.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
     if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)

From 9e1ee6bc40d5898da2b52a5d26c56de5a89a7cc5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 11:02:55 +0530
Subject: [PATCH 369/632] [Fix] stock_location: fix the yml and remove the
 unused object

bzr revid: sbh@tinyerp.com-20101007053255-eef0ofabip6sk3jr
---
 addons/stock_location/mrp_pull.py             |  1 -
 addons/stock_location/test/stock_location.yml | 47 ++++++++++---------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index 4ad3f445763..f4c9868a58f 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -50,7 +50,6 @@ class procurement_order(osv.osv):
     def action_move_create(self, cr, uid, ids,context=None):
         proc_obj = self.pool.get('procurement.order')
         move_obj = self.pool.get('stock.move')
-        location_obj = self.pool.get('stock.location')
         picking_obj=self.pool.get('stock.picking')
         wf_service = netsvc.LocalService("workflow")
         for proc in proc_obj.browse(cr, uid, ids, context=context):
diff --git a/addons/stock_location/test/stock_location.yml b/addons/stock_location/test/stock_location.yml
index c5360ce67c5..609d0af4147 100644
--- a/addons/stock_location/test/stock_location.yml
+++ b/addons/stock_location/test/stock_location.yml
@@ -227,33 +227,34 @@
     lot_stock_id: stock_location_suppiler0
     name: OpenERP S.A.
     partner_address_id: res_partner_address_0
--
-  I create Sale order for HP CD writers.
 - 
-  !record {model: sale.order, id: sale_order_01}:
-    date_order: '2010-04-20'
-    invoice_quantity: order
-    name: Test/location
-    order_line:
-      - name: HP CD writers
-        price_unit: 1000.0
+  I create outgoing picking order for HP CD writers.
+- 
+  !record {model: stock.picking, id: stock_picking_out0}:
+    address_id: base.res_partner_address_1
+    company_id: base.main_company
+    invoice_state: none
+    move_lines:
+      - date_expected: '2010-10-07 10:52:54'
+        location_dest_id: stock.stock_location_customers
+        location_id: stock_location_suppiler0
+        name: '[MB1] Mainboard ASUStek A7N8X'
+        product_id: product.product_product_mb1
+        product_qty: 1.0
         product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        product_id: product_product_hpcdwriters0
-        type: make_to_order
-    order_policy: manual
-    partner_id: base.res_partner_agrolait
-    partner_invoice_id: base.res_partner_address_8
-    partner_order_id: base.res_partner_address_8
-    partner_shipping_id: base.res_partner_address_8
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.shop
+        product_uos_qty: 1.0
+    move_type: direct
+    name: OUT/00007
+    type: out
 - 
-  I confirm the sale order.
+  I confirm the picking.
 - 
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_01}     
+   !python {model: stock.picking}: |
+    self.draft_validate(cr, uid, [ref("stock_picking_out0")], {"lang": "en_US",
+      "search_default_available": 1, "tz": False, "active_model": "ir.ui.menu",
+      "contact_display": "partner_address", "active_ids": [ref("stock.menu_action_picking_tree")],
+      "active_id": ref("stock.menu_action_picking_tree"), })
+
 -
   I check the delay mentioned in pushed flow in move. 
 -  

From 7ff6f5b88e3eec3fb3e4f49f3dabb04d9a5565cd Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 11:13:35 +0530
Subject: [PATCH 370/632] [IMP]Changes the rml title and author

bzr revid: azaz.201186@gmail.com-20101007054335-ny5yg41i5xi5b8cq
---
 addons/point_of_sale/report/account_statement.rml |  2 +-
 .../report/all_closed_cashbox_of_the_day.rml      |  2 +-
 addons/point_of_sale/report/pos_details.rml       |  2 +-
 .../point_of_sale/report/pos_details_summary.rml  |  2 +-
 addons/point_of_sale/report/pos_lines.rml         |  2 +-
 .../report/pos_payment_report_date.rml            |  2 +-
 .../report/pos_payment_report_user.rml            |  2 +-
 addons/point_of_sale/report/pos_sales_user.rml    |  2 +-
 .../point_of_sale/report/pos_sales_user_today.rml |  2 +-
 .../report/pos_sales_user_today_current_user.rml  |  2 +-
 addons/point_of_sale/report/pos_users_product.rml |  2 +-
 addons/point_of_sale/test/pos_report.yml          | 15 +--------------
 12 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index e777bdfd8f1..c576828cac1 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Statement" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index 04689e0e059..658e7e958b9 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Cashbox of the day" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 786d2cb0b4d..045adf0763c 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 309f128d229..5f68c7869f0 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Detail of sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 17f722c1c17..7f2d97f1c18 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index c994e53d933..35e605d0bff 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 3c93c9731a1..4779fad9e6b 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Payment By User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index 9566957b4fa..5a98c092a3a 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Sales Report" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 52ac1eb6f49..9f1bc6eb14b 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Todays Sales By User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index d0499f1743b..c4d046ad9f8 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Todays Sales By Current User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index 60bf67f19af..d5c7d6a9996 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="User's Product'" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 2fe288c2df1..934022f5a4a 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -7,25 +7,12 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
 
-
-- 
-  I open the register.
-- 
-  !record {model: pos.open.statement, id: pos_open_statement_0}:
-    {}
-- 
-  I open the statement.
-- 
-  !python {model: pos.open.statement}: |
-    self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
-      "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz":
-      False, "active_id": ref("point_of_sale.menu_open_statement"), })
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report
 -
   !python {model: pos.order}: |
     import netsvc, tools, os
-    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1, 'journal':pos_open_statement_0,}}    
+    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1}}    
     (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)

From 6679eb86d6ced9eaa2f62e8c4db8f311c8974837 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 11:16:43 +0530
Subject: [PATCH 371/632] [FIX]

bzr revid: mra@mra-laptop-20101007054643-34eq1ky0i9hptzcb
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9df10dbfb77..60b798271b5 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -191,7 +191,7 @@
         <record model="ir.actions.act_window.view" id="action_membership_members_view_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="view_partner_form"/>
+            <field name="view_id" ref="base.view_partner_form"/>
             <field name="act_window_id" ref="action_membership_members"/>
         </record>
 

From e9753515f723ebd99bafac47678ad56fb7b52032 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Thu, 7 Oct 2010 11:31:44 +0530
Subject: [PATCH 372/632] [IMP]: Improved general_ledger report.

bzr revid: jni@tinyerp.com-20101007060144-0l1wahry000ud1cm
---
 .../account_general_ledger_landscape.rml      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 1321bdea750..9d23454fcbb 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -263,13 +263,13 @@
       	<tr>
         	<td>
           		<blockTable colWidths="404.0,335.0,79,73.5,72.5,79.00" style="Table5">
-	        		<tr>
+	   	     		<tr>
 		    			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 		    			<td><para style="Standard"></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
-					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
-			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
+					  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
+			  			<td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]]</u></para></td>
 		   			</tr>
 	    		</blockTable>
 	    	</td>
@@ -292,9 +292,9 @@
 			<td><para style="P2_content">[[ line['move'] ]]</para></td>
 			<td><para style="P3_content">[[ line['lname'] ]]</para></td>
 			<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
-			<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
+			<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
 			<td><para style="P4_content">[[  formatLang(line['amount_currency'] or '')]] [[  line['currency_code'] or '' ]]</para></td>
 		</tr>
 	  </blockTable>
@@ -327,9 +327,9 @@
 						<tr>
 			 	 			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 			  				<td><para style="Standard"></para></td>
-						  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
-					  		<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp=Account)) ]]</u></para></td>
-			  				<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
+						  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
+					  		<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
+			  				<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
 						</tr>
 					</blockTable>
 		 		</td>

From 3be7462b17ce726d7e93b04212d6e431f3492a67 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 7 Oct 2010 11:38:10 +0530
Subject: [PATCH 373/632] [IMP] sale:-improvements in security rights for
 Sales/Reporting

bzr revid: mtr@mtr-20101007060810-tljtv31r5h30mxcb
---
 addons/sale/report/sale_report_view.xml  | 2 +-
 addons/sale/security/ir.model.access.csv | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index aaf4cd3e69c..751e74d52be 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -129,7 +129,7 @@
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
-    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
+    <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1" groups="base.group_sale_manager"/>
 
     <!--This views used in board_sale module -->
     <record id="view_sales_by_partner_tree" model="ir.ui.view">
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 89a2003698c..273029ad0ce 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -14,6 +14,7 @@
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
 "access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,0,0,0
 "access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0
+"access_sale_report_salesman","sale.report","model_sale_report","base.group_sale_salesman",1,1,1,0
 "access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
 "access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
 "access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0

From d2611e07653576dbdda336950740b25e072389d3 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 7 Oct 2010 11:51:29 +0530
Subject: [PATCH 374/632] [FIX] fix the warning of account module

bzr revid: ara@tinyerp.com-20101007062129-z5hzjvee9wnll5dg
---
 addons/account/account.py                     |  8 +++----
 addons/account/invoice.py                     | 21 +------------------
 .../wizard/account_automatic_reconcile.py     |  9 ++++----
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 1c9864b5fd0..eeb220e8a00 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -646,7 +646,7 @@ class account_journal(osv.osv):
             'name': name,
             'code': code
         }
-        type_id = seq_typ_pool.create(cr, uid, types)
+        seq_typ_pool.create(cr, uid, types)
 
         seq = {
             'name': name,
@@ -1150,10 +1150,10 @@ class account_move(osv.osv):
             context = {}
         invoice = context.get('invoice', False)
         valid_moves = self.validate(cr, uid, ids, context)
-        
+
         if not valid_moves:
             raise osv.except_osv(_('Integrity Error !'), _('You cannot validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
-        
+
         for move in self.browse(cr, uid, valid_moves):
             if move.name =='/':
                 new_name = False
@@ -1175,7 +1175,7 @@ class account_move(osv.osv):
                    'SET state=%s '\
                    'WHERE id IN %s',
                    ('posted', tuple(valid_moves),))
-            
+
         return True
 
     def button_validate(self, cursor, user, ids, context=None):
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 7be82a72be9..93ad7fa58e4 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -20,14 +20,11 @@
 ##############################################################################
 
 import time
-from operator import itemgetter
 import decimal_precision as dp
-from lxml import etree
 
 import netsvc
 from osv import fields, osv, orm
 import pooler
-from tools import config
 from tools.translate import _
 
 class account_invoice(osv.osv):
@@ -536,7 +533,7 @@ class account_invoice(osv.osv):
                                 if not result_id:
                                     raise osv.except_osv(_('Configuration Error !'),
                                         _('Can not find account chart for this company in invoice line account, Please Create account.'))
-                                r_id = self.pool.get('account.invoice.line').write(cr, uid, [line.id], {'account_id': result_id[0]})
+                                self.pool.get('account.invoice.line').write(cr, uid, [line.id], {'account_id': result_id[0]})
             else:
                 if invoice_line:
                     for inv_line in invoice_line:
@@ -587,16 +584,6 @@ class account_invoice(osv.osv):
             wf_service.trg_create(uid, 'account.invoice', inv_id, cr)
         return True
 
-    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
-        """finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
-        Hook method to be overridden in additional modules to verify and possibly alter the
-        move lines to be created by an invoice, for special cases.
-        :param invoice_browse: browsable record of the invoice that is generating the move lines
-        :param move_lines: list of dictionaries with the account.move.lines (as for create())
-        :return: the (possibly updated) final move_lines to create for this invoice
-        """
-        return move_lines
-
     # Workflow stuff
     #################
 
@@ -817,7 +804,6 @@ class account_invoice(osv.osv):
                 self.write(cr, uid, [inv.id], {'date_invoice':time.strftime('%Y-%m-%d')})
             company_currency = inv.company_id.currency_id.id
             # create the analytical lines
-            line_ids = self.read(cr, uid, [inv.id], ['invoice_line'])[0]['invoice_line']
             # one move line per invoice line
             iml = self._get_analytic_lines(cr, uid, inv.id)
             # check if taxes are all computed
@@ -1390,8 +1376,6 @@ class account_invoice_line(osv.osv):
         if a:
             result['account_id'] = a
 
-        taxep = None
-        tax_obj = self.pool.get('account.tax')
         if type in ('out_invoice', 'out_refund'):
             taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
             tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
@@ -1444,13 +1428,10 @@ class account_invoice_line(osv.osv):
 
     def move_line_get(self, cr, uid, invoice_id, context=None):
         res = []
-        tax_grouped = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
-        ait_obj = self.pool.get('account.invoice.tax')
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
         company_currency = inv.company_id.currency_id.id
-        cur = inv.currency_id
 
         for line in inv.invoice_line:
             mres = self.move_line_get_item(cr, uid, line, context)
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index f94082445da..6a1afc45bcf 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -21,7 +21,6 @@
 
 import time
 
-import netsvc
 from osv import osv, fields
 from tools.translate import _
 
@@ -150,12 +149,12 @@ class account_automatic_reconcile(osv.osv_memory):
         for account_id in form['account_ids']:
             params = (account_id,)
             if not allow_write_off:
-                query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL 
-                AND state <> 'draft' GROUP BY partner_id 
+                query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL
+                AND state <> 'draft' GROUP BY partner_id
                 HAVING ABS(SUM(debit-credit)) = 0.0 AND count(*)>0"""
             else:
-                query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL 
-                AND state <> 'draft' GROUP BY partner_id 
+                query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL
+                AND state <> 'draft' GROUP BY partner_id
                 HAVING ABS(SUM(debit-credit)) < %s AND count(*)>0"""
                 params += (max_amount,)
             # reconcile automatically all transactions from partners whose balance is 0

From 52462287f3027f98bcfae6ee920c037e9c3d1c34 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 12:01:56 +0530
Subject: [PATCH 375/632] [IMP]L improvement and fix to the payroll module

bzr revid: mga@tinyerp.com-20101007063156-tijiyci4w5r0v29w
---
 addons/hr_payroll/hr_payroll.py       | 26 ++++++++++----
 addons/hr_payroll/hr_payroll_data.xml |  4 +--
 addons/hr_payroll/hr_payroll_demo.xml |  4 ---
 addons/hr_payroll/hr_payroll_view.xml | 50 +++++++++++++++++++++++----
 4 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 7195fc8d3be..8f6156cabe6 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -492,8 +492,13 @@ class payment_category(osv.osv):
         'type':fields.selection([
             ('allowance','Allowance'),
             ('deduction','Deduction'),
-            ('other','Others'),
-        ],'Type', select=True),
+            ('leaves','Leaves'),
+            ('advance','Advance'),
+            ('loan','Loan'),
+            ('installment','Loan Installment'),
+            ('otherpay','Other Payment'),
+            ('otherdeduct','Other Deduction'),
+        ],'Type', select=True, required=True),
         'base':fields.text('Based on', required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
         'condition':fields.char('Condition', size=1024, required=True, readonly=False, help='Applied this head for calculation if condition is true'),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
@@ -620,7 +625,8 @@ class hr_holidays_status(osv.osv):
             ('halfpaid','Half-Pay Holiday')
             ], string='Payment'),
         'head_id': fields.many2one('hr.allounce.deduction.categoty', 'Payroll Head', domain=[('type','=','deduction')]),
-        'code':fields.char('Code', size=64, required=False, readonly=False),
+        'code': fields.related('head_id','code', type='char', relation='hr.allounce.deduction.categoty', string='Code'),
+#        'code':fields.char('Code', size=64, required=False, readonly=False),
     }
     _defaults = {
         'type': lambda *args: 'unpaid',
@@ -1057,6 +1063,9 @@ class hr_payslip(osv.osv):
             total_leave = 0.0
             paid_leave = 0.0
             for hday in holiday_pool.browse(cr, uid, leave_ids, context=context):
+                if not hday.holiday_status_id.head_id:
+                    raise osv.except_osv(_('Error !'), _('Please check configuration of %s, payroll head is missing' % (hday.holiday_status_id.name)))
+                    
                 res = {
                     'slip_id':slip.id,
                     'name':hday.holiday_status_id.name + '-%s' % (hday.number_of_days),
@@ -1141,7 +1150,8 @@ class hr_payslip_line(osv.osv):
         'employee_id':fields.many2one('hr.employee', 'Employee', required=False),
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'base':fields.char('Formula', size=1024, required=False, readonly=False),
-        'code':fields.char('Code', size=64, required=False, readonly=False),
+        'code':fields.char('Code', size=64, required=False, readonly=False),        
+        'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Category', required=True),
         'type':fields.selection([
             ('allowance','Allowance'),
             ('deduction','Deduction'),
@@ -1152,12 +1162,13 @@ class hr_payslip_line(osv.osv):
             ('otherpay','Other Payment'),
             ('otherdeduct','Other Deduction'),
         ],'Type', select=True, required=True),
-        'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Category', required=True),
+        #TODO: link type to the category_id instead of define again
+        #'type': fields.related('category_id','type', type='selection', size=64, relation='hr.allounce.deduction.categoty', string='Type', store=True),
         'amount_type':fields.selection([
             ('per','Percentage (%)'),
             ('fix','Fixed Amount'),
             ('func','Function Value'),
-        ],'Amount Type', select=True),
+        ],'Amount Type', select=True, required=True),
         'amount': fields.float('Amount / Percentage', digits=(16, 4)),
         'total': fields.float('Sub Total', readonly=True, digits=(16, 4)),
         'company_contrib': fields.float('Company Contribution', readonly=True, digits=(16, 4)),
@@ -1166,6 +1177,9 @@ class hr_payslip_line(osv.osv):
         'line_ids':fields.one2many('hr.payslip.line.line', 'slipline_id', 'Calculations', required=False)
     }
     _order = 'sequence'
+    _defaults = {
+        'amount_type': lambda *a: 'per'
+    }
 
     def execute_function(self, cr, uid, id, value, context=None):
         if context is None:
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index fc9a58f76b4..db6797f85fb 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -115,14 +115,14 @@
         
         <record id="OTHERD" model="hr.allounce.deduction.categoty">
             <field name="code">OTHERD</field>
-            <field name="type">deduction</field>
+            <field name="type">otherdeduct</field>
             <field name="name">Other Deduction</field>
             <field name="sequence" eval="85"/>
         </record>
         
         <record id="OTHERA" model="hr.allounce.deduction.categoty">
             <field name="code">OTHERA</field>
-            <field name="type">allowance</field>
+            <field name="type">otherpay</field>
             <field name="name">Other Taxable Allowance</field>
             <field name="sequence" eval="90"/>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 4c125f2284b..c2ec64e9041 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -16,7 +16,6 @@
             <field eval="0.4" name="amount"/>
             <field name="code">HRA</field>
             <field name="category_id" ref="hr_payroll.HRA"/>
-            <field name="type">allowance</field>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">House Rant Allowance</field>
         </record>
@@ -28,7 +27,6 @@
             <field eval="800.0" name="amount"/>
             <field name="code">CA</field>
             <field name="category_id" ref="hr_payroll.CA"/>
-            <field name="type">allowance</field>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Convance Allowance</field>
         </record>
@@ -40,7 +38,6 @@
             <field eval="200.0" name="amount"/>
             <field name="code">PT</field>
             <field name="category_id" ref="hr_payroll.PT"/>
-            <field name="type">deduction</field>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Professional Tax</field>
         </record>
@@ -52,7 +49,6 @@
             <field eval="0.125" name="amount"/>
             <field name="code">PF</field>
             <field name="category_id" ref="hr_payroll.PF"/>
-            <field name="type">deduction</field>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Provident Fund</field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 62b63b86bb8..a39fb1aa6d7 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -350,16 +350,17 @@
             <field name="inherit_id" ref="hr_holidays.edit_holiday_status_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="color_name" position="after">
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Payroll Accounting"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/>
-                        <field name="code"/>
-                    </group>
+                <field name="double_validation" position="replace">
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Payroll Configurtion"/>
                         <field name="type"/>
                         <field name="head_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/>
+                        <field name="code" readonly="True"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="4" string="Validation"/>
+                        <field name="double_validation"/>
                     </group>
                 </field>
             </field>
@@ -586,7 +587,42 @@
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Contribution">
-                            <field name="contribute_ids" colspan="4" nolabel="1" height="300"/>
+                            <field name="contribute_ids" colspan="4" nolabel="1" height="300">
+                                <form string="Company Contribution">
+                                    <group col="6" colspan="6">
+                                        <field name="name" select="1"/>
+                                        <field name="code" select="1"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="2" string="Contributions"/>
+                                        <field name="amount_type" attrs="{'required': [('contribute','=',True)]}"/>
+                                        <field name="contribute_per" attrs="{'required': [('contribute','=',True)], 'readonly':[(('amount_type','=','func'))]}"/>
+                                        <field name="register_id" attrs="{'required': [('contribute','=',True)]}"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="2" string="Other Information"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection" select="1"/>
+                                        <field name="active" select="1"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Function" attrs="{'readonly': [('amount_type','!=','func')]}">
+                                            <field name="line_ids" colspan="4" nolabel="1">
+                                                <tree string="Function Arguments" editable="bottom">
+                                                    <field name="name"/>
+                                                    <field name="sequence"/>
+                                                    <field name="from_val"/>
+                                                    <field name="to_val"/>
+                                                    <field name="amount_type"/>
+                                                    <field name="value"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Description">
+                                            <field name="note" colspan="4" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
                         </page>
                     </notebook>
                 </form>

From 482a8c763558ae1c9aecedcc3388128f290568b3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 12:10:34 +0530
Subject: [PATCH 376/632] [ADD] stock_location: Add the demo data

bzr revid: sbh@tinyerp.com-20101007064034-c9fr8t28uvzp7vap
---
 addons/stock_location/__openerp__.py          |  3 +-
 addons/stock_location/stock_location_demo.xml | 55 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 addons/stock_location/stock_location_demo.xml

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index bb9651bb1eb..a0d2118b754 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -79,7 +79,8 @@ product (i.e. the destination location of that procurement order).
     'depends': ['procurement','stock'],
     'init_xml': [],
     'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
-    'demo_xml': [],
+    'demo_xml': ['stock_location_demo.xml',],
+    
     'installable': True,
     'test':[
             'test/stock_location.yml'
diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
new file mode 100644
index 00000000000..4c808f7e2e4
--- /dev/null
+++ b/addons/stock_location/stock_location_demo.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data noupdate="1">
+	
+		<record id="stock_location_path_0" model="stock.location.path">
+			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="auto">auto</field>
+			<field name="invoice_state">none</field>
+			<field eval="1" name="delay"/>
+			<field name="location_dest_id" ref="stock.stock_location_stock"/>
+			<field name="picking_type">out</field>
+		</record>
+		<record id="stock_location_path_1" model="stock.location.path">
+			<field name="location_from_id" ref="stock.stock_location_output"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="auto">auto</field>
+			<field name="invoice_state">none</field>
+			<field eval="1" name="delay"/>
+			<field name="location_dest_id" ref="stock.stock_location_stock"/>
+			<field name="picking_type">out</field>
+		</record>
+		<record id="product_pulled_flow_l0" model="product.pulled.flow">
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="location_id" ref="stock.stock_location_shop0"/>
+			<field name="invoice_state">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="type_proc">move</field>
+			<field eval="0" name="cancel_cascade"/>
+			<field name="procure_method">make_to_order</field>
+			<field name="picking_type">out</field>
+			<field name="name">L001</field>
+		</record>
+		<record id="product_pulled_flow_l1" model="product.pulled.flow">
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="location_src_id" ref="stock.stock_location_suppliers"/>
+			<field name="location_id" ref="stock.stock_location_stock"/>
+			<field name="invoice_state">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="type_proc">move</field>
+			<field eval="0" name="cancel_cascade"/>
+			<field name="procure_method">make_to_order</field>
+			<field name="picking_type">out</field>
+			<field name="name">L002</field>
+		</record>
+		<record id="product_pulled_flow_l2" model="product.pulled.flow">
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="location_id" ref="stock.stock_location_suppliers"/>
+			<field name="invoice_state">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="type_proc">buy</field>
+			<field name="name">L003</field>
+		</record>
+	</data>
+</openerp>

From 0d207facc46c0fd4247595e928480890257b9c84 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 12:19:49 +0530
Subject: [PATCH 377/632] [IMP] stock_location: Imrpove  demo data

bzr revid: sbh@tinyerp.com-20101007064949-183ita9g1a83vlng
---
 addons/stock_location/stock_location_demo.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index 4c808f7e2e4..f79026f66fc 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data noupdate="1">
-	
+	     <record id="product.product_product_cpu1" model="product.product">
+            <field name="description">This product use for  push/pull path </field>
+        </record>
 		<record id="stock_location_path_0" model="stock.location.path">
 			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
 			<field name="product_id" ref="product.product_product_cpu1"/>

From fec76a4931d61d17fe6fb7d96fb30989ddf288a4 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 12:39:23 +0530
Subject: [PATCH 378/632] [Fix] hr : once in the form view, there is always a
 message that prompts to say that the record have been modified even if
 nothing has been done

bzr revid: vir@tinyerp.com-20101007070923-c6602jlppu2iiiql
---
 addons/hr/hr.py       | 2 +-
 addons/hr/hr_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index e2da2b9cf7b..803210ddbff 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -136,7 +136,7 @@ class hr_employee(osv.osv):
         'department_id':fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
-        'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
+        'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b47bf23d6fc..929afbe3d84 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -99,7 +99,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal+" domain="[('active','=',True)]" string="Active" groups="base.group_extended"/>
+                    <filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection">
@@ -145,7 +145,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
-            <field name="context">{"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_department_id": department_id,"search_default_active":eval('True')}</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>

From 389a623545cc80358c8b74e57b38f30ba39615af Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Oct 2010 12:41:57 +0530
Subject: [PATCH 379/632] [MOD/IMP] hr_* : Usability Improvement in
 Accessrights

bzr revid: dbr@tinyerp.com-20101007071157-z52414z1sz9h85qh
---
 addons/hr/security/ir.model.access.csv        |  9 +-----
 .../security/ir.model.access.csv              |  2 --
 .../hr_contract/security/ir.model.access.csv  |  6 ----
 .../board_hr_expense_manager_view.xml         |  2 +-
 .../hr_expense/security/ir.model.access.csv   | 31 ++++++++++---------
 addons/hr_holidays/board_hr_holidays_view.xml |  2 +-
 .../hr_holidays/security/ir.model.access.csv  | 16 +++-------
 7 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 0b9a721e1ea..4b2d72b017d 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,15 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
-"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
+"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
-"access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
-"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
 "access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 838a8d6e2f7..a934f859c4f 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
 "access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 00b1410ffa3..51d833d8607 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,17 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_contract_wage_type_period_manager","hr.contract.wage.type.period.manager","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
 "access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
-"access_hr_contract_wage_type_manager","hr.contract.wage.type.manager","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
 "access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
-"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
-"access_hr_contract_employee","hr.contract.employee","model_hr_contract","base.group_user",1,0,0,0
 "access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
 "access_hr_employee_contract_manager","hr.employee.contract.manager","hr.model_hr_employee","base.group_hr_manager",1,1,1,1
 "access_hr_employee_category_manager","hr.employee.category.manager","hr.model_hr_employee_category","base.group_hr_manager",1,1,1,1
 "access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_resource_calendar_manager","hr.employee.resource.calendar.manager","resource.model_resource_calendar","base.group_hr_manager",1,1,1,1
 "access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
 "access_hr_job_manager","hr.job manager","hr.model_hr_job","base.group_hr_manager",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
 "access_hr_department_manager","hr.department.manager","hr.model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index f0b3c26dfc4..d5c761f7b68 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -26,7 +26,7 @@
             icon="terp-graph"
             id="base.menu_hr_manager"
             parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_manager,base.group_hr_user"
+            groups = "base.group_hr_user"
             sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index ec44936c3b4..525b55bf681 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,17 +1,18 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
-"access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1
-"access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0
-"access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0
-"access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
-"access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
-"access_hr_expense_expense_manager","hr.expense.expense.manager","model_hr_expense_expense","base.group_hr_manager",1,1,1,1
-"access_hr_expense_line_manager","hr.expense.line.manager","model_hr_expense_line","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense_manager","product.product.hr.expense.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
-"access_product_template_hr_expense_manager","product.template.hr.expense.manager","product.model_product_template","base.group_hr_manager",1,1,1,1
-"access_product_uom_hr_expense_manager","product.uom.hr.expense.manager","product.model_product_uom","base.group_hr_manager",1,1,1,1
-"access_product_price_type_manager","product.price.type.manager","product.model_product_price_type","base.group_hr_manager",1,1,1,1
-"access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","hr.model_hr_employee","base.group_user",1,0,0,0
-"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,0,0,0
+"access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1
+"access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1
+"access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1
+"access_product_uom_hr_expense_user","product.uom.hr.expense.user","product.model_product_uom","base.group_hr_user",1,1,1,1
+"access_product_price_type_user","product.price.type.user","product.model_product_price_type","base.group_hr_user",1,1,1,1
+"access_account_journal_user","account.journal.user","account.model_account_journal","base.group_hr_user",1,1,1,1
+"access_account_invoice_user","account.invoice.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
+"access_account_invoice_line_user","account.invoice.line.user","account.model_account_invoice_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_journal_user","account.ianalytic.journal.user","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
+"access_account_invoice_tax_user","account.invoice.tax.user","account.model_account_invoice_tax","base.group_hr_user",1,1,1,1
+"access_account_period_user","account.period.user","account.model_account_period","base.group_hr_user",1,1,1,1
+"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
+"access_account_move_user","account.move.user","account.model_account_move","base.group_hr_user",1,1,1,1
+"access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 8659e3de51d..86786ad1baf 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
     
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index ccc766ac2c7..20da4832fe2 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,13 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0
-"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,0
-"access_hr_holydays_status_manager","hr.holidays.status.manager","model_hr_holidays_status","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_manager","hr.holidays.manager","model_hr_holidays","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
-"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_remaining_leaves_manager","hr.hr.holidays.remaining.leaves.manager","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,1,1,1
-"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
-"access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
+"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
+"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
+"access_hr_holidays_report_manager","hr.holidays.report.manager","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
-"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,0
+"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1

From eb95954919dcec0d368c13c8ccd5d7cf810c0638 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 12:43:34 +0530
Subject: [PATCH 380/632] [IMP]: improvement to payroll [REM]: remove some
 field specific to the localize data, may be added from the localize module

bzr revid: mga@tinyerp.com-20101007071334-tonherdg56xbn0xa
---
 addons/hr_payroll/hr_payroll.py       |  5 -----
 addons/hr_payroll/hr_payroll_view.xml | 19 ++++---------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 8f6156cabe6..b5a7e08a501 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1226,11 +1226,6 @@ class hr_employee(osv.osv):
     _description = 'Employee'
 
     _columns = {
-        'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False, help="EPS Account Number"),
-        'pf_account':fields.char('PF Account', size=64, required=False, readonly=False, help="Providend Fund Account Number"),
-        'pg_joining': fields.date('PF Join Date'),
-        'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False, help="ESI Account Number"),
-        'hospital_id':fields.many2one('res.partner.address', 'ESI Hospital', required=False),
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a39fb1aa6d7..962b613158b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -119,18 +119,7 @@
                             <field name="manager" select="1"/>
                             <field name="vehicle" select="1"/>
                             <field name="vehicle_distance" select="1"/>
-                        </group>
-                        <group col="2" colspan="2" groups="base.group_extended">
-                            <separator colspan="2" string="ESI Information"/>
-                            <field name="esi_account" string="Account"/>
-                            <field name="hospital_id" string="Hospital"/>
                             <field name="medic_exam" select="1" string="Medical Examination"/>
-                            <field name="esp_account" select="1"/>
-                        </group>
-                        <group col="2" colspan="2" groups="base.group_extended">
-                            <separator colspan="2" string="Providend Fund"/>
-                            <field name="pf_account" string="Account"/>
-                            <field name="pg_joining" string="Join Date"/>
                         </group>
                     </page>
                     <page string="Contracts" groups="base.group_extended">
@@ -277,13 +266,13 @@
                         <page string="Work Permit">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Passport"/>
-                                <field name="passport_id"/>
+                                <field name="passport_id" domain="[('employee_id','=',employee_id)]"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Valid for"/>
-                                <field name="visa_no"/>
-                                <field name="permit_no"/>
-                                <field name="visa_expire"/>
+                                <field name="visa_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
+                                <field name="permit_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
+                                <field name="visa_expire" attrs="{'required': [('passport_id','!=',False), ]}"/>
                             </group>
                         </page>
                     </notebook>

From 85259763d2b1a2f0737e740f423e709ed3b4491d Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 12:59:38 +0530
Subject: [PATCH 381/632] [IMP]Improve the yml file of delivery report

bzr revid: azaz.201186@gmail.com-20101007072938-4k61yk8iizgv2z32
---
 addons/delivery/test/delivery_report.yml | 30 +++++++++++++++++++++++-
 addons/point_of_sale/test/pos_report.yml |  4 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml
index ed3a859f23d..a88b6bd1942 100644
--- a/addons/delivery/test/delivery_report.yml
+++ b/addons/delivery/test/delivery_report.yml
@@ -1,8 +1,36 @@
+
+-
+ 
+  In Order to test the delivery report I create picking with move lines.
+- 
+  !record {model: stock.picking, id: stock_picking_delivery}:
+    name: test_picking
+    origin: SO001
+    address_id: base.res_partner_address_4
+    company_id: base.main_company
+    date: '2010-05-11 15:18:52'
+    invoice_state: none
+    move_lines:
+      - company_id: base.main_company
+        date_planned: '2010-05-11 15:18:57'
+        location_dest_id: stock.stock_location_customers
+        location_id: stock.stock_location_stock
+        name: HP CD writers
+        product_id: product.product_product_pc1
+        product_qty: 3.0
+        product_uom: product.product_uom_unit
+        date: '2010-05-11 15:18:57'
+        product_uos_qty: 3.0
+    move_type: direct
+    type: out
+    
+    
+
 -
   In order to test the PDF reports defined on a Delievry, we will print a Delivery Order report
 - 
   !python {model: stock.picking}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.sale.shipping').create(cr, uid, [ref('stock.stock_picking_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.sale.shipping').create(cr, uid, [ref('stock_picking_delivery')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'delievry-shipping'+format), 'wb+').write(data)
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 934022f5a4a..933635ac499 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -12,8 +12,8 @@
 -
   !python {model: pos.order}: |
     import netsvc, tools, os
-    data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1}}    
-    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {})
+    data_dict = {'model':'ir.ui.menu', 'form':{ 'invoice_wanted':1}}
+    (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
 

From c6968eaf3e4fcb54be5bb0fa61ebd2a11a62635e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 13:01:31 +0530
Subject: [PATCH 382/632] [FIX]: fix a usability problem for the hr and payroll
 related to the employee passport informaion

bzr revid: mga@tinyerp.com-20101007073131-ba4dkusjnz6kuj8d
---
 addons/hr/hr.py                       |  3 ++-
 addons/hr/hr_view.xml                 | 39 ++++++++++++++-------------
 addons/hr_payroll/hr_payroll_view.xml |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d638f8191dd..af9b0db7afc 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -127,7 +127,8 @@ class hr_employee(osv.osv):
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
-        'photo': fields.binary('Photo')
+        'photo': fields.binary('Photo'),
+        'passport_id':fields.char('Passport', size=64)
     }
 
     def onchange_company(self, cr, uid, ids, company, context=None):
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 7d2cec69667..44f01057085 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -36,31 +36,32 @@
                     <notebook colspan="6">
                         <page string="Personal Information">
                             <group col="2" colspan="2">
-                            <separator colspan="2" string="Social IDs"/>
-                            <field name="ssnid"/>
-                            <field name="sinid" groups="base.group_extended"/>
-                            <field name="identification_id" groups="base.group_extended"/>
+                                <separator colspan="2" string="Social IDs"/>
+                                <field name="ssnid"/>
+                                <field name="sinid" groups="base.group_extended"/>
+                                <field name="identification_id" groups="base.group_extended"/>
+                                <field name="passport_id"/>
                             </group>
                             <group col="2" colspan="2">
-                            <separator string="Status" colspan="2"/>
-                            <field name="gender"/>
-                            <field name="marital" widget="selection"/>
-                            <field name="country_id"/>
-                            <field name="birthday"/>
+                                <separator string="Status" colspan="2"/>
+                                <field name="gender"/>
+                                <field name="marital" widget="selection"/>
+                                <field name="country_id"/>
+                                <field name="birthday"/>
                             </group>
                             <group col="2" colspan="2">
-                            <separator string="Contact Information" colspan="2"/>
-                            <field name="address_home_id" colspan="2"/>
-                            <field name="partner_id" invisible="1" />
-                            <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
-                            <field name="work_phone"/>
-                            <field name="work_email" widget="email" />
-                            <field name="work_location"/>
+                                <separator string="Contact Information" colspan="2"/>
+                                <field name="address_home_id" colspan="2"/>
+                                <field name="partner_id" invisible="1" />
+                                <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
+                                <field name="work_phone"/>
+                                <field name="work_email" widget="email" />
+                                <field name="work_location"/>
                             </group>
                             <group col="2" colspan="2">
-                            <separator string="Position" colspan="2"/>
-                            <field name="job_id" domain="[('state','!=','old')]"/>
-                            <field name="coach_id" />
+                                <separator string="Position" colspan="2"/>
+                                <field name="job_id" domain="[('state','!=','old')]"/>
+                                <field name="coach_id" />
                             </group>
                         </page>
                         <page string="Categories">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 962b613158b..e2dd9b99122 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -221,7 +221,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="identification_id" position="after">
+                <field name="passport_id" position="replace">
                     <field name="passport_id"/>
                 </field>
             </field>

From e74b9a6f3156d6a8b77be9a8968b4617500179cc Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 13:08:32 +0530
Subject: [PATCH 383/632] [FIX]: fix a problem of type in the demo data

bzr revid: mga@tinyerp.com-20101007073832-colu8w7g4fik545b
---
 addons/hr_payroll/hr_payroll_demo.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index c2ec64e9041..dd85444d487 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -15,6 +15,7 @@
             <field eval="5" name="sequence"/>
             <field eval="0.4" name="amount"/>
             <field name="code">HRA</field>
+            <field name="type">allowance</field>
             <field name="category_id" ref="hr_payroll.HRA"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">House Rant Allowance</field>
@@ -26,6 +27,7 @@
             <field eval="10" name="sequence"/>
             <field eval="800.0" name="amount"/>
             <field name="code">CA</field>
+            <field name="type">allowance</field>
             <field name="category_id" ref="hr_payroll.CA"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Convance Allowance</field>
@@ -37,6 +39,7 @@
             <field eval="15" name="sequence"/>
             <field eval="200.0" name="amount"/>
             <field name="code">PT</field>
+            <field name="type">deduction</field>
             <field name="category_id" ref="hr_payroll.PT"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Professional Tax</field>
@@ -48,6 +51,7 @@
             <field eval="20" name="sequence"/>
             <field eval="0.125" name="amount"/>
             <field name="code">PF</field>
+            <field name="type">deduction</field>
             <field name="category_id" ref="hr_payroll.PF"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
             <field name="name">Provident Fund</field>

From 393ae5bfcd13ceab08b352b516f91083035dfe35 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 14:18:38 +0530
Subject: [PATCH 384/632] [IMP] hr_contract, hr_timesheet_sheet : improvements

bzr revid: vir@tinyerp.com-20101007084838-z09rntox0nrecgih
---
 addons/hr_contract/hr_contract_view.xml               | 11 ++++++-----
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index ede2c11c5bb..bfcd9ff8b76 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -146,6 +146,9 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
+                   <filter string="Current" icon="terp-check" name="current"  domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]"                       context="{'group_by':'date_end'}" help="Contracts in progress"/> 
+                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]"                          context="{'group_by':'date_end'}" help="Contracts whose end date already passed"/>   
+                   <separator orientation="vertical"/>                  
                    <field name="name"/>
                    <field name="employee_id"/>
                    <field name="working_hours"/>
@@ -154,11 +157,9 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
-                    <filter string="Current" icon="terp-stock_symbol-selection" name="current"
-                            domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]" 
-                            context="{'group_by':'date_end'}"/>                    
+                   <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                   <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 231aba040e7..a000737fba6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -67,19 +67,19 @@
                                 <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
 
-                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance">
+                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1">
                                 <tree string="Attendances" editable="bottom">
                                     <field name="name"/>
                                     <field name="action"/>
                                     <field invisible="1" name="employee_id"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="1" groups="base.group_hr_attendance">
+                            <group col="1" colspan="1">
                                 <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                             </group>
-                            <field name="state_attendance" groups="base.group_hr_attendance"/>
-                            <field name="total_attendance_day" widget="float_time" groups="base.group_hr_attendance"/>
+                            <field name="state_attendance"/>
+                            <field name="total_attendance_day" widget="float_time"/>
                             <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet">
                                     <field invisible="1" name="date"/>

From 1a0f5847792d711b2989fdd5fa64b8352515a6d9 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 7 Oct 2010 14:19:05 +0530
Subject: [PATCH 385/632] [FIX] fields_get() of Property corrected

bzr revid: jvo@tinyerp.com-20101007084905-k661pw6phxn3kqpt
---
 bin/addons/base/res/ir_property.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py
index 27536ff80f5..43451f824a1 100644
--- a/bin/addons/base/res/ir_property.py
+++ b/bin/addons/base/res/ir_property.py
@@ -37,7 +37,7 @@ class ir_property(osv.osv):
         res = set()
         for o in obj.browse(cr, uid, ids, context=context):
             res.add(get(o))
-        return res
+        return list(res)
 
     def _models_get(self, cr, uid, context=None):
         return self._models_field_get(cr, uid, 'model', 'model_id.name', context)

From 4caffbf3b398d2005605612db617c3dbd890b8dd Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 14:26:41 +0530
Subject: [PATCH 386/632] [MOD] hr_recruitment : set widget=selection in degree
 field

bzr revid: vir@tinyerp.com-20101007085641-wexufdny3nql1ka3
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3da942873b6..edd3bd77599 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -114,7 +114,7 @@
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Qualification"/>
                             <!-- <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>-->
-                            <field name="type_id"/>
+                            <field name="type_id" widget="selection"/>
                             <field name="priority" string="Appreciation"/>
                             <field name="reference"/>
                         </group>

From a431d9c3d80b56ce68480e6c82b6e09710687d56 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 7 Oct 2010 14:29:17 +0530
Subject: [PATCH 387/632] [IMP] stock: set groups in menuitems

bzr revid: sbh@tinyerp.com-20101007085917-gw8835467p3uwgbx
---
 addons/stock/stock_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 93925e6a9da..d4e9cbc5dc0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -212,7 +212,7 @@
         </record>
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
-            groups="base.group_extended"
+            groups="base.group_extended,group_stock_user"
             parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
@@ -369,7 +369,7 @@
             <field name="search_view_id" ref="search_product_lot_filter" />
             <field name="context">{'full':'1',"search_default_available":1}</field>
         </record>
-        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="group_stock_user,group_stock_manager,base.group_extended"/>
 
         #
         # Lot composition (history)
@@ -529,7 +529,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_location_tree"/>
         </record>
-        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended" sequence="20"/>
+        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended,group_stock_manager" sequence="20"/>
 
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>

From c6ec288b6133479dabf6fc01354945469833f0d7 Mon Sep 17 00:00:00 2001
From: "vda (Open ERP)" <vda@tinyerp.com>
Date: Thu, 7 Oct 2010 14:33:34 +0530
Subject: [PATCH 388/632] [FIX] Fix parent view and scrollabe widget.

bzr revid: vda@tinyerp.com-20101007090334-jy9q574yo1gxg5ir
---
 bin/addons/base/res/res_widget_data.xml | 2 +-
 bin/addons/base/res/res_widget_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_widget_data.xml b/bin/addons/base/res/res_widget_data.xml
index 4ee85646b04..b0648b9ce32 100644
--- a/bin/addons/base/res/res_widget_data.xml
+++ b/bin/addons/base/res/res_widget_data.xml
@@ -27,7 +27,7 @@ new TWTR.Widget({
     }
   },
   features: {
-    scrollbar: false,
+    scrollbar: true,
     loop: false,
     live: true,
     hashtags: true,
diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 69c801e14a7..7164c504993 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -45,7 +45,7 @@
         <menuitem
             action="res_widget_act_window"
             id="menu_res_widget_act_window"
-            parent="base.menu_users"
+            parent="base.next_id_2"
             />
     </data>
 </openerp>

From 6f121f968dd33207c1ccaa2a44a6e1e586d6f95a Mon Sep 17 00:00:00 2001
From: "JMA(OpenERP)" <>
Date: Thu, 7 Oct 2010 14:33:42 +0530
Subject: [PATCH 389/632] Account : Corrected the rounding of base of
 account.invoice.tax

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

bzr revid: jvo@tinyerp.com-20101007090342-tltei8skbhp7101u
---
 addons/account/invoice.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 777955d5a8e..2e81c7b054f 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1622,6 +1622,7 @@ class account_invoice_tax(osv.osv):
                     tax_grouped[key]['tax_amount'] += val['tax_amount']
 
         for t in tax_grouped.values():
+            t['base'] = cur_obj.round(cr, uid, cur, t['base'])
             t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
             t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
             t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])

From 1a2015de2ccc4f2e5342b31bb220befc78b1476e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 14:49:00 +0530
Subject: [PATCH 390/632] [IMP]: improvement to view, add links to employee for
 payslip [ADD]: add demo data for the contract

bzr revid: mga@tinyerp.com-20101007091900-tglpl048qpffnle8
---
 addons/hr_payroll/hr_payroll.py       |  1 +
 addons/hr_payroll/hr_payroll_data.xml |  7 +++++++
 addons/hr_payroll/hr_payroll_view.xml | 28 ++++++++++-----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index b5a7e08a501..83ec05ea554 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1230,6 +1230,7 @@ class hr_employee(osv.osv):
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
+        'otherid': fields.char('Other Id', size=64)
     }
 hr_employee()
 
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index db6797f85fb..4f6012fd328 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -126,5 +126,12 @@
             <field name="name">Other Taxable Allowance</field>
             <field name="sequence" eval="90"/>
         </record>
+        
+        <!-- Contract Wage Types -->
+        <record id="hr_contract_monthly_basic" model="hr.contract.wage.type">
+            <field name="name">Monthly Basic Wage</field>
+            <field name="type">gross</field>
+            <field name="period_id" ref="hr_contract.hr_contract_wage_type_period_monthly"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e2dd9b99122..21284aa78d7 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -192,24 +192,6 @@
                             </tree>
                         </field>
                     </page>
-                    <page string="Salary Slips" groups="base.group_extended">
-                        <field name="slip_ids" colspan="4" nolabel="1" readonly="True">
-                            <tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
-                                <field name="number"/>
-                                <field name="name"/>
-                                <field name="date"/>
-                                <field name="register_id"/>
-                                <field name="basic"/>
-                                <field name="allounce"/>
-                                <field name="grows"/>
-                                <field name="deduction"/>
-                                <field name="net"/>
-                                <field name="total_pay" sum="Total Salary Paid"/>
-                                <field name="state"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            </tree>
-                        </field>
-                    </page>
                 </xpath>
             </data>
             </field>
@@ -223,9 +205,11 @@
             <field name="arch" type="xml">
                 <field name="passport_id" position="replace">
                     <field name="passport_id"/>
+                    <field name="otherid"/>
                 </field>
             </field>
         </record>
+        
         <!-- End Employee View -->
         
         <!-- Contract View -->
@@ -987,6 +971,14 @@
                 </form>
             </field>
         </record>
+        
+        <!--  Shortcuts -->
+        <act_window name="Payslips"
+            domain="[('employee_id', '=', active_id)]"
+            res_model="hr.payslip"
+            src_model="hr.employee"
+            view_id ="eval('view_hr_payslip_tree')"
+            id="act_hr_employee_payslip_list"/>
     </data>
 </openerp>
 

From 5221166ec6f8a0d30d7ffa1b972a532f5ea221d7 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 7 Oct 2010 14:51:26 +0530
Subject: [PATCH 391/632] [REF]

bzr revid: psi@tinyerp.co.in-20101007092126-jx1cziwgc5av2flb
---
 addons/account/account.py       | 2 +-
 addons/account/account_view.xml | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index eeb220e8a00..75eca7e78de 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2340,7 +2340,7 @@ class account_tax_code_template(osv.osv):
         'info': fields.text('Description'),
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
-        'sign': fields.float('Sign for parent', required=True),
+        'sign': fields.float('Sign For Parent', required=True),
         'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
     }
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bd07994bf29..e7e1c055c32 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -820,13 +820,10 @@
             <field name="arch" type="xml">
                 <search string="Search Taxes">
                     <group col="10" colspan="4">
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="description"/>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By...">
-                    </group>
                 </search>
             </field>
         </record>

From f9f0865239ae78c807644369d6d3bc8713adba6b Mon Sep 17 00:00:00 2001
From: "Vianney - www.akretion.com.br" <>
Date: Thu, 7 Oct 2010 14:53:15 +0530
Subject: [PATCH 392/632] [FIX] Account_analytic_default : added missing menu

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

bzr revid: jvo@tinyerp.com-20101007092315-q3us1zdrv2q07k8i
---
 .../account_analytic_default_view.xml                 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 95a39eb11e6..939d8474250 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -53,14 +53,14 @@
             </field>
         </record>
 
-        <record id="action_analytic_default_form" model="ir.actions.act_window">
+        <record id="action_analytic_default_list" model="ir.actions.act_window">
             <field name="name">Analytic Defaults</field>
             <field name="res_model">account.analytic.default</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
         </record>
-
+		
         <act_window
             name="Entries"
             id="act_account_acount_move_line_open"
@@ -68,7 +68,12 @@
             src_model="account.account"
             context="{'search_default_account_id': [active_id]}"
             />
-            
+		
+        <menuitem
+            action="action_analytic_default_list"
+            id="menu_analytic_default_list"
+            parent="account.menu_analytic_accounting"/>
+
 
         <act_window
             name="Analytic Rules"

From 06448a700d72583633f3ccb5a2ad83966d94ab61 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 7 Oct 2010 14:58:46 +0530
Subject: [PATCH 393/632] [REF] account: change in string

bzr revid: psi@tinyerp.co.in-20101007092846-8bfsh7bdz246v3mz
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 75eca7e78de..6271d97500b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2231,7 +2231,7 @@ class account_account_template(osv.osv):
             ('view','View'),
             ('consolidation','Consolidation'),
             ('liquidity','Liquidity'),
-            ('other','Others'),
+            ('other','Regular'),
             ('closed','Closed'),
             ], 'Internal Type', required=True,help="This type is used to differentiate types with "\
             "special effects in OpenERP: view can not have entries, consolidation are accounts that "\

From 4572cbebba113684e3c15ab274136a643a0a5855 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 15:05:09 +0530
Subject: [PATCH 394/632] [MOD] hr_recruitment,hr : changes in code and added
 state field in group by of search view of job position

bzr revid: vir@tinyerp.com-20101007093509-d2qh2t2tivr7qngl
---
 addons/hr/hr_view.xml                   | 1 +
 addons/hr_recruitment/hr_recruitment.py | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 929afbe3d84..acfa17b6993 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -383,6 +383,7 @@
                     <newline />
                     <group expand="0" string="Group By...">
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e589a81bde7..a8f3af8b20b 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -436,11 +436,11 @@ class hr_applicant(crm.crm_case, osv.osv):
         if applicant.job_id :
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            if job_data.expected_employees == int(job_data.no_of_employee):
+            total_expected_emp = job_data['expected_employees']
+            expected_emp = job_data['expected_employees'] - 1
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+            if total_expected_emp == int(job_data.no_of_employee):
                 job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
-#            expected_emp = job_data['expected_employees'] - 1
-#            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
-
         return res
 
     def case_reset(self, cr, uid, ids, *args):

From 9161b4c4c70ee3696770fb80d9fd06e15f823dbf Mon Sep 17 00:00:00 2001
From: "Vianney - www.akretion.com.br" <>
Date: Thu, 7 Oct 2010 15:05:32 +0530
Subject: [PATCH 395/632] [FIX] Account_analytic_default : Corrected salesman
 selection at invoice line creation

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

bzr revid: jvo@tinyerp.com-20101007093532-vacgy037cqlis1od
---
 addons/account_analytic_default/account_analytic_default.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index d0405e1ff52..dce86597a4c 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -111,8 +111,9 @@ class sale_order_line(osv.osv):
         sale_line = self.browse(cr, uid, ids[0], context)
         inv_line_obj = self.pool.get('account.invoice.line')
         anal_def_obj = self.pool.get('account.analytic.default')
+
         for line in inv_line_obj.browse(cr, uid, create_ids, context):
-            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
+            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, sale_line.order_id.user_id.id, time.strftime('%Y-%m-%d'), context)
 
             if rec:
                 inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)

From 70234174b7974508da3d832acc66fce4c6002b72 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 7 Oct 2010 15:06:00 +0530
Subject: [PATCH 396/632] [REF]

bzr revid: psi@tinyerp.co.in-20101007093600-rm9mympll5ujcwac
---
 addons/membership/membership.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 2ae25eae13d..f6a4592cab2 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
+import time
+
 from osv import fields, osv
 from tools import config
-import time
-from tools.translate import _
 import decimal_precision as dp
-
+from tools.translate import _
 
 STATE = [
     ('none', 'Non Member'),

From 18e684f9240ff0be8d0e104ea01741fd7ec51692 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 15:09:14 +0530
Subject: [PATCH 397/632] improved

bzr revid: apa@tinyerp.com-20101007093914-xkvx66xyl5m89tou
---
 addons/survey/report/survey_analysis_report.py | 3 +--
 addons/survey/report/survey_browse_response.py | 2 --
 addons/survey/report/survey_form.py            | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 4aa4b099c57..0d866368bf2 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -29,7 +29,6 @@ from report import report_sxw
 
 class survey_analysis(report_rml):
     def create(self, cr, uid, ids, datas, context):
-
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
         user_obj = pooler.get_pool(cr.dbname).get('res.users')
         rml_obj=report_sxw.rml_parse(cr, uid, surv_obj._name,context)
@@ -423,7 +422,7 @@ class survey_analysis(report_rml):
         rml += """</document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        self.pageCount=True
+        self.internal_header=True
         pdf = create_doc(rml, title=self.title)
 
         return (pdf, report_type)
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index d024e410d0e..2cdb98622a9 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -520,9 +520,7 @@ class survey_browse_response(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
-
         return (pdf, report_type)
 
 survey_browse_response('report.survey.browse.response', 'survey','','')
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 5836be2d399..1a623db4211 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -389,7 +389,6 @@ class survey_form(report_rml):
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        self.pageCount=False
         pdf = create_doc(rml, title=self.title)
         return (pdf, report_type)
 

From 92c78d14e68b6e5dcfa6e72a4f4a162ae008cacb Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 15:17:29 +0530
Subject: [PATCH 398/632] [MOD/IMP] hr_* :
 hr,hr_attendance,hr_contract,hr_expence,hr_timesheet,hr_timesheet_invoice,hr_timesheet_sheet
 Usability improvement in access rights

bzr revid: amp@tinyerp.com-20101007094729-1sdtsxube9ti5lw2
---
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         |  6 ++---
 .../security/ir.model.access.csv              |  2 +-
 .../hr_contract/security/ir.model.access.csv  |  4 ---
 .../board_hr_expense_manager_view.xml         |  2 +-
 .../hr_timesheet/security/ir.model.access.csv | 20 +++++---------
 .../hr_timesheet/test/test_hr_timesheet.yml   |  1 -
 .../security/ir.model.access.csv              | 26 ++++++++-----------
 .../hr_timesheet_sheet_view.xml               |  8 +++---
 .../security/ir.model.access.csv              |  9 +------
 10 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 3e02c3e539c..b64f7ca0413 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -67,7 +67,7 @@
             <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" groups="base.group_user"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" />
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index acfa17b6993..b3fda124052 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
@@ -151,7 +151,7 @@
             <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <!--
         =======================
@@ -284,7 +284,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended,base.group_user"/>
+            parent="menu_view_employee_category_configuration_form" sequence="1" groups="base.group_extended"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index a934f859c4f..4b686dcb1b2 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
-"access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 51d833d8607..36456284856 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -2,10 +2,6 @@
 "access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
 "access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
 "access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
-"access_hr_employee_contract_manager","hr.employee.contract.manager","hr.model_hr_employee","base.group_hr_manager",1,1,1,1
-"access_hr_employee_category_manager","hr.employee.category.manager","hr.model_hr_employee_category","base.group_hr_manager",1,1,1,1
 "access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
-"access_hr_job_manager","hr.job manager","hr.model_hr_job","base.group_hr_manager",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","hr.model_hr_department","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index d5c761f7b68..d86c7614d7f 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -26,7 +26,7 @@
             icon="terp-graph"
             id="base.menu_hr_manager"
             parent="base.menu_hr_dasboard"
-            groups = "base.group_hr_user"
+            groups = "base.group_hr_manager"
             sequence="5"/>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 2b01017fb65..40ac84200ef 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,16 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,0
-"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,0,0,0
-"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,0,0,0
-"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,0,0,0
-"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
-"access_hr_analytic_timesheet_manager","hr.analytic.timesheet.manager","model_hr_analytic_timesheet","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","model_hr_analytic_timesheet","base.group_system",1,0,0,0
-"access_hr_account_analytic_line_manager","account.account.analytic.line.manager","account.model_account_analytic_line","base.group_hr_manager",1,1,1,1
-"access_account_analytic_journal_manager","account.account.analytic.journal.manager","account.model_account_analytic_journal","base.group_hr_manager",1,1,1,1
-"access_product_product_manager","product.product.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
-"access_product_template_hr_timesheet_manager","product.template.hr.timesheet.manager","product.model_product_template","base.group_hr_manager",1,1,1,1
-"access_product_uom_hr_timesheet_manager","product.uom.hr.timesheet.manager","product.model_product_uom","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_employee","hr.analytic.timesheet.employee","model_hr_analytic_timesheet","base.group_user",1,1,1,0
-"access_account_analytic_line_user","account.account.analytic.line.user","account.model_account_analytic_line","base.group_user",1,0,0,0
+"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
+"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,1,1,1
+"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
+"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1
+"access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index d962c627cdd..18d94edbed8 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -21,7 +21,6 @@
     context_lang: en_US
     groups_id:
       - base.group_hr_user
-      - base.group_hr_attendance
       - base.group_user
       - base.group_extended
       - base.group_hr_manager
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 2dd928fc924..c647fec62cf 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,20 +1,16 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,0,0,0
+"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
 "access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
 "access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
-"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,0,0,0
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,0,0,0
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,0,0,0
-"access_report_analytic_account_close_system","report.analytic.account.close system","model_report_analytic_account_close","base.group_system",1,1,1,1
-"access_report_account_analytic_line_to_invoice_system","report.account.analytic.line.to.invoice system","model_report_account_analytic_line_to_invoice","base.group_system",1,1,1,1
-"access_report_timesheet_line","report.timesheet.line","model_report_timesheet_line","base.group_hr_manager",1,0,0,0
-"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,0
-"access_account_fiscalyear_hr_user","account.fiscalyear.hr.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,0
-"access_account_invoice_hr_manager","account.invoice.hr.manager","account.model_account_invoice","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_invoice_factor_hr_manager","hr_timesheet_invoice.factor.hr.manager","model_hr_timesheet_invoice_factor","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
+"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,1,1,1
+"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,1,1,1
+"access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
+"access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
+"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
 "access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_user",1,1,1,0
+"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index a000737fba6..f646021253b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -115,9 +115,9 @@
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
+                                    <field name="total_attendance" widget="float_time"/>
                                     <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
+                                    <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
                             <group colspan="4" col="6">
@@ -303,9 +303,9 @@
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="department_id"/>
-                    <field name="total_attendance" groups="base.group_hr_attendance"/>
+                    <field name="total_attendance"/>
                     <field name="total_timesheet"/>
-                    <field name="total_difference" groups="base.group_hr_attendance"/>
+                    <field name="total_difference"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 116396612e8..79bc9263ec5 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -3,11 +3,4 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system","hr_timesheet_sheet.sheet.system","model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_employee","hr_timesheet_sheet.sheet.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_day_manager","hr_timesheet_sheet.sheet.day.manager","model_hr_timesheet_sheet_sheet_day","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_account_manager","hr_timesheet_sheet.sheet.account.manager","model_hr_timesheet_sheet_sheet_account","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_day_employee","hr_timesheet_sheet.sheet.day.employee","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
-"access_hr_timesheet_sheet_sheet_account_employee","hr_timesheet_sheet.sheet.account.employee","model_hr_timesheet_sheet_sheet_account","base.group_user",1,0,0,0
+"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1

From 18a984866273086caa18267cb645ea300c01a7c7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 15:21:27 +0530
Subject: [PATCH 399/632] improve code

bzr revid: apa@tinyerp.com-20101007095127-1bjuobow1bt1sjcd
---
 bin/report/interface.py               | 15 ++++++---------
 bin/report/render/rml2pdf/trml2pdf.py | 14 ++++----------
 bin/report/report_sxw.py              |  6 +++++-
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index 28197c7872d..703256d8fcd 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -70,7 +70,7 @@ class report_rml(report_int):
     def __init__(self, name, table, tmpl, xsl):
         super(report_rml, self).__init__(name)
         self.table = table
-        self.pageCount=True
+        self.internal_header=False
         self.tmpl = tmpl
         self.xsl = xsl
         self.bin_datas = {}
@@ -111,6 +111,7 @@ class report_rml(report_int):
         return self.post_process_xml_data(cr, uid, xml, context)
 
     def post_process_xml_data(self, cr, uid, xml, context=None):
+
         if not context:
             context={}
         # find the position of the 3rd tag
@@ -137,6 +138,8 @@ class report_rml(report_int):
     # TODO: The translation doesn't work for "<tag t="1">textext<tag> tex</tag>text</tag>"
     #
     def create_rml(self, cr, xml, uid, context=None):
+        if self.tmpl=='' and not self.internal_header:
+            self.internal_header=True
         if not context:
             context={}
         pool = pooler.get_pool(cr.dbname)
@@ -176,13 +179,8 @@ class report_rml(report_int):
 
     def create_pdf(self, rml, localcontext = None, logo=None, title=None):
         if not localcontext:
-            localcontext={}
-            if self.tmpl=='' and not self.pageCount:
-                self.pageCount=True
-            else:
-                self.pageCount=False
-            localcontext.update({'header':self.pageCount})
-
+           localcontext={}
+        localcontext.update({'internal_header':self.internal_header})
         if logo:
             self.bin_datas['logo'] = logo
         else:
@@ -190,7 +188,6 @@ class report_rml(report_int):
                 del self.bin_datas['logo']
         obj = render.rml(rml, localcontext, self.bin_datas, tools.config['root_path'],title)
         obj.render()
-        self.pageCount=True
         return obj.get()
 
     def create_html(self, rml, localcontext = None, logo=None, title=None):
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index b88bbbb0050..23dad749dcc 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -820,9 +820,7 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
 class _rml_template(object):
     def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
         if not localcontext:
-            localcontext={'header':'internal'}
-        if not localcontext.get('header',True):
-            localcontext.update({'header':'internal'})
+            localcontext={'internal_header':True}
         self.localcontext = localcontext
         self.images= images
         self.path = path
@@ -871,16 +869,12 @@ class _rml_template(object):
             fis += r.render(node_story)
             # Reset Page Number with new story tag
             fis.append(PageReset())
-            if self.localcontext and self.localcontext.get('header',False) and \
-               (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
-                self.doc_tmpl.afterFlowable(fis)
             story_cnt += 1
-        if self.localcontext:
-            fis.append(PageCount())
-        if self.localcontext and self.localcontext.get('header',False) and \
-           (self.localcontext['header']=='internal' or self.localcontext['header']=='internal landscape'):
+        if self.localcontext and self.localcontext.get('internal_header',False):
+            self.doc_tmpl.afterFlowable(fis)
             self.doc_tmpl.build(fis,canvasmaker=NumberedCanvas)
         else:
+            fis.append(PageCount())
             self.doc_tmpl.build(fis)
 
 def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index fdfcdd3b06a..ee23754bbfb 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -364,13 +364,17 @@ class report_sxw(report_rml, preprocess.report):
         self.parser = parser
         self.header = header
         self.store = store
+        self.internal_header=False
+        if header=='internal' or header=='internal landscape':
+            self.internal_header=True
 
     def getObjects(self, cr, uid, ids, context):
         table_obj = pooler.get_pool(cr.dbname).get(self.table)
         return table_obj.browse(cr, uid, ids, list_class=browse_record_list, context=context, fields_process=_fields_process)
 
     def create(self, cr, uid, ids, data, context=None):
-        context.update({'header':self.header})
+        if self.internal_header:
+            context.update({'internal_header':self.internal_header})
         pool = pooler.get_pool(cr.dbname)
         ir_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_obj.search(cr, uid,

From d480253a463f2b68ab3b6e0752073663dd1b71e7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 15:41:27 +0530
Subject: [PATCH 400/632] improve code

bzr revid: apa@tinyerp.com-20101007101127-bpk7wfsxrz2q649q
---
 bin/report/render/rml2pdf/trml2pdf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 23dad749dcc..c37aff7aab7 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -860,6 +860,8 @@ class _rml_template(object):
         self.doc_tmpl.addPageTemplates(self.page_templates)
 
     def render(self, node_stories):
+        if self.localcontext and not self.localcontext.get('internal_header',False):
+            del self.localcontext['internal_header']
         fis = []
         r = _rml_flowable(self.doc,self.localcontext, images=self.images, path=self.path, title=self.title)
         story_cnt = 0

From 4e8e0fd5bf3055841093c431b6f7e78b18d04673 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 15:51:26 +0530
Subject: [PATCH 401/632] [MOD] hr_recuritment : small change in method

bzr revid: vir@tinyerp.com-20101007102126-17ylxz3fqaqnxmfc
---
 addons/hr_recruitment/hr_recruitment.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index a8f3af8b20b..fc12f744411 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -436,11 +436,10 @@ class hr_applicant(crm.crm_case, osv.osv):
         if applicant.job_id :
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
-            total_expected_emp = job_data['expected_employees']
             expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
-            if total_expected_emp == int(job_data.no_of_employee):
+            if expected_emp == 0:
                 job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
         return res
 
     def case_reset(self, cr, uid, ids, *args):

From 573899d7b2230f1edb669b24c78508e283bcbdad Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 7 Oct 2010 15:52:55 +0530
Subject: [PATCH 402/632] [IMP] mrp: Keep widget=selection in tree view also if
 its on form view to avoid parsing problems.

bzr revid: uco@tinyerp.com-20101007102255-crmfv63czf1wbwa8
---
 addons/mrp/mrp_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 0129efa5989..fc9da248396 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -604,8 +604,8 @@
                                 <tree colors="blue:state in ('draft');black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="UOM"/>
-                                    <field name="location_id"  string="Source Loc."/>
+                                    <field name="product_uom"  string="UOM" widget="selection"/>
+                                    <field name="location_id"  string="Source Loc." widget="selection"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_consume)d"
                                         string="Consume Products" type="action"
@@ -623,8 +623,8 @@
                                    <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="UOM"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
+                                       <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
+                                       <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                        <field name="prodlot_id" />
                                        <field name="state" invisible="1"/>
                                        <field name="scrapped" invisible="1"/>
@@ -658,8 +658,8 @@
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
                                     <field name="product_qty"  string="Qty"/>
-                                    <field name="product_uom"  string="UOM"/>
-                                    <field name="location_id"  string="Source Loc."/>
+                                    <field name="product_uom"  string="UOM" widget="selection"/>
+                                    <field name="location_id"  string="Source Loc." widget="selection"/>
                                     <field name="state" invisible="1"/>
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
@@ -673,8 +673,8 @@
                                    <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
-                                       <field name="product_uom" readonly="1" string="UOM"/>
-                                       <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
+                                       <field name="product_uom" readonly="1" string="UOM" widget="selection"/>
+                                       <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection"/>
                                        <field name="prodlot_id" />
                                        <field name="scrapped" invisible="1"/>
                                        <button name="%(stock.track_line)d"

From 14bf9558493d1d7306d65b0b86f8c53dd7396a4d Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 7 Oct 2010 15:58:05 +0530
Subject: [PATCH 403/632] [IMP] Improve membership view

bzr revid: ara@tinyerp.com-20101007102805-kr8ub9pwyi5y78zn
---
 addons/membership/membership_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 60b798271b5..9d7ac65d764 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -221,7 +221,7 @@
                         <group colspan="2" col="2">
                             <group colspan="4" col="3">
                             <field name="free_member"/>
-                            <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" icon="gtk-apply"/>
+                            <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
                             <field colspan="4" name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')], 'readonly':[('free_member','=',True)]}"/>
                             <field colspan="4" name="membership_state"/>
                             </group>

From 2518e003c1989a459841d532f93361e6959ce974 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 16:04:33 +0530
Subject: [PATCH 404/632] [IMP] event: Confirmation of event wizard improved

bzr revid: mra@mra-laptop-20101007103433-mln3ch6hswx6ktwn
---
 addons/event/wizard/event_confirm.py       | 16 +++-------------
 addons/event/wizard/event_confirm_view.xml |  4 ++--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
index 563a0dc45a0..bef184d2b22 100644
--- a/addons/event/wizard/event_confirm.py
+++ b/addons/event/wizard/event_confirm.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
 
 class event_confirm(osv.osv_memory):
     """
@@ -29,19 +28,10 @@ class event_confirm(osv.osv_memory):
     _name = "event.confirm"
     _description = "Event Confirmation"
 
-    _columns = {
-        'msg': fields.text('Message', readonly=True),
-    }
-    _defaults = {
-        'msg': _('Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?')
-    }
-
-    def confirm(self, cr, uid, ids, context):
-        event_pool = self.pool.get('event.event')
-        event_ids = context.get('event_ids', [])
-        event_pool.do_confirm(cr, uid, event_ids, context=context)
+    def confirm(self, cr, uid, ids, context=None):
+        self.pool.get('event.event').do_confirm(cr, uid, context.get('event_ids', []), context=context)
         return {}
 
 event_confirm()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index fa3e8e73ef2..2fe8682540a 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Event Confirmation">
-                    <field name="msg" nolabel="1" colspan="4"/>
+              		<label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="6">
                         <button  icon="gtk-close" special="cancel" string="Close"/>
@@ -30,4 +30,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

From fe3f925902d25cd27a0bfde67dbfc4c0a0ca61ed Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Thu, 7 Oct 2010 16:36:33 +0530
Subject: [PATCH 405/632] [IMP]change the table header in delivery report

bzr revid: azaz.201186@gmail.com-20101007110633-rc0idf2j69ja66xt
---
 addons/delivery/report/shipping.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 2c7107c2386..a4ed29bc643 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -179,7 +179,7 @@
     <blockTable colWidths="370.0,85.0,82.0" repeatRows="1" style="Table3">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Designation</para>
+          <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Lot</para>
@@ -215,4 +215,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From 480ea8452ffbf96720b6543bf558ec9bd44d21e1 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 16:36:40 +0530
Subject: [PATCH 406/632] [MOD/IMP] hr_* : hr_evaluation,hr_recruitment
 Usability improvement in access rights

bzr revid: amp@tinyerp.com-20101007110640-us0sp7ib1uaw6akm
---
 addons/hr_evaluation/hr_evaluation_view.xml     |  2 +-
 .../hr_evaluation/security/ir.model.access.csv  | 17 ++---------------
 .../hr_recruitment/security/ir.model.access.csv |  9 ++++-----
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 02f551a28b8..e4ccb11ce4e 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
         </record>
 
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_system"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 7c57d67d1cd..fba2a5f2202 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,21 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation.manager","model_hr_evaluation_evaluation","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_manager","hr_evaluation.plan.manager","model_hr_evaluation_plan","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase.manager","model_hr_evaluation_plan_phase","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
 "access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_manager","hr.evaluation.interview.manager","model_hr_evaluation_interview","base.group_hr_manager",1,1,1,1
 "access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_plan","base.group_system",1,1,1,1
-"access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1
-"access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0
-"access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0
-"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
-"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,0,0,0
-"access_hr_evaluation_user","hr_evaluation.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_employee","hr_evaluation.employee","model_hr_evaluation_plan","base.group_user",1,0,0,0
 "access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
@@ -28,7 +16,6 @@
 "access_survey_tbl_column_heading_hr_manager","survey.tbl.column.heading","survey.model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
 "access_survey_response_answer_hr_manager","survey.response.answer","survey.model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_request_hr_manager","survey.request","survey.model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
 "access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
 "access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
 "access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 92dc912180d..5e343a40fa0 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -3,8 +3,7 @@
 "access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
 "access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
 "access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_stage_system","hr.recruitment.stage.system","model_hr_recruitment_stage","base.group_system",1,1,1,1
-"access_hr_applicant_manager","hr.applicant.manager","model_hr_applicant","base.group_hr_manager",1,1,1,1
-"access_hr_applicant_system","hr.applicant.system","model_hr_applicant","base.group_system",1,0,0,0
-"access_hr_recruitment_stage_manager","hr.recruitment.stage.manager","model_hr_recruitment_stage","base.group_hr_manager",1,1,1,1
-"access_hr_recruitment_degree_manager","hr.recruitment.degree.manager","model_hr_recruitment_degree","base.group_hr_manager",1,1,1,1
+"access_mailgate_message_user","mailgate.message.user","mail_gateway.model_mailgate_message","base.group_hr_user",1,1,1,1
+"access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
+"access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
+"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0

From b960301eef703ccaa0e0cbf06532acdf52fdf8c3 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 16:39:56 +0530
Subject: [PATCH 407/632] [MOD] hr_recuritment : small change in reset method

bzr revid: vir@tinyerp.com-20101007110956-7y0bbuwlt3uhpnok
---
 addons/hr_recruitment/hr_recruitment.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index fc12f744411..3dbcd946e87 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -450,8 +450,18 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
+        applicant = self.browse(cr, uid, ids)[0]
+        if applicant.job_id :
+            job_obj = self.pool.get('hr.job')
+            emp_obj = self.pool.get('hr.employee')
+            job_data = job_obj.browse(cr,uid, applicant.job_id.id)
+            expected_emp = job_data['expected_employees'] + 1
+            emp_id = emp_obj.search(cr,uid, [('job_id','=',applicant.job_id.id),('name','=',applicant.name)])
+            emp_obj.unlink(cr, uid, emp_id)
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
         res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': False, 'date_closed':False})
+        
         return res
 
 

From 463d928a0e098afd326eb695c26c8f1e2d65865b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 17:45:23 +0530
Subject: [PATCH 408/632] [FIX] event: confirm and unconfirm number of
 registration did not get updated correctly

bzr revid: mra@mra-laptop-20101007121523-08jwovzy1us4tx6j
---
 addons/event/event.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 63093099eea..736f846b5c9 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -156,11 +156,12 @@ class event_event(osv.osv):
                         ('event_id', '=', event.id),
                        ('state', 'in', state)])
 
+            cr.execute('select sum(nb_register) from event_registration where id IN %s', (tuple(reg_ids),))
+            number = cr.fetchone()
             if 'register_current' in fields:
-                res[event.id]['register_current'] = len(reg_ids)
+                res[event.id]['register_current'] = number and number[0] or 0.0
             if 'register_prospect' in fields:
-                res[event.id]['register_prospect'] = len(reg_ids)
-
+                res[event.id]['register_prospect'] = number and number[0] or 0.0
         return res
 
     def write(self, cr, uid, ids, vals, context=None):

From 39655a3578b18c3aac36322c556e4b06d5203a00 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 17:58:54 +0530
Subject: [PATCH 409/632] [FIX]

bzr revid: mra@mra-laptop-20101007122854-66q3oez9z3r41qby
---
 addons/event/event.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 736f846b5c9..6b530d725df 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -156,12 +156,14 @@ class event_event(osv.osv):
                         ('event_id', '=', event.id),
                        ('state', 'in', state)])
 
-            cr.execute('select sum(nb_register) from event_registration where id IN %s', (tuple(reg_ids),))
-            number = cr.fetchone()
+            number = 0.0
+            if reg_ids:
+                cr.execute('select sum(nb_register) from event_registration where id IN %s', (tuple(reg_ids),))
+                number = cr.fetchone()
             if 'register_current' in fields:
-                res[event.id]['register_current'] = number and number[0] or 0.0
+                res[event.id]['register_current'] = number and number[0]
             if 'register_prospect' in fields:
-                res[event.id]['register_prospect'] = number and number[0] or 0.0
+                res[event.id]['register_prospect'] = number and number[0]
         return res
 
     def write(self, cr, uid, ids, vals, context=None):

From 6ddcd366fd63b1e8b7d9991aaffd57bae6253986 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 7 Oct 2010 18:02:03 +0530
Subject: [PATCH 410/632] [FIX] Fix a group by problem in membership product

bzr revid: ara@tinyerp.com-20101007123203-604lzki22yggi630
---
 addons/membership/membership_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 9d7ac65d764..29b0cacb3e2 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -19,6 +19,9 @@
                     <field name="membership_date_from"/>
                     <field name="membership_date_to"/>
                     <field name="list_price" string="Membership Fee"/>
+                    <field name="categ_id" invisible="1"/>
+                    <field name="uom_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
                 </tree>
             </field>
         </record>

From 948437d0869b18a7beebb619ce1a907aba9615fc Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 7 Oct 2010 18:09:29 +0530
Subject: [PATCH 411/632] [IMP][FIX] account_coda, l10n_ch: fixed the account
 voucher creation from statement and improve the code.

bzr revid: vra@tinyerp.com-20101007123929-dudaibz8fvnmqgd5
---
 .../wizard/account_coda_import.py             | 55 ++++++------
 addons/l10n_ch/wizard/bvr_import.py           | 88 +++++++++----------
 2 files changed, 74 insertions(+), 69 deletions(-)

diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index a577e47be74..badd7ca77c6 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -206,42 +206,47 @@ class account_coda_import(osv.osv_memory):
                 lines = statement.get('bank_statement_line',False)
                 if lines:
                     for value in lines:
+                        journal = journal_obj.browse(cr, uid, statement['journal_id'], context=context)
                         line = lines[value]
+                        if not line['partner_id']:
+                            line['partner_id'] = journal.company_id.partner_id.id
                         voucher_id = False
+                        rec_id = False
                         if line.get('toreconcile',False): # Fix me
                             name = line['name'][:3] + '/' + line['name'][3:7] + '/' + line['name'][7:]
                             rec_id = self.pool.get('account.move.line').search(cr, uid, [('name', '=', name), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
                             if rec_id:
+                                result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line['partner_id'], journal_id=statement['journal_id'], price=abs(line['amount']), currency_id = journal.company_id.currency_id.id, ttype=(line['amount'] < 0 and 'payment' or 'receipt'), context=context)
                                 voucher_res = { 'type':(line['amount'] < 0 and 'payment' or 'receipt') ,
                                 'name': line['name'],#line.name,
                                 'partner_id': line['partner_id'] ,#line.partner_id.id,
                                 'journal_id': statement['journal_id'], #statement.journal_id.id,
-                                'account_id': line['account_id'],#line.account_id.id,
-                                'company_id': statement['company_id'],#statement.company_id.id,
-                                'currency_id': statement['currency'],#statement.currency.id,
+                                'account_id': result.get('account_id', journal.default_credit_account_id.id),#line.account_id.id,
+                                'company_id': journal.company_id.id,#statement.company_id.id,
+                                'currency_id': journal.company_id.currency_id.id,#statement.currency.id,
                                 'date': line['date'], #line.date,
                                 'amount':abs(line['amount']),
                                 'period_id':statement.get('period_id',False) or period,# statement.period_id.id
                                 }
                                 voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
                                 context.update({'move_line_ids': rec_id})
-                                result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), context=context)
+                                
                                 voucher_line_dict =  False
                                 if result['value']['line_ids']:
                                     for line_dict in result['value']['line_ids']:
                                         move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
                                         if line.move_id.id == move_line.move_id.id:
                                             voucher_line_dict = line_dict
-
+        
                                 if voucher_line_dict:
                                     voucher_line_dict.update({'voucher_id':voucher_id})
                                     voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
-
-    #                            reconcile_id = statement_reconcile_obj.create(cr, uid, {
-    #                                'line_ids': [(6, 0, rec_id)]
-    #                                }, context=context)
-    #
-
+        
+        #                            reconcile_id = statement_reconcile_obj.create(cr, uid, {
+        #                                'line_ids': [(6, 0, rec_id)]
+        #                                }, context=context)
+        #
+        
                                 mv = self.pool.get('account.move.line').browse(cr, uid, rec_id[0], context=context)
                                 if mv.partner_id:
                                     line['partner_id'] = mv.partner_id.id
@@ -249,20 +254,20 @@ class account_coda_import(osv.osv_memory):
                                         line['account_id'] = mv.partner_id.property_account_payable.id
                                     else :
                                         line['account_id'] = mv.partner_id.property_account_receivable.id
-                    str_not1 = ''
-                    if line.has_key('contry_name') and line.has_key('cntry_number'):
-                        str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"], line["cntry_number"], line["free_comm"]+line['extra_note'], line["val_date"][0], line["entry_date"][0])
-                    id = bank_statement_line_obj.create(cr, uid, {
-                               'name':line['name'],
-                               'date': line['date'],
-                               'amount': line['amount'],
-                               'partner_id':line['partner_id'] or 0,
-                               'account_id':line['account_id'],
-                               'statement_id': bk_st_id,
-                               'voucher_id': voucher_id,
-                               'note':str_not1,
-                               'ref':line['ref'],
-                               })
+                        str_not1 = ''
+                        if line.has_key('contry_name') and line.has_key('cntry_number'):
+                            str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"], line["cntry_number"], line["free_comm"]+line['extra_note'], line["val_date"][0], line["entry_date"][0])
+                        id = bank_statement_line_obj.create(cr, uid, {
+                                   'name':line['name'],
+                                   'date': line['date'],
+                                   'amount': line['amount'],
+                                   'partner_id':line['partner_id'],
+                                   'account_id':line['account_id'],
+                                   'statement_id': bk_st_id,
+                                   'voucher_id': voucher_id,
+                                   'note':str_not1,
+                                   'ref':line['ref'],
+                                   })
 
                 str_not = "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"], statement["acc_holder"])
                 std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 9d055bcfb5f..d15b66b92ce 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -72,10 +72,11 @@ def _reconstruct_invoice_ref(cursor, user, reference, context=None):
 def _import(obj, cursor, user, data, context=None):
 
     pool = pooler.get_pool(cursor.dbname)
+    statement_obj = pool.get('account.bank.statement')
     statement_line_obj = pool.get('account.bank.statement.line')
 #    statement_reconcile_obj = pool.get('account.bank.statement.reconcile')
-    voucher_obj = self.pool.get('account.voucher')
-    voucher_line_obj = self.pool.get('account.voucher.line')
+    voucher_obj = pool.get('account.voucher')
+    voucher_line_obj = pool.get('account.voucher.line')
     move_line_obj = pool.get('account.move.line')
     property_obj = pool.get('ir.property')
     model_fields_obj = pool.get('ir.model.fields')
@@ -137,23 +138,18 @@ def _import(obj, cursor, user, data, context=None):
                 total_cost += record['cost']
                 records.append(record)
 
-    model_fields_ids = model_fields_obj.search(cursor, user, [
-        ('name', 'in', ['property_account_receivable', 'property_account_payable']),
-        ('model', '=', 'res.partner'),
-        ], context=context)
-    property_ids = property_obj.search(cursor, user, [
-        ('fields_id', 'in', model_fields_ids),
-        ('res_id', '=', False),
-        ], context=context)
-
+#    model_fields_ids = model_fields_obj.search(cursor, user, [
+#        ('name', 'in', ['property_account_receivable', 'property_account_payable']),
+#        ('model', '=', 'res.partner'),
+#        ], context=context)
+#    property_ids = property_obj.search(cursor, user, [
+#        ('fields_id', 'in', model_fields_ids),
+#        ('res_id', '=', False),
+#        ], context=context)
     account_receivable = False
     account_payable = False
-    for property in property_obj.browse(cursor, user, property_ids, context=context):
-        if property.fields_id.name == 'property_account_receivable':
-            account_receivable = int(property.value.split(',')[1])
-        elif property.fields_id.name == 'property_account_payable':
-            account_payable = int(property.value.split(',')[1])
-
+    statement = statement_obj.browse(cursor, user, statement_id, context=context)
+   
     for record in records:
         # Remove the 11 first char because it can be adherent number
         # TODO check if 11 is the right number
@@ -166,6 +162,7 @@ def _import(obj, cursor, user, data, context=None):
             'type': (record['amount'] >= 0 and 'customer') or 'supplier',
             'statement_id': statement_id,
         }
+        
         line_ids = move_line_obj.search(cursor, user, [
             ('ref', 'like', reference),
             ('reconcile_id', '=', False),
@@ -178,8 +175,10 @@ def _import(obj, cursor, user, data, context=None):
         partner_id = False
         account_id = False
         for line in move_line_obj.browse(cursor, user, line_ids, context=context):
-            if line.partner_id.id:
-                partner_id = line.partner_id.id
+            account_receivable = line.partner_id.property_account_receivable.id
+            account_payable = line.partner_id.property_account_payable.id
+            partner_id = line.partner_id.id
+            move_id = line.move_id.id
             if record['amount'] >= 0:
                 if round(record['amount'] - line.debit, 2) < 0.01:
                     line2reconcile = line.id
@@ -190,6 +189,32 @@ def _import(obj, cursor, user, data, context=None):
                     line2reconcile = line.id
                     account_id = line.account_id.id
                     break
+        result = voucher_obj.onchange_partner_id(cursor, user, [], partner_id=partner_id, journal_id=statement.journal_id.id, price=abs(record['amount']), currency_id= statement.currency.id, ttype='payment', context=context)
+
+        voucher_res = { 'type': 'payment' ,
+            'name': values['name'],
+            'partner_id': partner_id,
+            'journal_id': statement.journal_id.id,
+            'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
+            'company_id': statement.company_id.id,
+            'currency_id': statement.currency.id,
+            'date': record['date'] or time.strftime('%Y-%m-%d'),
+            'amount': abs(record['amount']),
+            'period_id': statement.period_id.id
+            }
+        voucher_id = voucher_obj.create(cursor, user, voucher_res, context=context)
+        context.update({'move_line_ids': line_ids})
+        values['voucher_id'] = voucher_id
+        voucher_line_dict =  False
+        if result['value']['line_ids']:
+            for line_dict in result['value']['line_ids']:
+                move_line = move_line_obj.browse(cursor, user, line_dict['move_line_id'], context)
+                if move_id == move_line.move_id.id:
+                    voucher_line_dict = line_dict
+        if voucher_line_dict:
+            voucher_line_dict.update({'voucher_id':voucher_id})
+            voucher_line_obj.create(cursor, user, voucher_line_dict, context=context)
+
         if not account_id:
             if record['amount'] >= 0:
                 account_id = account_receivable
@@ -201,31 +226,6 @@ def _import(obj, cursor, user, data, context=None):
         values['account_id'] = account_id
         values['partner_id'] = partner_id
 
-        if line2reconcile:
-            voucher_res = { 'type': 'payment' ,
-                'name': line.name,
-                'partner_id': line.partner_id.id,
-                'journal_id': statement.journal_id.id,
-                'account_id': account,
-                'company_id': statement.company_id.id,
-                'currency_id': statement.currency.id,
-                'date': line.date or time.strftime('%Y-%m-%d'),
-                'amount': abs(amount),
-                'period_id': statement.period_id.id
-                }
-            voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
-            context.update({'move_line_ids': line_ids})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context)
-            voucher_line_dict =  False
-            if result['value']['line_ids']:
-                for line_dict in result['value']['line_ids']:
-                    move_line = self.pool.get('account.move.line').browse(cr, uid, line_dict['move_line_id'], context)
-                    if line.move_line_id.move_id.id == move_line.move_id.id:
-                        voucher_line_dict = line_dict
-            if voucher_line_dict:
-                voucher_line_dict.update({'voucher_id':voucher_id})
-                voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
-            values['voucher_id'] = voucher_id
 #            values['reconcile_id'] = statement_reconcile_obj.create(cursor, user, {
 #                'line_ids': [(6, 0, [line2reconcile])],
 #                }, context=context)

From 5d14c3749674fc6e7d41099adf84e065fca2ac24 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 18:09:36 +0530
Subject: [PATCH 412/632] improve

bzr revid: apa@tinyerp.com-20101007123936-iioup1p4e49o1ue5
---
 addons/hr_payroll/report/report_employees_detail.py | 2 +-
 addons/hr_payroll/report/report_year_salary.py      | 2 +-
 addons/hr_payroll/report/rml_parse.py               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index d36df160ad2..c3d90c4eac7 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -227,7 +227,7 @@ class employees_salary_report(rml_parse.rml_parse):
     def get_monthly_total(self):
         return self.month_total_list
 
-report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header=3)
+report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header='internal landscape')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index a85d7328973..5e03e4710a6 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -105,7 +105,7 @@ class year_salary_report(rml_parse.rml_parse):
               self.total += item[count]
         return self.total
 
-report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header=3)
+report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header='internal landscape')
 
 
 
diff --git a/addons/hr_payroll/report/rml_parse.py b/addons/hr_payroll/report/rml_parse.py
index 2e3ca9dc019..7abb29711b6 100755
--- a/addons/hr_payroll/report/rml_parse.py
+++ b/addons/hr_payroll/report/rml_parse.py
@@ -151,10 +151,10 @@ class rml_parse(report_sxw.rml_parse):
             print Stringer
             return Stringer
 
-    def _add_header(self, node, header=1):
-        if header==2:
+    def _add_header(self, node, header='external'):
+        if header=='internal':
             rml_head =  self.rml_header2
-        elif header==3:
+        elif header=='internal landscape':
             rml_head =  self.rml_header3
         else:
             rml_head =  self.rml_header

From 4a5585086e3a3c4981cded0d9083fdb34c1d7d1b Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 18:19:31 +0530
Subject: [PATCH 413/632] [REF] event: misc change on event

bzr revid: mra@mra-laptop-20101007124931-lfzm2jzo619as2f1
---
 addons/event/event.py       | 2 +-
 addons/event/event_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6b530d725df..138d0d1b174 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -237,7 +237,7 @@ class event_event(osv.osv):
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
         'language': fields.char('Language',size=64, readonly=False, states={'done': [('readonly', True)]}),
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
-        'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
+        'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
 
     }
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7e24b237331..ed1e13ceec8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -58,7 +58,7 @@
                             <separator string="Invoice Information" colspan="4"/>
                             <field name="product_id" on_change="onchange_product(product_id)" colspan="4"/>
                             <field name="unit_price"/>
-                            <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_extended"/>
+                            <field name="pricelist_id" widget="selection" domain="[('type','=','sale')]" groups="base.group_extended"/>
                         </group>
                         <group colspan="2" col="2">
                             <separator string="Contact" colspan="4"/>

From 766b70051f066ca0a3d2b15b540f02f6e33ad117 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 18:28:11 +0530
Subject: [PATCH 414/632] [REF]

bzr revid: mra@mra-laptop-20101007125811-4kb2nba1x9fub1fu
---
 addons/event/report/report_event_registration_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 8212c9070a4..2ed0fe9a300 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -84,7 +84,7 @@
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id'}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Speaker" name="user" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/>
                         <separator orientation="vertical" />

From 8761d340e385a0af80abacfc44b523e7cba24a31 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 18:30:50 +0530
Subject: [PATCH 415/632] [MOD/IMP] hr_holidays : Usability Improvement in
 hr_holidays

bzr revid: amp@tinyerp.com-20101007130050-wvaqvtlqallypu3i
---
 addons/hr_holidays/hr_holidays.py       | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 025325a5ae1..356d697f2c1 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -141,7 +141,7 @@ class hr_holidays(osv.osv):
         return False
 
     _columns = {
-        'name': fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
             If the admin accepts it, the state is \'Approved\'. If it is refused, the state is \'Refused\'.'),
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9f8e5409e8d..6ee69af1bca 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -66,7 +66,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="8" colspan="4">
-                    <field name="name" />
+                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>

From 572a9905ebfb03f86b9a290ffce0879e6c0ded61 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 7 Oct 2010 18:39:24 +0530
Subject: [PATCH 416/632] [FIX] account: act link was not working once invoice
 created

bzr revid: psi@tinyerp.co.in-20101007130924-m6ebhnq094lsqmeh
---
 addons/account/account.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index 6271d97500b..f6fc33668b5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1043,6 +1043,8 @@ class account_move(osv.osv):
         return self.name_get(cr, user, ids, context=context)
 
     def name_get(self, cursor, user, ids, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if not len(ids):
             return []
         res = []
@@ -1592,6 +1594,8 @@ class account_tax_code(osv.osv):
 
 
     def name_get(self, cr, uid, ids, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if not len(ids):
             return []
         if isinstance(ids, (int, long)):

From 56ea5b6e35f3327509c230177ab3ffdbbe10f244 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 18:42:48 +0530
Subject: [PATCH 417/632] overdue payment

bzr revid: apa@tinyerp.com-20101007131248-t21lp7jd8l8tzr93
---
 addons/account/report/overdue.rml | 44 +++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index a0748e281ac..d3d2c77e47a 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -46,11 +46,13 @@
       <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,1" stop="5,1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -116,7 +118,7 @@
     </para>
     <para style="terp_default_9">Document: Customer account statement</para>
     <para style="terp_default_9">Date: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
-    <para style="terp_default_9">Customer Ref: [[ o.ref or '' ]]</para>
+    <para style="terp_default_9">Customer Ref: [[ o.ref or ' ']]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -181,10 +183,10 @@
             <para style="terp_default_Centre_9">[[ line['date_maturity'] and formatLang(line['date_maturity'],date=True) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]]</para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['debit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['credit'] * -1) or ' ') ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] </para>
+            <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang((line['date_maturity'] &lt; time.strftime('%Y-%m-%d'))) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
@@ -195,7 +197,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="247.0,65.0,59.0,56.0,66.0,17.0" style="Table2">
+    <blockTable colWidths="244.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -206,7 +208,7 @@
           <para style="terp_default_Bold_9">Sub-Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['debit'] or 0) or (y['account_id']['type'] == 'payable' and y['credit'] * -1 or 0)), getLines(o), 0))) ]] </para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
@@ -220,6 +222,8 @@
           </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="250.0,66.0,62.0,131.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -230,25 +234,21 @@
           <para style="terp_default_Bold_9">Balance : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_9">Total amount due: [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]].</para>
     <para style="terp_default_8">
       <font color="white"> </font>

From cfcbf1ab1ea30efe3a1929993064493587ebd419 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Thu, 7 Oct 2010 18:59:34 +0530
Subject: [PATCH 418/632] [MOD/IMP] hr_* : Usability Improvents in Record Rule
 in hr/groups

bzr revid: amp@tinyerp.com-20101007132934-3nzpqe2751iau4hg
---
 addons/hr_attendance/hr_attendance_demo.xml | 4 ++--
 addons/hr_evaluation/hr_evaluation_demo.xml | 4 ++--
 addons/hr_expense/hr_expense_demo.xml       | 4 ++--
 addons/hr_holidays/hr_holidays_demo.xml     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index 8f238fb61a5..d2967167ec8 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -125,13 +125,13 @@
             <field name="name">Employee Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 0a03ec0e0b6..f8513bf63ea 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1616,13 +1616,13 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="name">Employee Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_evaluation_manager" model="ir.rule">
             <field name="name">Manager Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 		 </data>
 
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index c3fa9e90c67..cb9e28b5543 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -108,13 +108,13 @@
             <field name="name">Employee Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_expense_manager" model="ir.rule">
             <field name="name">Manager Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 	</data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index f513b8892c5..e59bd5a0353 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -52,13 +52,13 @@
         <field name="name">Employee Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
     </record>
     <record id="property_rule_holidays_manager" model="ir.rule">
         <field name="name">Manager Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 
   </data>

From f346dc0bd56dd6767dfe681ea6fc573db52659ac Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 19:00:23 +0530
Subject: [PATCH 419/632] improve

bzr revid: apa@tinyerp.com-20101007133023-w0e14zu1xkoph0gc
---
 addons/account/report/account_central_journal.rml | 2 +-
 addons/account/report/account_general_journal.rml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 4bf23b3d4b6..d6e53c4f3c7 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -295,7 +295,7 @@
     </blockTable>
     <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
-        <td><para style="terp_default_Bold_9">Total<font size="8.0">([[ company.currency_id.code]])</font>:</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]] </para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]] </para></td>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 84a9ee6a780..61113212c2d 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -270,7 +270,7 @@
   		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
       </tr>
       <tr>
-        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]] </para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>

From 2b0de067f4da32b3e6f13f1ccfda7215a694b622 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 19:05:52 +0530
Subject: [PATCH 420/632] [REF] event: Warning removed from automated test

bzr revid: mra@mra-laptop-20101007133552-5t7iqmke38cj01dd
---
 addons/event/event.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 138d0d1b174..d5d60091294 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -590,7 +590,6 @@ class event_registration(osv.osv):
         data ={}
         if not contact:
             return data
-        contact_obj = self.pool.get('res.partner.contact')
         addr_obj = self.pool.get('res.partner.address')
         job_obj = self.pool.get('res.partner.job')
 

From 2902b1138f62584ab7b1cd5c5f96021cc170a327 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 19:11:19 +0530
Subject: [PATCH 421/632] improve

bzr revid: apa@tinyerp.com-20101007134119-q04dm2l2ubqjpymd
---
 .../hr_payroll/report/report_year_report.rml  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 4c32436955a..d103d35185f 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -63,11 +63,24 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -134,7 +147,7 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Name</para>
@@ -176,7 +189,7 @@
             <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">Total([[company.currency_id.code]])</para>
+            <para style="terp_tblheader_Details_Right">Total</para>
           </td>
         </tr>
       </blockTable>
@@ -185,7 +198,7 @@
       </para>
       <section>
         <para style="terp_default_9">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
-        <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
+        <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
           <tr>
             <td>
               <para style="terp_default_9">[[ e[0] ]]</para>
@@ -231,23 +244,14 @@
             </td>
           </tr>
         </blockTable>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="P1">[[ repeatIn(get_months_tol(),'t') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+      <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
+      <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_tblheader_Details">Total([[company.currency_id.code]])</para>
+            <para style="terp_tblheader_Details">Total</para>
           </td>
           <td>
             <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]] [[company.currency_id.symbol]]</para>
@@ -298,4 +302,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From cf4bcd87ec977e1363e699d01700e0da02f220ac Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Thu, 7 Oct 2010 19:15:28 +0530
Subject: [PATCH 422/632] [FIX] account_report: report print

bzr revid: vth@tinyerp.com-20101007134528-89rmeuamuhpzmgwo
---
 addons/account_report/report/print_indicator.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_report/report/print_indicator.rml b/addons/account_report/report/print_indicator.rml
index 160cd435ada..659a392daa4 100644
--- a/addons/account_report/report/print_indicator.rml
+++ b/addons/account_report/report/print_indicator.rml
@@ -106,10 +106,10 @@
 	<section>
 		<blockTable colWidths="528.0" style="Table7">
 		<tr>
-			<td><para style="P11"><font color="white">[['.....'*(o['level']) ]]</font><font>[[ o['type']=='view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]]</font>(<seq/>)<font>[[ o['name'] ]]  ([[ o['code'] ]])</font></para></td>
+			<td><para style="P11"><font color="white">[['.....'*(o['level']) ]]</font><font>[[ o['type']&lt;&gt;'view' and setTag('para','para',{'fontName':'Helvetica-Bold','fontSize':'10.5'}) ]]</font>(<seq/>)<font>[[ o['name'] ]]  ([[ o['code'] ]])</font></para></td>
 		</tr>
 		</blockTable>
-		<para style="P1">[[ o['disp_tree'] and setTag('para','image',{'file':gettree(data['form'],o)}) or removeParentNode('para') ]]</para>
+		<para style="P1">[[ o['disp_tree'] and setTag('para','image',{'width':'450.00','height':'215.00','file':gettree(data['form'],o)}) or removeParentNode('para') ]]</para>
 		<para style="P1">[[ o['disp_graph'] and setTag('para','image',{'width':'450.00','height':'215.00','file':getgraph(data['form'],o)}) or removeParentNode('para') ]]</para>
 		<para style="P3"><font color="white"> </font></para>
 		<blockTable colWidths="528.0" repeatRows="1" style="Table7">

From 7f603c334ed810b66101781ae294ea4e1eea80dd Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 7 Oct 2010 19:17:46 +0530
Subject: [PATCH 423/632] [MOD] Improvemetns in reports

bzr revid: vir@tinyerp.com-20101007134746-38gevpiqxagm15sn
---
 addons/hr_evaluation/report/hr_evaluation_report_view.xml   | 5 ++++-
 addons/hr_expense/hr_expense_view.xml                       | 4 +++-
 addons/hr_recruitment/report/hr_recruitment_report_view.xml | 3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 84ebf598e9d..59dade23d6f 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -18,6 +18,7 @@
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="rating" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Requests"/>
                 <field name="progress_bar" widget="progressbar"/>
                 <field name="delay_date"/>
@@ -74,7 +75,9 @@
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
-                    <filter string="Appreciation" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
+                    <filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 0763d76d1b4..e9a9c08669a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -149,7 +149,9 @@
                       <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
-                      <field name="department_id" widget="selection" groups="base.group_extended"/>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
+                   <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
+               </field>
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 2e1476b9de6..d29ecabefb0 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -91,11 +91,10 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="job_id" />
+                    <!--field name="job_id"/-->
                     <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
                     <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>

From 0f0e88a3c86c5c29391ec2596f48fa5e210d4891 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Oct 2010 19:18:53 +0530
Subject: [PATCH 424/632] [MOD/IMP] hr_evaluation : Usability Improvements

bzr revid: dbr@tinyerp.com-20101007134853-979u6snp02182w04
---
 addons/hr_evaluation/hr_evaluation.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 041ec2d1fd8..960849bdfd4 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -258,6 +258,7 @@ class hr_evaluation(osv.osv):
     def button_done(self,cr, uid, ids, context=None):
         if context is None:
             context = {}
+        self.write(cr, uid, ids,{'progress': 1 * 100}, context=context)
         self.write(cr, uid, ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 

From 3f83a2b445b6451477115530b1a022be374817fa Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 7 Oct 2010 19:19:35 +0530
Subject: [PATCH 425/632] [REF] event

bzr revid: mra@mra-laptop-20101007134935-yt4c9uk6u92d3mw9
---
 addons/event/event.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index d5d60091294..d76dd2ee0b2 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -55,6 +55,7 @@ class event_event(osv.osv):
             'registration_ids': False,
         })
         return super(event_event, self).copy(cr, uid, id, default=default, context=context)
+
     def onchange_product(self, cr, uid, ids, product_id):
         """This function returns value of  product's unit price based on product id.
         @param self: The object pointer
@@ -339,8 +340,8 @@ class event_registration(osv.osv):
     _defaults = {
         'nb_register': 1,
         'tobe_invoiced':  True,
-        'state': lambda *a: 'draft',
-        'active': lambda *a: 1,
+        'state': 'draft',
+        'active': True,
         'user_id': lambda self, cr, uid, ctx: uid,
     }
 
@@ -710,5 +711,4 @@ class event_registration_badge(osv.osv):
     }
 event_registration_badge()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 5987cb0a8d2fdb56a2eba874db54f2211c75ec55 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 7 Oct 2010 19:30:08 +0530
Subject: [PATCH 426/632] improve

bzr revid: apa@tinyerp.com-20101007140008-1q8f9m64p198exk6
---
 .../report/report_employees_detail.rml        | 260 ++++++++----------
 1 file changed, 118 insertions(+), 142 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 1988d932ce2..28ebe20d007 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -86,33 +86,19 @@
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
@@ -122,20 +108,20 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
@@ -144,20 +130,20 @@
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
@@ -166,24 +152,38 @@
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -292,10 +292,10 @@
           <para style="terp_default_9">[[ o.name ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Other Id</para>
+          <para style="terp_tblheader_Details">PAN No.</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+          <para style="terp_default_9">[[ o.pan_no or ' ']]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Address</para>
@@ -332,7 +332,7 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Title</para>
@@ -378,13 +378,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_9">
-          <font color="white"> </font>
-        </para>
         <blockTable colWidths="1063.0" style="Table7">
           <tr>
             <td>
@@ -393,56 +387,53 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_allow(),'e1') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+          <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e1[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
         <blockTable colWidths="1063.0" style="Table10">
           <tr>
@@ -452,56 +443,53 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
+          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e2[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
         <blockTable colWidths="1063.0" style="Table11">
           <tr>
@@ -511,107 +499,98 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
+          <para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e3[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <blockTable colWidths="101.0,73.0,68.0,74.0,70.0,74.0,74.0,73.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
         <tr>
           <td>
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -619,11 +598,8 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From f2e3f5fc2b72af83bcc0b4055588b50ec63aa60a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 19:30:56 +0530
Subject: [PATCH 427/632] [IMP]: implement the salary calculation for the
 structure

bzr revid: mga@tinyerp.com-20101007140056-r3mo0e7ltp7k4bd1
---
 addons/hr_payroll/hr_payroll.py       | 173 +++++++++++++++++++++++++-
 addons/hr_payroll/hr_payroll_data.xml |   2 +-
 addons/hr_payroll/hr_payroll_view.xml |   8 +-
 3 files changed, 177 insertions(+), 6 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 83ec05ea554..ed767a06fb7 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -130,6 +130,172 @@ class hr_contract(osv.osv):
     Employee contract based on the visa, work permits
     allowas to configure different Salary structure
     """
+    
+    def compute_basic(self, cr, uid, ids, context={}):
+        res = {}
+        ids += context.get('employee_structure', [])
+        
+        for contract in self.browse(cr, uid, ids, context):
+            
+            all_per = 0.0
+            ded_per = 0.0
+            all_fix = 0.0
+            ded_fix = 0.0
+            obj = {'basic':0.0}
+            update = {}
+            if contract.wage_type_id.type == 'gross':
+                obj['gross'] = contract.wage
+                update['gross'] = contract.wage
+            if contract.wage_type_id.type == 'net':
+                obj['net'] = contract.wage
+                update['net'] = contract.wage
+            if contract.wage_type_id.type == 'basic':
+                obj['basic'] = contract.wage
+                update['basic'] = contract.wage
+            
+            sal_type = contract.wage_type_id.type
+            function = contract.struct_id.id
+            lines = contract.struct_id.line_ids
+            if not contract.struct_id:
+                res[contract.id] = obj['basic']
+                continue 
+            
+            ad = []
+            c_type = {}
+            for line in lines:
+                cd = line.code.lower()
+                obj[cd] = line.amount or 0.0
+            
+            for line in lines:
+                if line.category_id.code in ad:
+                    continue
+                ad.append(line.category_id.code)
+                cd = line.category_id.code.lower()
+                calculate = False
+                try:
+                    exp = line.category_id.condition
+                    calculate = eval(exp, obj)
+                except Exception, e:
+                    raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+
+                if not calculate:
+                    continue
+
+                percent = 0.0
+                value = 0.0
+                base = False
+                company_contrib = 0.0
+                base = line.category_id.base
+
+                try:
+                    #Please have a look at the configuration guide.
+                    amt = eval(base, obj)
+                except Exception, e:
+                    raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+
+                if sal_type in ('gross', 'net'):
+                    if line.amount_type == 'per':
+                        percent = line.amount
+                        if amt > 1:
+                            value = percent * amt
+                        elif amt > 0 and amt <= 1:
+                            percent = percent * amt
+                        if value > 0:
+                            percent = 0.0
+                    elif line.amount_type == 'fix':
+                        value = line.amount
+                    elif line.amount_type == 'func':
+                        value = slip_line_pool.execute_function(cr, uid, line.id, amt, context)
+                        line.amount = value
+                else:
+                    if line.amount_type in ('fix', 'per'):
+                        value = line.amount
+                    elif line.amount_type == 'func':
+                        value = slip_line_pool.execute_function(cr, uid, line.id, amt, context)
+                        line.amount = value
+                if line.type == 'allowance':
+                    all_per += percent
+                    all_fix += value
+                elif line.type == 'deduction':
+                    ded_per += percent
+                    ded_fix += value
+            if sal_type in ('gross', 'net'):
+                sal = contract.wage
+                if sal_type == 'net':
+                    sal += ded_fix
+                sal -= all_fix
+                per = 0.0
+                if sal_type == 'net':
+                    per = (all_per - ded_per)
+                else:
+                    per = all_per
+                if per <=0 :
+                    per *= -1
+                final = (per * 100) + 100
+                basic = (sal * 100) / final
+            else:
+                basic = contract.wage
+            
+            res[contract.id] = basic
+
+        return res
+    
+    def _calculate_salary(self, cr, uid, ids, field_names, arg, context=None):
+        res = self.compute_basic(cr, uid, ids, context)
+        vals = {}
+        for rs in self.browse(cr, uid, ids, context=context):
+            allow = 0.0
+            deduct = 0.0
+            others = 0.0
+            obj = {'basic':res[rs.id], 'gross':0.0, 'net':0.0}
+            if rs.wage_type_id.type == 'gross':
+                obj['gross'] = rs.wage
+            if rs.wage_type_id.type == 'net':
+                obj['net'] = rs.net
+            
+            if not rs.struct_id:
+                record = {
+                    'advantages_gross':0.0,
+                    'advantages_net':0.0,
+                    'basic':obj['basic'],
+                    'gross':obj['gross'],
+                    'net':obj['net']
+                }
+                vals[rs.id] = record
+                continue
+                
+            for line in rs.struct_id.line_ids:
+                amount = 0.0
+                if line.amount_type == 'per':
+                    try:
+                        amount = line.amount * eval(str(line.category_id.base), obj)
+                    except Exception, e:
+                        raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+                elif line.amount_type in ('fix', 'func'):
+                    amount = line.amount
+                cd = line.category_id.code.lower()
+                obj[cd] = amount
+                
+                if line.type == 'allowance':
+                    allow += amount
+                elif line.type == 'deduction':
+                    deduct += amount
+                elif line.type == 'advance':
+                    others += amount
+                elif line.type == 'loan':
+                    others += amount
+                elif line.type == 'otherpay':
+                    others += amount
+            record = {
+                'advantages_gross':round(allow),
+                'advantages_net':round(deduct),
+                'basic':res[rs.id],
+                'gross':round(res[rs.id] + allow),
+                'net':round(res[rs.id] + allow - deduct)
+            }
+            vals[rs.id] = record
+
+        return vals
 
     _inherit = 'hr.contract'
     _description = 'Employee Contract'
@@ -140,7 +306,12 @@ class hr_contract(osv.osv):
         'visa_no':fields.char('Visa No', size=64, required=False, readonly=False),
         'visa_expire': fields.date('Visa Expire Date'),
         'struct_id' : fields.many2one('hr.payroll.structure', 'Salary Structure'),
-        'working_days_per_week': fields.integer('Working Days', help="No of Working days / week for an employee")
+        'working_days_per_week': fields.integer('Working Days', help="No of Working days / week for an employee"),
+        'basic': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Basic Salary'),
+        'gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Gross Salary'),
+        'net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Net Salary'),
+        'advantages_net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Deductions'),
+        'advantages_gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Allowances'),
     }
     _defaults = {
         'working_days_per_week': lambda *a: 5,
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index 4f6012fd328..4198696a5c8 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -130,7 +130,7 @@
         <!-- Contract Wage Types -->
         <record id="hr_contract_monthly_basic" model="hr.contract.wage.type">
             <field name="name">Monthly Basic Wage</field>
-            <field name="type">gross</field>
+            <field name="type">basic</field>
             <field name="period_id" ref="hr_contract.hr_contract_wage_type_period_monthly"/>
         </record>
     </data>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 21284aa78d7..3e4f2d002ec 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -242,8 +242,11 @@
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Advantages"/>
                                 <field name="struct_id" select="1"/>
-                                <field name="advantages_net"/>
+                                <field name="basic" groups="base.group_extended"/>
                                 <field name="advantages_gross"/>
+                                <field name="gross" groups="base.group_extended"/>
+                                <field name="advantages_net"/>
+                                <field name="net" groups="base.group_extended"/>
                                 <field name="advantages" nolabel="1" colspan="2"/>
                             </group>
                         </page>
@@ -379,9 +382,6 @@
                         <field name="sequence"/>
                     </group>
                     <group col="2" colspan="2">
-<!--                        <separator colspan="4" string="Accounting Informations"/>-->
-<!--                        <field name="account_id"/>-->
-<!--                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>-->
                         <separator colspan="4" string="Company contribution"/>
                         <field name="company_contrib"/>
                     </group>

From d0e0cb7ad2f6e20a0fc68e0d13c289497a63ecce Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 7 Oct 2010 20:05:07 +0530
Subject: [PATCH 428/632] [IMP] hr_payroll: Improved Employee Salary Structure
 report.

bzr revid: vra@tinyerp.com-20101007143507-6apfh565afuxamn3
---
 addons/hr_payroll/hr_paroll_report.xml        |   2 +-
 .../report/report_emp_salary_structure.rml    | 183 +++++++++---------
 2 files changed, 95 insertions(+), 90 deletions(-)

diff --git a/addons/hr_payroll/hr_paroll_report.xml b/addons/hr_payroll/hr_paroll_report.xml
index 1355a42ff5b..732b72f6a1d 100755
--- a/addons/hr_payroll/hr_paroll_report.xml
+++ b/addons/hr_payroll/hr_paroll_report.xml
@@ -51,7 +51,7 @@
           	name="salary.structure" 
           	rml="hr_payroll/report/report_emp_salary_structure.rml"
           	menu = "True" 
-          	string="Print Salary Structure" />
+          	string="Salary Structure" />
   
 	</data>
 </openerp>
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 6bfc528e4e0..1ccc327063e 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Salary Structure" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -10,10 +10,6 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -127,6 +123,46 @@
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table14">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table15">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -138,10 +174,6 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -150,10 +182,6 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
@@ -166,9 +194,6 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table12">
       <blockAlignment value="LEFT"/>
@@ -177,9 +202,6 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -241,20 +263,7 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'employee')]]</para>
-    <blockTable colWidths="539.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Salary Structure</para>
-          <para style="terp_header_Centre">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
+    <para style="terp_default_1">
       <font color="white"> </font>
     </para>
     <section>
@@ -290,7 +299,7 @@
             <para style="terp_default_9">[[ employee.name ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">Other Id</para>
+            <para style="terp_tblheader_Details">Other No.</para>
           </td>
           <td>
             <para style="terp_default_9">[[ employee.otherid or '' ]]</para>
@@ -379,6 +388,44 @@
           </td>
         </tr>
       </blockTable>
+      <blockTable colWidths="68.0,111.0,63.0,111.0,71.0,115.0" style="Table14">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Basic</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ cont.basic ]] [[ employee.company_id.currency_id.symbol ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Allowances</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ cont.advantages_gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Gross Salary</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ cont.gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="68.0,111.0,63.0,297.0" style="Table15">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Deductions</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ cont.advantages_net ]] [[ employee.company_id.currency_id.symbol ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Net Salary</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ cont.net ]] [[ employee.company_id.currency_id.symbol ]]</para>
+          </td>
+        </tr>
+      </blockTable>
       <para style="terp_default_space">
         <font color="white"> </font>
       </para>
@@ -396,7 +443,7 @@
         <para style="terp_default_1">
           <font color="white"> </font>
         </para>
-        <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
+        <blockTable colWidths="34.0,341.0,80.0,83.0" style="Table5">
           <tr>
             <td>
               <para style="terp_tblheader_Details">Code</para>
@@ -404,24 +451,12 @@
             <td>
               <para style="terp_tblheader_Details">Name</para>
             </td>
+            <td>
+              <para style="terp_tblheader_Details_Right">Amount</para>
+            </td>
             <td>
               <para style="terp_tblheader_Details">Amount Type</para>
             </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">Amount / Percentage</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Type</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Category</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">General Account</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Analytic Account</para>
-            </td>
           </tr>
         </blockTable>
         <para style="terp_default_1">
@@ -429,7 +464,7 @@
         </para>
         <section>
           <para style="terp_default_9">[[repeatIn(cont.struct_id.line_ids,'line')]]</para>
-          <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,69.0,59.0" style="Table8">
+          <blockTable colWidths="34.0,340.0,80.0,84.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ line.code or '' ]]</para>
@@ -437,23 +472,11 @@
               <td>
                 <para style="terp_default_9">[[ line.name ]]</para>
               </td>
-              <td>
-                <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
-              </td>
               <td>
                 <para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ get_line_amount_symbol(line.amount_type) ]]</para>
               </td>
               <td>
-                <para style="terp_default_9">[[ get_line_type(line.type) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_9">[[ line.category_id.name ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_9">[[ line.account_id.name ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_9">[[ line.analytic_account_id and line.analytic_account_id.name or '' ]]</para>
+                <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -483,7 +506,7 @@
       <para style="terp_default_1">
         <font color="white"> </font>
       </para>
-      <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
+      <blockTable colWidths="34.0,338.0,82.0,84.0" style="Table11">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Code</para>
@@ -491,21 +514,12 @@
           <td>
             <para style="terp_tblheader_Details">Name</para>
           </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Amount</para>
+          </td>
           <td>
             <para style="terp_tblheader_Details">Amount Type</para>
           </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Amount / Percentage</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details">Type</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details">Category</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details">General Account</para>
-          </td>
         </tr>
       </blockTable>
       <para style="terp_default_1">
@@ -513,7 +527,7 @@
       </para>
       <section>
         <para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
-        <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
+        <blockTable colWidths="34.0,338.0,81.0,86.0" style="Table12">
           <tr>
             <td>
               <para style="terp_default_9">[[ line1.code or '' ]]</para>
@@ -521,20 +535,11 @@
             <td>
               <para style="terp_default_9">[[ line1.name ]]</para>
             </td>
-            <td>
-              <para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>
-            </td>
             <td>
               <para style="terp_default_Right_9">[[ formatLang(line1.amount) ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ get_line_type(line1.type) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_9">[[ line1.category_id.name ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_9">[[ line1.account_id.name ]]</para>
+              <para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -550,4 +555,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>

From cf672602eb8b9be2ec316ce877119e13154ddc49 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 20:14:56 +0530
Subject: [PATCH 429/632] [IMP]: improvement to the contract object

bzr revid: mga@tinyerp.com-20101007144456-vu0v0750ujf8bgzq
---
 addons/hr_payroll/hr_payroll.py       | 11 +++++------
 addons/hr_payroll/hr_payroll_view.xml |  3 ---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index ed767a06fb7..0079d2376cb 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -136,7 +136,6 @@ class hr_contract(osv.osv):
         ids += context.get('employee_structure', [])
         
         for contract in self.browse(cr, uid, ids, context):
-            
             all_per = 0.0
             ded_per = 0.0
             all_fix = 0.0
@@ -307,11 +306,11 @@ class hr_contract(osv.osv):
         'visa_expire': fields.date('Visa Expire Date'),
         'struct_id' : fields.many2one('hr.payroll.structure', 'Salary Structure'),
         'working_days_per_week': fields.integer('Working Days', help="No of Working days / week for an employee"),
-        'basic': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Basic Salary'),
-        'gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Gross Salary'),
-        'net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Net Salary'),
-        'advantages_net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Deductions'),
-        'advantages_gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Allowances'),
+        'basic': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
+        'gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
+        'net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
+        'advantages_net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
+        'advantages_gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
     }
     _defaults = {
         'working_days_per_week': lambda *a: 5,
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 3e4f2d002ec..033368caaad 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -242,11 +242,8 @@
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Advantages"/>
                                 <field name="struct_id" select="1"/>
-                                <field name="basic" groups="base.group_extended"/>
                                 <field name="advantages_gross"/>
-                                <field name="gross" groups="base.group_extended"/>
                                 <field name="advantages_net"/>
-                                <field name="net" groups="base.group_extended"/>
                                 <field name="advantages" nolabel="1" colspan="2"/>
                             </group>
                         </page>

From e38dcfb12241fed9bb7448873289dbbd9b5360c4 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 7 Oct 2010 20:22:40 +0530
Subject: [PATCH 430/632] [FIX] XSL Report : title of xsl reports should
 support accented characters

bzr revid: jvo@tinyerp.com-20101007145240-x9by6sv89jtco7j5
---
 bin/report/render/rml2pdf/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 96df33c925f..0b2a898790d 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -42,6 +42,7 @@ from lxml import etree
 import copy
 import locale
 import traceback, sys
+import tools
 from tools.safe_eval import safe_eval as eval
 import logging
 
@@ -176,7 +177,7 @@ def attr_get(node, attrs, dict={}):
     for key in dict:
         if node.get(key):
             if dict[key]=='str':
-                res[key] = str(node.get(key))
+                res[key] = tools.ustr(node.get(key))
             elif dict[key]=='bool':
                 res[key] = bool_get(node.get(key))
             elif dict[key]=='int':

From 3b764ef32ca04e92fe574e4461bd33d538925442 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 8 Oct 2010 04:38:15 +0000
Subject: [PATCH 431/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101008043815-syw6e8kx0kyjfvht
---
 bin/addons/base/i18n/nl.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 534a06b7f62..ab6a784be15 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-01 11:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-06 14:56+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-02 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8142,7 +8142,7 @@ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
+msgstr "De code van de relatie functie moet uniek zijn !"
 
 #. module: base
 #: sql_constraint:res.partner:0

From 6d3d60875063e07e041267c0e4fad7b8529f00d2 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 8 Oct 2010 04:40:02 +0000
Subject: [PATCH 432/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101008044002-5tq08qdkcv6vf3fj
---
 addons/account/i18n/sv.po                     |   12 +-
 addons/account_anglo_saxon/i18n/de.po         |   64 +
 addons/account_cancel/i18n/es.po              |   15 +-
 addons/account_chart/i18n/eu.po               |   23 +
 addons/account_coda/i18n/de.po                |  166 ++
 addons/account_reporting/i18n/nl.po           |    8 +-
 addons/account_voucher/i18n/pl.po             |  112 +-
 addons/base_calendar/i18n/de.po               | 1540 +++++++++++++++
 addons/base_iban/i18n/eu.po                   |   64 +
 addons/base_module_quality/i18n/nl.po         |   60 +-
 addons/base_module_record/i18n/nl.po          |   57 +-
 addons/base_vat/i18n/eu.po                    |   40 +
 addons/board/i18n/pt_BR.po                    |    4 +-
 addons/claim_from_delivery/i18n/nl.po         |   21 +-
 addons/crm/i18n/it.po                         |    8 +-
 addons/crm/i18n/nl.po                         |  391 ++--
 addons/crm/i18n/pl.po                         |   10 +-
 addons/crm/i18n/pt_BR.po                      |    4 +-
 addons/crm_claim/i18n/de.po                   |  764 ++++++++
 addons/crm_fundraising/i18n/de.po             |  744 +++++++
 addons/crm_helpdesk/i18n/de.po                |  651 +++++++
 addons/document_webdav/i18n/eu.po             |   31 +
 addons/email_template/i18n/de.po              | 1229 ++++++++++++
 addons/fetchmail/i18n/de.po                   |  266 +++
 addons/fetchmail/i18n/nl.po                   |   61 +-
 addons/hr/i18n/tr.po                          |    6 +-
 addons/hr_evaluation/i18n/mn.po               |    6 +-
 addons/hr_expense/i18n/mn.po                  |    6 +-
 addons/hr_payroll/i18n/de.po                  | 1438 ++++++++++++++
 addons/hr_payroll_account/i18n/de.po          |  351 ++++
 addons/hr_recruitment/i18n/de.po              | 1008 ++++++++++
 addons/knowledge/i18n/de.po                   |  160 ++
 addons/knowledge/i18n/hi.po                   |    4 +-
 addons/knowledge/i18n/nl.po                   |   57 +-
 addons/marketing/i18n/de.po                   |  116 ++
 addons/marketing/i18n/nl.po                   |   40 +-
 addons/marketing_campaign/i18n/de.po          |  929 +++++++++
 addons/marketing_campaign_crm_demo/i18n/de.po |  171 ++
 addons/partner_geo_assign/i18n/de.po          |  117 ++
 addons/procurement/i18n/de.po                 |  850 ++++++++
 addons/product/i18n/eu.po                     | 1704 +++++++++++++++++
 addons/product_expiry/i18n/pl.po              |  168 ++
 addons/product_manufacturer/i18n/pl.po        |   95 +
 addons/project/i18n/eu.po                     | 1424 ++++++++++++++
 addons/project_issue/i18n/de.po               |  965 ++++++++++
 addons/project_issue_sheet/i18n/de.po         |   88 +
 addons/project_issue_sheet/i18n/pl.po         |   90 +
 addons/project_long_term/i18n/de.po           |  549 ++++++
 addons/project_messages/i18n/de.po            |  119 ++
 addons/project_messages/i18n/pl.po            |  121 ++
 addons/share/i18n/de.po                       |  227 +++
 addons/stock_planning/i18n/de.po              | 1470 ++++++++++++++
 addons/thunderbird/i18n/eu.po                 |   86 +
 addons/wiki/i18n/sv.po                        |    8 +-
 addons/wiki_faq/i18n/de.po                    |   30 +
 addons/wiki_quality_manual/i18n/de.po         |   30 +
 addons/wiki_sale_faq/i18n/de.po               |   62 +
 57 files changed, 18429 insertions(+), 411 deletions(-)
 create mode 100644 addons/account_anglo_saxon/i18n/de.po
 create mode 100644 addons/account_chart/i18n/eu.po
 create mode 100644 addons/account_coda/i18n/de.po
 create mode 100644 addons/base_calendar/i18n/de.po
 create mode 100644 addons/base_iban/i18n/eu.po
 create mode 100644 addons/base_vat/i18n/eu.po
 create mode 100644 addons/crm_claim/i18n/de.po
 create mode 100644 addons/crm_fundraising/i18n/de.po
 create mode 100644 addons/crm_helpdesk/i18n/de.po
 create mode 100644 addons/document_webdav/i18n/eu.po
 create mode 100644 addons/email_template/i18n/de.po
 create mode 100644 addons/fetchmail/i18n/de.po
 create mode 100644 addons/hr_payroll/i18n/de.po
 create mode 100644 addons/hr_payroll_account/i18n/de.po
 create mode 100644 addons/hr_recruitment/i18n/de.po
 create mode 100644 addons/knowledge/i18n/de.po
 create mode 100644 addons/marketing/i18n/de.po
 create mode 100644 addons/marketing_campaign/i18n/de.po
 create mode 100644 addons/marketing_campaign_crm_demo/i18n/de.po
 create mode 100644 addons/partner_geo_assign/i18n/de.po
 create mode 100644 addons/procurement/i18n/de.po
 create mode 100644 addons/product/i18n/eu.po
 create mode 100644 addons/product_expiry/i18n/pl.po
 create mode 100644 addons/product_manufacturer/i18n/pl.po
 create mode 100644 addons/project/i18n/eu.po
 create mode 100644 addons/project_issue/i18n/de.po
 create mode 100644 addons/project_issue_sheet/i18n/de.po
 create mode 100644 addons/project_issue_sheet/i18n/pl.po
 create mode 100644 addons/project_long_term/i18n/de.po
 create mode 100644 addons/project_messages/i18n/de.po
 create mode 100644 addons/project_messages/i18n/pl.po
 create mode 100644 addons/share/i18n/de.po
 create mode 100644 addons/stock_planning/i18n/de.po
 create mode 100644 addons/thunderbird/i18n/eu.po
 create mode 100644 addons/wiki_faq/i18n/de.po
 create mode 100644 addons/wiki_quality_manual/i18n/de.po
 create mode 100644 addons/wiki_sale_faq/i18n/de.po

diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 2b306d2a109..dca0d843292 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-07 19:39+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: <> <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -26,6 +26,12 @@ msgstr "Internt namn"
 msgid "Account Tax Code"
 msgstr "Konto, skattekod"
 
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree9
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
+msgid "Unpaid Supplier Invoices"
+msgstr "Obetalda leverantörsfakturor"
+
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po
new file mode 100644
index 00000000000..27439bf449d
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/de.po
@@ -0,0 +1,64 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-10-05 13:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_cancel/i18n/es.po b/addons/account_cancel/i18n/es.po
index 313885368a9..555253dc4d1 100644
--- a/addons/account_cancel/i18n/es.po
+++ b/addons/account_cancel/i18n/es.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-09-13 14:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-06 02:17+0000\n"
+"Last-Translator: Marcelo Zunino (http://infoprimo.com) <Unknown>\n"
 "Language-Team: Spanish <es@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_cancel
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "¡XML no válido para la definición de la vista!"
 
 #. module: account_cancel
 #: model:ir.module.module,description:account_cancel.module_meta_information
@@ -30,8 +30,13 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Módulo agrega el campo 'Permitir la cancelación de entradas' en vista de "
+"formulario de account Journal. Si se establece en VERDADERO, permite a los "
+"usuarios cancelar las entradas y las facturas\n"
+"    "
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
 msgid "Account Cancel"
-msgstr ""
+msgstr "Cancelar cuenta"
diff --git a/addons/account_chart/i18n/eu.po b/addons/account_chart/i18n/eu.po
new file mode 100644
index 00000000000..ed5e94e1f73
--- /dev/null
+++ b/addons/account_chart/i18n/eu.po
@@ -0,0 +1,23 @@
+# Basque translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-06 09:31+0000\n"
+"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Kontabilitate-plan minimoa kendu"
diff --git a/addons/account_coda/i18n/de.po b/addons/account_coda/i18n/de.po
new file mode 100644
index 00000000000..41b4e0f2ef3
--- /dev/null
+++ b/addons/account_coda/i18n/de.po
@@ -0,0 +1,166 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:11+0000\n"
+"PO-Revision-Date: 2010-10-05 13:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
diff --git a/addons/account_reporting/i18n/nl.po b/addons/account_reporting/i18n/nl.po
index b4a08c06f9f..4ed85667eba 100644
--- a/addons/account_reporting/i18n/nl.po
+++ b/addons/account_reporting/i18n/nl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-28 21:16+0000\n"
-"Last-Translator: Freerk Kalsbeek (Mindswitch BV) <f.kalsbeek@mindswitch.nl>\n"
+"PO-Revision-Date: 2010-10-06 17:30+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -57,7 +57,7 @@ msgstr "Balans rapportage"
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 5a3dfe7c3ee..a1ddddebc4d 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-07 16:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
 msgid "Opening Balance Entry"
-msgstr ""
+msgstr "Zapis bilansu otwarcia"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
 msgid "Bank Receipts"
-msgstr ""
+msgstr "Potwierdzenia banku"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -36,18 +36,18 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "State :"
-msgstr ""
+msgstr "Stan :"
 
 #. module: account_voucher
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Odn. :"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -61,7 +61,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -79,7 +79,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Ustaw na projekt"
 
 #. module: account_voucher
 #: wizard_button:account.voucher.open,init,open:0
@@ -94,13 +94,13 @@ msgstr ""
 #. module: account_voucher
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "Suma Ma"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
 #: field:account.voucher.line,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -110,47 +110,47 @@ msgstr ""
 #. module: account_voucher
 #: field:account.account,level:0
 msgid "Level"
-msgstr ""
+msgstr "Poziom"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Pozycja zapisu na koncie"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Suma Winien"
 
 #. module: account_voucher
 #: field:account.voucher,amount:0
 #: field:account.voucher.line,amount:0
 #: rml:voucher.cash_amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Kwota"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "Podpis odbiorcy"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "No."
-msgstr ""
+msgstr "Nr"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Kwota (słownie)"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analityczne"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 msgid "Account :"
-msgstr ""
+msgstr "Konto :"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -189,18 +189,18 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Create"
-msgstr ""
+msgstr "Utwórz"
 
 #. module: account_voucher
 #: selection:account.account,type1:0
 #: selection:account.account.template,type1:0
 msgid "None"
-msgstr ""
+msgstr "Brak"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr ""
+msgstr "Numer"
 
 #. module: account_voucher
 #: view:account.move:0
@@ -215,13 +215,13 @@ msgstr "Województwo"
 #: selection:account.voucher.line,type:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Debit"
-msgstr ""
+msgstr "Winien"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 #: field:account.voucher.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
@@ -262,12 +262,12 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Dated :"
-msgstr ""
+msgstr "Datowane :"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
 msgid "Cash Receipts"
-msgstr ""
+msgstr "Potwierdzenia wpłaty"
 
 #. module: account_voucher
 #: field:account.voucher,partner_id:0
@@ -278,7 +278,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
 msgid "New Bank Payment"
-msgstr ""
+msgstr "Nowa płatność"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -289,7 +289,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 #. module: account_voucher
 #: view:account.move:0
@@ -297,7 +297,7 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher,narration:0
 msgid "Narration"
-msgstr ""
+msgstr "Opis"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
@@ -307,7 +307,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
 msgid "New Cash Receipt"
-msgstr ""
+msgstr "Nowe potwierdzenie wpłaty"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
@@ -317,7 +317,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.account,open_bal:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Bilans otwarcia"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -325,7 +325,7 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Draft"
-msgstr ""
+msgstr "Projekt"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -336,17 +336,17 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Potwierdzenie wpłaty"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
 msgid "New Cash Payment"
-msgstr ""
+msgstr "Nowa płatność gotówkowa"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Informacje dodatkowe"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -356,7 +356,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -368,7 +368,7 @@ msgstr ""
 #: field:account.account,type1:0
 #: field:account.account.template,type1:0
 msgid "Dr/Cr"
-msgstr ""
+msgstr "Wn/Ma"
 
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
@@ -387,7 +387,7 @@ msgstr ""
 #: selection:account.voucher.line,type:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Credit"
-msgstr ""
+msgstr "Ma"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -398,7 +398,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Typ odnośnika"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher
@@ -408,22 +408,22 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Okres"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
 msgid "Bank Payments"
-msgstr ""
+msgstr "Płatności do banku"
 
 #. module: account_voucher
 #: view:account.move:0
 msgid "General Information"
-msgstr ""
+msgstr "Informacje ogólne"
 
 #. module: account_voucher
 #: wizard_field:account.voucher.open,init,period_ids:0
 msgid "Periods"
-msgstr ""
+msgstr "Okresy"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -431,7 +431,7 @@ msgstr ""
 #: wizard_button:account.voucher.open,init,end:0
 #: selection:account.voucher.open,init,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Info"
-msgstr ""
+msgstr "Inne informacje"
 
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
@@ -472,13 +472,13 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Canceled"
-msgstr ""
+msgstr "Anulowano"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -493,7 +493,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Potwierdzenie bankowe"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
@@ -513,12 +513,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.account:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Bilans zamknięcia"
 
 #. module: account_voucher
 #: field:account.voucher.line,ref:0
 msgid "Ref."
-msgstr ""
+msgstr "Odn."
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -526,12 +526,12 @@ msgstr ""
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Posted"
-msgstr ""
+msgstr "Zaksięgowano"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #. module: account_voucher
 #: field:account.voucher,move_ids:0
@@ -546,12 +546,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "Zapis na koncie"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Entry Lines"
-msgstr ""
+msgstr "Pozycje zapisu"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
new file mode 100644
index 00000000000..b625d0b9ecd
--- /dev/null
+++ b/addons/base_calendar/i18n/de.po
@@ -0,0 +1,1540 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:50+0000\n"
+"PO-Revision-Date: 2010-10-05 13:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Hourly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Select data for Custom Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"defines a rule or repeating pattern for an exception to a recurrence set"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+#, python-format
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select data for ExRule"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "ExRule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Custom"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po
new file mode 100644
index 00000000000..127595af75a
--- /dev/null
+++ b/addons/base_iban/i18n/eu.po
@@ -0,0 +1,64 @@
+# Basque translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-06 09:51+0000\n"
+"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_iban
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML ezegokia Ikuspegi Arkitekturarako!"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "Posta kodea"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Banku Kontu Internazionalaren IBAN Zenbakia"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "Herrialdea"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bic"
+msgstr ""
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
+msgid "iban"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "IBAN Kontua"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
+msgid "acc_number"
+msgstr "Kontu zenbakia"
diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po
index 480de0ab8b6..f3255b12f65 100644
--- a/addons/base_module_quality/i18n/nl.po
+++ b/addons/base_module_quality/i18n/nl.po
@@ -8,36 +8,36 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-07 11:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-06 17:56+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "Eindscore (%)"
 
 #. module: base_module_quality
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality"
-msgstr ""
+msgstr "Basis module kwaliteit"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
 msgid "Rated Module"
-msgstr ""
+msgstr "Beoordeelde module"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -47,22 +47,22 @@ msgstr "Detail"
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notitie"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "Weging"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -70,17 +70,19 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
+"Sommige tests zijn kritischer dan anderen, waardoor ze een hogere weging "
+"hebben in de berekening van de eindscore."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "Tests"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Overgeslagen"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -88,41 +90,43 @@ msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
 msgstr ""
+"De test wordt alleen afgerond als de module is geïnstalleerd of als de test "
+"mag worden uitgevoerd op niet-geïnstalleerde module."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
 msgid "module.quality.check"
-msgstr ""
+msgstr "module.quality.check"
 
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Rapport opslaan"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Bestandsnaam"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "Score (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Rapport opslaan in .html formaat"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -133,32 +137,32 @@ msgstr "Samenvatting"
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "Rapport opslaan"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Standaard regels"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Rapport opslaan"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 msgid "Quality Check"
-msgstr ""
+msgstr "Kwaliteitscontrole"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr ""
+msgstr "module.quality.detail"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Klaar"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -169,12 +173,12 @@ msgstr "Resultaat"
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Bericht"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po
index a5700cdbfce..efb8c5644a1 100644
--- a/addons/base_module_record/i18n/nl.po
+++ b/addons/base_module_record/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:15+0000\n"
-"Last-Translator: Freerk Kalsbeek (Mindswitch BV) <f.kalsbeek@mindswitch.nl>\n"
+"PO-Revision-Date: 2010-10-06 17:28+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -44,7 +44,7 @@ msgstr ""
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr ""
+msgstr "Kies de op te nemen objecten"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
@@ -61,13 +61,13 @@ msgstr "Mapnaam"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr ""
+msgstr "Alleen opname bij"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Demogegevens"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
@@ -84,12 +84,12 @@ msgstr "Versie"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Objects Recording"
-msgstr ""
+msgstr "Objecten opname"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "Opnemen vanaf datum"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -118,7 +118,7 @@ msgstr "Module Opnemen"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr ""
+msgstr "Exporteer aanpassingen als een module"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -129,18 +129,18 @@ msgstr "Bijvoorbaat dank voor uw bijdrage."
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr ""
+msgstr "Lijst van objecten die opgenomen moeten worden"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
 msgid "Start Recording"
-msgstr "Starten met opnemen"
+msgstr "Opname starten"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr ""
+msgstr "Geen opname"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
@@ -157,7 +157,7 @@ msgstr "Module Naam"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
 msgid "Objects"
-msgstr ""
+msgstr "Objecten"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
@@ -184,18 +184,18 @@ msgstr "Opname beëindigd"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr ""
+msgstr "Aangemaakt"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
 #: wizard_view:base_module_record.module_save,end:0
 msgid "Thanks For using Module Recorder"
-msgstr ""
+msgstr "Bedankt voor het gebruik van de modulerecorder"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record,start,continue:0
 msgid "Continue Previous Session"
-msgstr "Doorgaan met vorrige sessie"
+msgstr "Doorgaan met vorige sessie"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,website:0
@@ -206,17 +206,17 @@ msgstr "Documentatie URL"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr ""
+msgstr "Gewijzigd"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr ""
+msgstr "Bezig met opnemen"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
 msgid "Record"
-msgstr ""
+msgstr "Opnemen"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,stop,end:0
@@ -230,19 +230,19 @@ msgstr "Doorgaan"
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr ""
+msgstr "Module opname"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "Normale gegevens"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
 #: wizard_button:base_module_record.module_save,end,end:0
 msgid "OK"
-msgstr ""
+msgstr "Ok"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -252,6 +252,9 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Als U denkt dat de module interessant is voor anderen, kunt U deze module "
+"publiceren op OpenERP.com in de 'Modules'-sectie. U kunt dit via de website "
+"doen of gebruik maken van de 'base_module_publish' module."
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -260,6 +263,9 @@ msgid ""
 "ERP client and save them as a module. You will be able to install this "
 "module on any database to reuse and/or publish it."
 msgstr ""
+"Deze module opname laat u elke gemaakte bewerking in de Open ERP client "
+"opnemen en ze opslaan als een module. U kunt deze module installeren in elke "
+"database voor hergebruik of publicatie."
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
@@ -269,7 +275,7 @@ msgstr "Module opnemen"
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "Module aanmaken"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -284,7 +290,7 @@ msgstr ""
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
 #: wizard_field:base_module_record.module_save,info,data_kind:0
 msgid "Type of Data"
-msgstr "Soort Data"
+msgstr "Soort gegevens"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,intro:0
@@ -303,6 +309,7 @@ msgstr "Opgenomen Module Opslaan"
 msgid ""
 "Open ERP recording is stopped. Don't forget to save the recorded module."
 msgstr ""
+"OpenERP opname is gestopt. Vergeet niet de opgenomen module op te slaan."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -322,7 +329,7 @@ msgstr "Afsluiten"
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "Aangemaakt en gewijzigd"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po
new file mode 100644
index 00000000000..0c74a4f7195
--- /dev/null
+++ b/addons/base_vat/i18n/eu.po
@@ -0,0 +1,40 @@
+# Basque translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-06 09:35+0000\n"
+"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid ""
+"Enable the VAT Number for the partner. Check the validity of that VAT Number."
+msgstr ""
+"Kidearentzako BEZ Zenbakia gaitu. BEZ Zenbakiaren egokitasuna egiaztatu."
+
+#. module: base_vat
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML ezegokia Ikuspegi Arkitekturarako!"
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr ""
+
+#. module: base_vat
+#: model:ir.module.module,shortdesc:base_vat.module_meta_information
+msgid "VAT"
+msgstr "BEZ"
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index 56340d82ba1..f5e0db90261 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-04 16:07+0000\n"
+"PO-Revision-Date: 2010-10-05 07:25+0000\n"
 "Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/claim_from_delivery/i18n/nl.po b/addons/claim_from_delivery/i18n/nl.po
index deb23ba6816..a30269ad2b4 100644
--- a/addons/claim_from_delivery/i18n/nl.po
+++ b/addons/claim_from_delivery/i18n/nl.po
@@ -8,52 +8,53 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:02+0000\n"
-"PO-Revision-Date: 2010-09-20 07:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-07 05:54+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim"
-msgstr ""
+msgstr "Klacht"
 
 #. module: claim_from_delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: claim_from_delivery
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
 msgid "Create Claim from delivery order:\n"
-msgstr ""
+msgstr "Maak klacht over levering:\n"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
-msgstr ""
+msgstr "Klacht over levering"
 
 #. module: claim_from_delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: claim_from_delivery
 #: model:ir.model,name:claim_from_delivery.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Pakbon"
 
 #. module: claim_from_delivery
 #: field:stock.picking,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index da1789b3b30..f8e168df0cf 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-29 09:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-06 12:16+0000\n"
+"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.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: 2010-09-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1442,7 +1442,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr "Tirocini"
+msgstr "Fasi"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index a41b9c7945e..6a3af2858cc 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-02 07:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-07 17:37+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -137,7 +137,7 @@ msgstr "Bedrag"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr "Normale- of telefonische bespreking voor kans"
+msgstr "Gewoon of telefonisch verkoopgesprek"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim2
@@ -174,18 +174,18 @@ msgstr "Zoek kansen"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Dossiers op sectie en fase"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Duur (uren)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "TRANSPARANT"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
@@ -193,6 +193,8 @@ msgid ""
 "Describes the action name.eg:on which object which ation to be taken on "
 "basis of which condition"
 msgstr ""
+"Beschrijft de actie naam. ie: op welk object welke actie op basis van welke "
+"voorwaarde plaats moet vinden"
 
 #. module: crm
 #: help:crm.case,section_id:0
@@ -200,6 +202,8 @@ msgid ""
 "Section to which Case belongs to. Define Responsible user and Email account "
 "for mail gateway."
 msgstr ""
+"Sectie waar dossier toe behoort. Definieer verantwoordelijke gebruiker en "
+"Email account voor mail gateway."
 
 #. module: crm
 #: view:crm.case:0
@@ -233,12 +237,12 @@ msgstr "Dossiersectie"
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Voorgesteld salaris"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
-msgstr ""
+msgstr "Bepaalt de volgorde waarin dossier secties worden afgebeeld."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -246,12 +250,12 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefoongesprek"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "Dossiers op sectie en fase"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -276,7 +280,7 @@ msgstr "Speciale sleutelwoorden die in het bericht kunnen worden gebruikt"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Verstuur nieuwe email"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -297,12 +301,12 @@ msgstr "Secties"
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Volgt herkende kansen voor uw verkooppijplijn."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Uitzonderingsdata"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -312,17 +316,17 @@ msgstr "Datum laatste actie"
 #. module: crm
 #: view:crm.job:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Waardering"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Tweede gesprek"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr ""
+msgstr "Abonneer op een kalender op afstand"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -334,7 +338,7 @@ msgstr "Categorieën"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Waarschuwing!"
 
 #. module: crm
 #: view:crm.case:0
@@ -354,24 +358,24 @@ msgstr "Segmentatietest"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Prospect naar relatie"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Informatieomschrijving"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Naam contactpersoon"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Koppel aan bestaande relatie"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
@@ -386,27 +390,27 @@ msgstr "Soort vertraging"
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Contactpersoon"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Volgend gesprek"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Reguliere expresse op dossier historie"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_email_add_cc
 msgid "Email Add CC"
-msgstr ""
+msgstr "Email voeg CC toe"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Verkoopkansbespreking"
 
 #. module: crm
 #: help:crm.case,canal_id:0
@@ -415,11 +419,14 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
 msgstr ""
+"De kanalen geven de verschillende beschikbare communicatie vormen met de "
+"klant weer. Met elke verkoopkans kunt u aangeven welk communicatiekanaal de "
+"bron van de kans is."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Uitzondering regels"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
@@ -430,7 +437,7 @@ msgstr "Zakelijke kansen"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Geaccepteerd als klacht"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -455,18 +462,18 @@ msgstr "%(email_from)s = Emailadres relatie"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Beëindigd"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Bevestig afspraak"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Bestaande klant"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
@@ -490,7 +497,7 @@ msgstr "Categorie"
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Dossiers op sectie, categorie en fase"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -498,11 +505,13 @@ msgid ""
 "Check this if you want the rule to mark CC(mail to any other person defined "
 "in actions)."
 msgstr ""
+"Vink aan als u wilt dat de regel CC markeert (mail naar een andere in de "
+"acties gedefinieerde persoon)."
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacy"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -561,7 +570,7 @@ msgstr "Status"
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Maak verkoopkans"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -569,12 +578,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Afsprakenboom"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -591,7 +600,7 @@ msgstr "Escaleren"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Alle afspraken"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -602,7 +611,7 @@ msgstr "Customer & Supplier Relationship Management"
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Voeg CC toe"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -610,7 +619,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -620,7 +629,7 @@ msgstr "Standaard (0=Geen)"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Geweigerd door bedrijf"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
@@ -638,12 +647,12 @@ msgstr "Sta verwijderen toe"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
 msgid "Value Proposition"
-msgstr ""
+msgstr "Waarde voorstel"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -653,17 +662,17 @@ msgstr "%(case_id)s = Dossier-ID"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Nieuwe zaken"
 
 #. module: crm
 #: help:crm.case,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Deze personen ontvangen email."
 
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Kalender tonen toegestaan"
 
 #. module: crm
 #: view:crm.job:0
@@ -671,13 +680,13 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Vandaag   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Omschrijving telefoongesprek"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -697,7 +706,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Procedurele klachten"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -713,7 +722,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -723,12 +732,12 @@ msgstr "Gebeurtenissen relatie"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job4
 msgid "Contract Proposed"
-msgstr ""
+msgstr "Contract aangeboden"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Werving- & selectieproces"
 
 #. module: crm
 #: view:crm.case:0
@@ -736,7 +745,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Gerelateerde dossiers"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -744,7 +753,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm
 #: view:crm.case:0
@@ -759,33 +768,33 @@ msgstr "Communicatiegeschiedenis"
 #. module: crm
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Nieuwe klachten"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Afsprakenformulier"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Onderhandeling/evaluatie"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Er is al een relatie voor dit telefoongesprek gedefinieerd."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Dossiers op verkoopkans en fase"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Klachtdatum"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -795,12 +804,12 @@ msgstr "Segmentatieregels relatie"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Alle leads"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Leadsformulier"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -811,17 +820,17 @@ msgstr "Segmentatie relaties"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Contract getekend"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Subscribe to Remote ICS"
-msgstr ""
+msgstr "Abonneer op remote ICS"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Bestaande zaken"
 
 #. module: crm
 #: field:crm.case,probability:0
@@ -832,7 +841,7 @@ msgstr "Waarschijnlijkheid (%)"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Leads Cases"
-msgstr ""
+msgstr "Leads dossiers"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -859,7 +868,7 @@ msgstr "Dossierregel"
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Verkoopkans"
 
 #. module: crm
 #: view:crm.case:0
@@ -869,12 +878,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisie"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -884,18 +893,18 @@ msgstr "Stop proces"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Feitelijke klachten"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Zoek telefoongesprekken"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "Doorgaan"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -910,13 +919,13 @@ msgstr "Waarde"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Opslaan in .ics formaat"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Bericht"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -940,6 +949,8 @@ msgid ""
 "Category related to the section.Subdivide the CRM cases independently or "
 "section-wise."
 msgstr ""
+"Categorie gerelateerd aan de sectie. Verdeel de dossiers onafhankelijk of "
+"sectie-gewijs onder."
 
 #. module: crm
 #: field:crm.case.rule,act_state:0
@@ -950,17 +961,17 @@ msgstr "Status wijzigen in"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr ""
+msgstr "Email!"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
 msgid "crm.opportunity.assign_wizard"
-msgstr ""
+msgstr "crm.opportunity.assign_wizard"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -975,12 +986,13 @@ msgstr "Activeringsdatum"
 #. module: crm
 #: view:crm.case.history:0
 msgid "Search Histories"
-msgstr ""
+msgstr "Zoek historie"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
 msgstr ""
+"Bepaalt de volgorde bij het afbeelden van de lijst van dossier fases."
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support3
@@ -988,7 +1000,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Verkoopkansen"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -1014,7 +1026,7 @@ msgstr "Inkoophoeveelheid"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "Richting"
 
 #. module: crm
 #: help:crm.case,email_cc:0
@@ -1023,6 +1035,8 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Deze personen krijgen via email een kopie van toekomstige communicatie "
+"tussen relatie en gebruikers"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -1030,12 +1044,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Server actie om te activeren"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_rule-act
@@ -1047,18 +1061,18 @@ msgstr "Regels"
 #: wizard_view:crm.job.meeting_set,init:0
 #: wizard_view:crm.phonecall.meeting_set,init:0
 msgid "Plan Meeting"
-msgstr ""
+msgstr "Afspraak plannen"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Zet status op"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Er is geen mail te beantwoorden!"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1068,7 +1082,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Maak relatie"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1083,12 +1097,12 @@ msgstr "%(case_description)s = Omschrijving dossier"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Mijn  fondsen"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobiel"
 
 #. module: crm
 #: field:crm.case.rule,name:0
@@ -1109,12 +1123,12 @@ msgstr "Geschiedenis dossier"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Junior ontwikkelaar"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Mijn afspraken"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1124,7 +1138,7 @@ msgstr "Categorienaam dossier"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventief"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1134,7 +1148,7 @@ msgstr "Toeschouwers toevoegen (Cc)"
 #. module: crm
 #: wizard_view:caldav.crm.export,init:0
 msgid "Export ICS"
-msgstr ""
+msgstr "Export ICS"
 
 #. module: crm
 #: code:addons/crm/crm_claim.py:0
@@ -1144,7 +1158,7 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "U kunt een gesloten dossier niet toewijzen."
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
@@ -1160,7 +1174,7 @@ msgstr "Aanvinken als u wilt dat de regel de relatie een herinnering emailt."
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Afspraken"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1185,12 +1199,12 @@ msgstr "Deadline"
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuleren"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Categorienaam"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1200,7 +1214,7 @@ msgstr "Relatiesegmenten"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Rule"
-msgstr ""
+msgstr "Herhalingsregel"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
@@ -1214,12 +1228,12 @@ msgstr "Dossiercategorie"
 #: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Onderwerp"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr ""
+msgstr "Deelnemers"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1272,27 +1286,27 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Prospect word omgezet naar relatie"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Case Name"
-msgstr ""
+msgstr "Regex op Dossiernaam"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "Wachtende klachten"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Dossiers op verkoopkans, categorie en fase"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Afdrukken"
 
 #. module: crm
 #: field:crm.case,som:0
@@ -1307,12 +1321,12 @@ msgstr "Loyaliteit"
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Soort"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Refused"
-msgstr ""
+msgstr "Kandidaat afgewezen"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1322,7 +1336,7 @@ msgstr "Bereken segmentatie"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Email"
-msgstr ""
+msgstr "Lead Email"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
@@ -1342,7 +1356,7 @@ msgstr "Aanmaakdatum"
 #: view:crm.phonecall:0
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "Afspraak"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1363,12 +1377,12 @@ msgstr "Terugzetten naar Concept"
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
 msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Dossiers op sectie, categorie en categorie2"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
 msgid "Closed Won"
-msgstr ""
+msgstr "Gesloten gewonnen"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1387,7 +1401,7 @@ msgstr "Open dossiers"
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm
 #: constraint:ir.ui.view:0
@@ -1400,48 +1414,51 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "section without removing it."
 msgstr ""
+"Als het actief veld niet aanzet, kunt u het dossier sectie verbergen zonder "
+"het te verwijderen."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Leren en onderwijs"
 
 #. module: crm
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this phonecall ?"
 msgstr ""
+"Weet u zeker dat u een relatie wilt maken op basis van dit telefoongesprek?"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Fasen"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Verwachte omzet"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting Date"
-msgstr ""
+msgstr "Afspraakdatum"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Partner"
-msgstr ""
+msgstr "Omzetten naar relatie"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr ""
+msgstr "Volgende afspraken"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1457,7 +1474,7 @@ msgstr "Het dossier kan niet worden verwijderd. Annuleren is wel mogelijk."
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Abonneren"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_from:0
@@ -1467,27 +1484,27 @@ msgstr "Minimum prioriteit"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
 msgid "Meeting Generic Wizard"
-msgstr ""
+msgstr "Generieke afspraak wizard"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Waarde klachten"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "Bericht..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
 msgid "crm.phonecall.assign_wizard"
-msgstr ""
+msgstr "crm.phonecall.assign_wizard"
 
 #. module: crm
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Dossiers op sectie en categorie2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1499,7 +1516,7 @@ msgstr "klaar"
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "Herinnering"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1526,7 +1543,7 @@ msgstr "Herinner met bijlage"
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "Website"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
@@ -1544,11 +1561,13 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Helpt u bij het organiseren van het personeel aanname proces: evaluatie, "
+"afspraken, email integratie..."
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds"
-msgstr ""
+msgstr "Fondsen"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1560,7 +1579,7 @@ msgstr "concept"
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Wacht op reactie"
 
 #. module: crm
 #: field:crm.case,date:0
@@ -1574,23 +1593,23 @@ msgstr "Datum"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name"
-msgstr ""
+msgstr "Naam kandidaat"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead2
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Self Generated"
-msgstr ""
+msgstr "Zelf gegenereerd"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Niet oplosbaar"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Converted"
-msgstr ""
+msgstr "Geconverteerd"
 
 #. module: crm
 #: view:crm.case:0
@@ -1600,7 +1619,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "Beantwoordt laatste Email"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1610,7 +1629,7 @@ msgstr "Omschrijving"
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Geeft locatie van de afspraak"
 
 #. module: crm
 #: view:crm.case:0
@@ -1625,17 +1644,17 @@ msgstr "Historie"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "Banendossiers"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Tree"
-msgstr ""
+msgstr "Wervingsboom"
 
 #. module: crm
 #: field:crm.case.rule,regex_name:0
 msgid "Regular Expression on Case Name"
-msgstr ""
+msgstr "Reguliere expressie op dossiernaam"
 
 #. module: crm
 #: field:crm.case,state:0
@@ -1644,7 +1663,7 @@ msgstr ""
 #: field:report.crm.case.section.categ2,state:0
 #: field:report.crm.case.section.stage,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: crm
 #: view:crm.case:0
@@ -1700,17 +1719,17 @@ msgstr "Geen email-ID gevonden voor uw bedrijfsadres!"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "Zoek fondsen"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of claim"
-msgstr ""
+msgstr "Soort klacht"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Helpdesk Support"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -1720,18 +1739,18 @@ msgstr "Algemene omschrijving"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Other Info"
-msgstr ""
+msgstr "Overige informatie"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim Cost"
-msgstr ""
+msgstr "Kosten klacht"
 
 #. module: crm
 #: view:crm.job:0
 #: view:crm.opportunity:0
 msgid "Schedule a Phone Call"
-msgstr ""
+msgstr "Plan een telefoongesprek"
 
 #. module: crm
 #: field:crm.case,ref:0
@@ -1741,17 +1760,18 @@ msgstr "Referentie"
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Uitzondering regel"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
 msgstr ""
+"Vink aan als u wilt dat de regel een email naar de relatie verstuurt."
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
 msgid "Mail"
-msgstr ""
+msgstr "Mail"
 
 #. module: crm
 #: field:crm.case.rule,act_priority:0
@@ -1761,12 +1781,12 @@ msgstr "Prioriteit wijzigen in"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor2
 msgid "Needs Analysis"
-msgstr ""
+msgstr "Behoeftebepaling"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Zoek Klachten"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_body:0
@@ -1776,7 +1796,7 @@ msgstr "E-mail berichttekst"
 #. module: crm
 #: help:crm.menu.config_wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
-msgstr ""
+msgstr "Beheert de afsprakenagenda van de gebruikers."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1791,7 +1811,7 @@ msgstr "Verkoopbedrag"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Add a CC"
-msgstr ""
+msgstr "Voeg een CC toe"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1809,23 +1829,23 @@ msgstr "Naam"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage"
-msgstr ""
+msgstr "Verkoopfase"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
 msgid "Mail to watchers (CC)"
-msgstr ""
+msgstr "Mail aan toeschouwers (CC)"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.meeting:0
 msgid "Next Meeting"
-msgstr ""
+msgstr "Volgende afspraak"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -1845,12 +1865,12 @@ msgstr "Staat toe om niet-concept dossiers te verwijderen"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor7
 msgid "Closed Lost"
-msgstr ""
+msgstr "Gesloten verloren"
 
 #. module: crm
 #: field:crm.menu.config_wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Volgen foutrapporten"
 
 #. module: crm
 #: view:crm.case:0
@@ -1874,22 +1894,22 @@ msgstr "Hoog"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Converteer naar prospect naar zakenrelatie"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "In Progress Claims"
-msgstr ""
+msgstr "Lopende klachten"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
 msgid "Set RRULE"
-msgstr ""
+msgstr "Zet RRULE"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
 msgid "Proposal/Price Quote"
-msgstr ""
+msgstr "Voorstel/prijsopgave"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1899,12 +1919,12 @@ msgstr "Vertraging na triggerdatum"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead5
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Campaign Type"
-msgstr ""
+msgstr "Soort campagne"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1916,12 +1936,12 @@ msgstr "Berekening loyaliteit"
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting_generic_wizard
 msgid "crm.meeting.generic_wizard"
-msgstr ""
+msgstr "crm.meeting.generic_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
@@ -1940,6 +1960,8 @@ msgid ""
 "Note that you can also use the calendar view to graphically schedule your "
 "next meeting."
 msgstr ""
+"Merk op dat u de kalender-weergave ook kunt gebruiken om grafisch uw "
+"volgende afspraak te plannen."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2080,7 +2102,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Omzetten naar verkoopkans"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone2
@@ -2156,6 +2178,9 @@ msgid ""
 "need a delay before the trigger date, like sending a reminder 15 minutes "
 "before a meeting."
 msgstr ""
+"Vertraging na activeringsdatum, geeft aan dat u een negatief getal kunt "
+"gebruiken als u vertraging vóór de activeringsdatum wilt gebruiken, zoals "
+"een herinnering sturen 15 minuten voor een afspraak."
 
 #. module: crm
 #: view:crm.claim:0
@@ -2172,7 +2197,7 @@ msgstr "Sectie dossier"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Plan een gewone of telefonische afspraak"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2270,7 +2295,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
 msgid "Meeting Cases"
-msgstr ""
+msgstr "Afspraak dossiers"
 
 #. module: crm
 #: view:crm.job:0
@@ -2280,7 +2305,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Cancel Meeting"
-msgstr ""
+msgstr "Afspraak annuleren"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
@@ -2316,7 +2341,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
 msgid "Opportunity Cases"
-msgstr ""
+msgstr "Verkoopkans dossiers"
 
 #. module: crm
 #: view:crm.case:0
@@ -2451,7 +2476,7 @@ msgstr "annuleren"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Interne bespreking"
 
 #. module: crm
 #: view:crm.case:0
@@ -2485,7 +2510,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Klant afspraak"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
@@ -2607,7 +2632,7 @@ msgstr ""
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Wanneer een echt project/verkoopkans is ontdekt"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2779,12 +2804,12 @@ msgstr ""
 #: wizard_button:crm.job.meeting_set,init,order:0
 #: wizard_button:crm.phonecall.meeting_set,init,order:0
 msgid "Set Meeting"
-msgstr ""
+msgstr "Afspraak vastleggen"
 
 #. module: crm
 #: field:crm.menu.config_wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Afsprakenagenda"
 
 #. module: crm
 #: view:crm.case:0
@@ -2819,7 +2844,7 @@ msgstr "Maximale communicatiegeschiedenis"
 #. module: crm
 #: view:crm.lead:0
 msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Afspraak voor leads-generatie"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
@@ -2951,7 +2976,7 @@ msgstr "Log historie"
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Samenvatting verkoopkans"
 
 #. module: crm
 #: view:crm.case:0
@@ -3047,7 +3072,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Zoek afspraken"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
@@ -3167,7 +3192,7 @@ msgstr ""
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Naam verkoopkans"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
@@ -3326,7 +3351,7 @@ msgstr "Wachtend"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Verkoopkans prospect"
 
 #. module: crm
 #: view:crm.job:0
@@ -3373,7 +3398,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Omzetten naar verkoopkans"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
@@ -3408,7 +3433,7 @@ msgstr "Maak verantwoordelijk"
 #. module: crm
 #: view:crm.job:0
 msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Afspraak met kandidaten"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3495,7 +3520,7 @@ msgstr "Verkoop Inkoop"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Afspraak plannen"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
@@ -3755,7 +3780,7 @@ msgstr "Sectiecode"
 #: wizard_field:crm.job.meeting_set,init,date:0
 #: wizard_field:crm.phonecall.meeting_set,init,date:0
 msgid "Meeting date"
-msgstr ""
+msgstr "Afspraakdatum"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3882,7 +3907,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Plan een afspraak"
 
 #. module: crm
 #: view:crm.case.rule:0
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 324e9b4c92a..de78871a520 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-09-29 11:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-06 13:24+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1530,7 +1530,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
 msgid "Remind with attachment"
-msgstr "Przpomnij z załącznikiem"
+msgstr "Przypomnij z załącznikiem"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead6
@@ -1541,7 +1541,7 @@ msgstr "Strona WWW"
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
 msgid "Remind responsible"
-msgstr "Przpomnij odpowiedzialnym"
+msgstr "Przypomnij odpowiedzialnym"
 
 #. module: crm
 #: field:crm.segmentation,state:0
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 9ad2985572e..4bd3ef9718e 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-04 19:00+0000\n"
+"PO-Revision-Date: 2010-10-05 07:25+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@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: 2010-10-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_claim/i18n/de.po b/addons/crm_claim/i18n/de.po
new file mode 100644
index 00000000000..1b8de0de193
--- /dev/null
+++ b/addons/crm_claim/i18n/de.po
@@ -0,0 +1,764 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 12:07+0000\n"
+"PO-Revision-Date: 2010-10-05 13:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_claim
+#: field:crm.claim,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: crm_claim
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "This Year"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Cases"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,canal_id:0
+msgid ""
+"The channels represent the different communicationmodes available with the "
+"customer. With each commercial opportunity, you can indicate thecanall which "
+"is this opportunity source."
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,type_id:0
+#: field:crm.claim.report,type_id:0
+msgid "Claim Type"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: field:crm.claim.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_claim
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Stage: "
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,canal_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_resource_act
+msgid "Claim Resource Type"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Status and Categorization"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_claim
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.module.module,shortdesc:crm_claim.module_meta_information
+msgid "Customer & Supplier Relationship Management"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Type of Action"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_claim_type_act
+msgid "Resource Type"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid ""
+"\n"
+"This modules allows you to track your customers/suppliers claims and "
+"flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Date"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim4
+msgid "Invalid"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+msgid "Claims"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Info"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_claim
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Date of Claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Details"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+msgid "Report a Claim"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_name:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "This Month"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication history"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "References"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr ""
diff --git a/addons/crm_fundraising/i18n/de.po b/addons/crm_fundraising/i18n/de.po
new file mode 100644
index 00000000000..f6b650c65a4
--- /dev/null
+++ b/addons/crm_fundraising/i18n/de.po
@@ -0,0 +1,744 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 12:29+0000\n"
+"PO-Revision-Date: 2010-10-05 13:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate                 "
+"    the canall which is this opportunity source."
+msgstr ""
+
+#. module: crm_fundraising
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "This Year"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
+msgid "CRM Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,canal_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_fundraising
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.module.module,description:crm_fundraising.module_meta_information
+msgid "Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_fundraising
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_resource_act
+msgid "Resource Type"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_fundraising
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Details"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Fundraising Type"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "This Month"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_resource_act
+msgid "Fundraising Resource Type"
+msgstr ""
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication history"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr ""
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr ""
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
new file mode 100644
index 00000000000..1ff673ad4f7
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/de.po
@@ -0,0 +1,651 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 13:01+0000\n"
+"PO-Revision-Date: 2010-10-05 13:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "This Year"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Cases"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm_helpdesk
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Won"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,canal_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.module.module,description:crm_helpdesk.module_meta_information
+msgid "Helpdesk Management"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_helpdesk
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
+msgid "CRM Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm_helpdesk
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Details"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,canal_id:0
+msgid ""
+"The channels represent the different communication  modes available with the "
+"customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "This Month"
+msgstr ""
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Lost"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication history"
+msgstr ""
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
new file mode 100644
index 00000000000..2bcc8ad61a4
--- /dev/null
+++ b/addons/document_webdav/i18n/eu.po
@@ -0,0 +1,31 @@
+# Basque translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-10-06 09:58+0000\n"
+"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Hau dokumentu kudeaketa sistema oso bat da:\n"
+"\t* WebDav Interfazea\n"
+"\t* Erabiltzaile Kautotzea\n"
+"\t* Dokumentuen Indexazioa\n"
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
new file mode 100644
index 00000000000..3f872c81b2b
--- /dev/null
+++ b/addons/email_template/i18n/de.po
@@ -0,0 +1,1229 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 05:34+0000\n"
+"PO-Revision-Date: 2010-10-05 13:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Data"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Deletion of Record failed"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "My Accounts"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number,eg:SMTP-587 "
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+msgid "E-MAIL Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Mako templates not installed"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Download Full Mail"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid "The default recipient of email.Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Mailboxes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Track campaign items"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: yourname@yourdomain.com "
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid " (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Datetime Extraction failed.Date:%s \\n                      \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The default subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"e-mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Error sending mail: %s\" % str(e)))\n"
+"        \n"
+"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"        if ids is None:\n"
+"            ids = []\n"
+"        if context is None:\n"
+"            context = {}\n"
+"        filters = [('folder', '=', 'outbox"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "File Name Pattern"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Django templates not installed"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port "
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Copy of template "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr ""
+
+#. module: email_template
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+msgid "Emails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Personal Accounts"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+"    Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+"    "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,object_name:0
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg:smtp.gmail.com "
+msgstr ""
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
+msgid "Company Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_subject:0
+msgid "Default Subject"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this if you want the outgoing e-mails to include a tracking marker "
+"that makes it possible to identify the replies an link them back to the "
+"campaign item"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "No Description"
+msgstr ""
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
new file mode 100644
index 00000000000..b80114e250a
--- /dev/null
+++ b/addons/fetchmail/i18n/de.po
@@ -0,0 +1,266 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 13:33+0000\n"
+"PO-Revision-Date: 2010-10-05 13:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree_imap
+#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree_imap
+msgid "IMAP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Reply Email"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,state:0
+msgid "State"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree
+msgid "POP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree
+#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree_pop
+#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree_pop
+msgid "Received Email History"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,type:0
+msgid "IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,type:0
+msgid "POP Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr ""
+
+#. module: fetchmail
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr ""
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index ae7e6009e84..ec87c239bcc 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -8,71 +8,72 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 13:33+0000\n"
-"PO-Revision-Date: 2010-09-10 15:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-07 20:03+0000\n"
+"Last-Translator: Wouter Schrijvers <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bevestigd"
 
 #. module: fetchmail
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De Objectnaam moet starten met x_ en mag geen speciale tekens bevatten!"
 
 #. module: fetchmail
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de actie-definiëring."
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree_imap
 #: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree_imap
 msgid "IMAP Servers"
-msgstr ""
+msgstr "IMAP Servers"
 
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Reply Email"
-msgstr ""
+msgstr "Mail beantwoorden"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Server & Login"
-msgstr ""
+msgstr "Server & Login"
 
 #. module: fetchmail
 #: field:email.server,priority:0
 msgid "Server Priority"
-msgstr ""
+msgstr "Server Prioriteit"
 
 #. module: fetchmail
 #: field:email.server,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: fetchmail
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief Menu maken."
 
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Not Confirmed"
-msgstr ""
+msgstr "Niet bevestigd"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "POP/IMAP Servers"
-msgstr ""
+msgstr "POP/IMAP Servers"
 
 #. module: fetchmail
 #: model:ir.module.module,shortdesc:fetchmail.module_meta_information
@@ -83,32 +84,32 @@ msgstr ""
 #: view:email.server:0
 #: field:email.server,note:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: fetchmail
 #: field:email.server,attach:0
 msgid "Add Attachments ?"
-msgstr ""
+msgstr "Bijlagen toevoegen ?"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Maak concept"
 
 #. module: fetchmail
 #: field:email.server,user:0
 msgid "User Name"
-msgstr ""
+msgstr "Gebruikersnaam"
 
 #. module: fetchmail
 #: field:email.server,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: fetchmail
 #: field:email.server,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -128,7 +129,7 @@ msgstr ""
 #. module: fetchmail
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -138,7 +139,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mailgate_message
@@ -149,7 +150,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree
 msgid "POP Servers"
-msgstr ""
+msgstr "POP Servers"
 
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
@@ -167,7 +168,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -177,13 +178,13 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,is_ssl:0
 msgid "SSL ?"
-msgstr ""
+msgstr "SSL ?"
 
 #. module: fetchmail
 #: selection:email.server,type:0
 #: selection:mailgate.message,type:0
 msgid "IMAP Server"
-msgstr ""
+msgstr "IMAP server"
 
 #. module: fetchmail
 #: field:email.server,object_id:0
@@ -193,7 +194,7 @@ msgstr ""
 #. module: fetchmail
 #: field:email.server,server:0
 msgid "Server"
-msgstr ""
+msgstr "Server"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -204,7 +205,7 @@ msgstr ""
 #: view:email.server:0
 #: model:ir.model,name:fetchmail.model_email_server
 msgid "POP/IMAP Server"
-msgstr ""
+msgstr "POP/IMAP Server"
 
 #. module: fetchmail
 #: constraint:ir.rule:0
@@ -225,18 +226,18 @@ msgstr ""
 #. module: fetchmail
 #: view:email.server:0
 msgid "Server Information"
-msgstr ""
+msgstr "Serverinformatie"
 
 #. module: fetchmail
 #: selection:email.server,type:0
 #: selection:mailgate.message,type:0
 msgid "POP Server"
-msgstr ""
+msgstr "POP Server"
 
 #. module: fetchmail
 #: field:email.server,port:0
 msgid "Port"
-msgstr ""
+msgstr "Poort"
 
 #. module: fetchmail
 #: model:ir.module.module,description:fetchmail.module_meta_information
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index b32f46f8c80..62910ee4680 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-04 19:23+0000\n"
-"Last-Translator: Engin BAHADIR <Unknown>\n"
+"PO-Revision-Date: 2010-10-05 07:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index c5a9123861e..44e1ca885e5 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 12:18+0000\n"
-"PO-Revision-Date: 2010-10-05 01:35+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-05 07:26+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 6f97a3150c9..4a5d88dad9d 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-05 01:41+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-05 07:25+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
new file mode 100644
index 00000000000..66f14526514
--- /dev/null
+++ b/addons/hr_payroll/i18n/de.po
@@ -0,0 +1,1438 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 13:16+0000\n"
+"PO-Revision-Date: 2010-10-05 13:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "(Based on type Payroll will calculate basic salary)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,net:0
+#: field:hr.payslip,net:0
+msgid "Net Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,working_days:0
+msgid "Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Axis Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,esp_account:0
+msgid "EPS Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,gratuity:0
+msgid "Use for Gratuity ?"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Employee No"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Salary Payment Register"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
+msgid "Year Salary Report"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Paid Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,company_id:0
+#: field:hr.payslip,company_id:0
+#: wizard_field:payroll.analysis,init,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Half-Pay Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,other_pay:0
+msgid "Others"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,slip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: rml:payslip.pdf:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Calculations Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid ""
+"\n"
+"    The Payroll system - India, Manages and depends on,\n"
+"    * HR Details\n"
+"    * HR Contracts\n"
+"    * HR Payslip\n"
+"    * HR Paysheet\n"
+"    * HR Attendance\n"
+"    * HR Holidays\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: rml:salary.structure:0
+msgid "Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Payment From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous / Statutory"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,register_id:0
+msgid "Register"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Name of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,amount:0
+#: rml:payroll.advice:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,country_id:0
+msgid "Country of Issue"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_expire:0
+msgid "Passport Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Special Allowance and Deductions for Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.holidays.status,type:0
+msgid "Un-Paid Holiday"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,type:0
+msgid "Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,analytic_account:0
+#: field:hr.employee.grade,account_id:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+#: rml:salary.structure:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Expanse To"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Bank"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,move_id:0
+msgid "Expanse Entries"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
+msgid "Human Resource Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,esi_account:0
+msgid "ESI Account"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Employee Home Address Along with Partners !!"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,total:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+msgid "By Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Employee Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+msgid "Authorised Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,umo_id:0
+msgid "Unite"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Notes:"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Amount Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,passport_id:0
+#: field:hr.employee,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,employee_id:0
+#: field:hr.payroll.advice.line,employee_id:0
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,type:0
+#: field:hr.payslip.line,type:0
+#: wizard_field:payroll.analysis,init,type:0
+#: rml:salary.structure:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Miscelleanous"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Verify Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pan_no:0
+msgid "PAN No"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:wizard.employees.detail,init,report:0
+#: wizard_button:wizard.year.salary,init,report:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Contributions Configuration"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,grows:0
+#: field:hr.payslip,grows:0
+msgid "Gross Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Other Payment"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Basic Salary - Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+msgid "Chaque Nos"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_year_salary
+msgid "Year Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Pay Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Gross SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Please defined the Partner in Home Address !!"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "For the month of"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,deduction:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,deduction:0
+#: selection:hr.payslip.line,type:0
+msgid "Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Passport List"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payment_id:0
+msgid "Payment Entries"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "YTD"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,expanse_id:0
+msgid "Expense"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "Fided Value"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan Installment"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete HR Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Allowances"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Net Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Salary Structure:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
+#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
+msgid "Employees Salary Detail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_employee_grade
+msgid "Function of the Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Others:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Passport and Visa"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: field:hr.payslip.line,amount_type:0
+#: rml:salary.structure:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: field:hr.payslip.line,category_id:0
+#: rml:salary.structure:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Total SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,hospital_id:0
+msgid "ESI Hospital"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Earnings"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
+msgid "All Passports"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payslip.pdf:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: selection:hr.payslip.line,amount_type:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,register_id:0
+#: view:hr.payroll.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
+#: model:ir.model,name:hr_payroll.model_hr_payroll_register
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:hr.payroll.register.sheet:0
+#: rml:payroll.advice:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "For"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_contract
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,contribute:0
+msgid "Contribe by Company ?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,working_days_per_week:0
+msgid "Working Days / Week"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Complete Accountant Checking"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+msgid "Title"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+msgid "On Attendance"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Allowance/Deduction Heads"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.register,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:year.salary:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for HR Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pf_account:0
+msgid "PF Account"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Compute"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: field:hr.payslip,deg_id:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "HR Manager"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.payslip,basic_before_leaves:0
+#: rml:payslip.pdf:0
+msgid "Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,code:0
+msgid "Categoty Code"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Salary Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+msgid "Allowance Deduction Categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Allowance / Deduction Category"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+msgid "Draft Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:hr.payroll.register,date:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Basic SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "Phone No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,include_in_salary:0
+msgid "Included in Salary ?"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.expense.expense,category_id:0
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,account_id:0
+#: rml:salary.structure:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.holidays.status,code:0
+#: field:hr.payslip.line,code:0
+#: rml:salary.structure:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
+#: rml:payroll.advice:0
+msgid "Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,to:0
+msgid "To"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_button:payroll.analysis,init,process:0
+msgid "Process"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.year.salary,init,salary_on:0
+msgid "Salary On"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,number:0
+#: field:hr.payroll.register,number:0
+#: rml:hr.payroll.register.sheet:0
+#: field:hr.payslip,number:0
+msgid "Number"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Contract Detail:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "General Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,line_ids:0
+#: view:hr.employee.grade:0
+#: field:hr.employee.grade,line_ids:0
+#: rml:salary.structure:0
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+#: wizard_button:payroll.analysis,init,end:0
+#: wizard_button:wizard.employees.detail,init,end:0
+#: wizard_button:wizard.year.salary,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount:0
+#: rml:salary.structure:0
+msgid "Amount / Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:wizard.year.salary,init,salary_on:0
+msgid "Current Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract Duration"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:payroll.analysis,init:0
+msgid "Process Form"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,name:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee.grade:0
+msgid "Account Information"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Generalities"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "for period"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "E-mail"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,line_ids:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.year.salary,init:0
+msgid "Salary Deposit Date Option?"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
+msgid "Dynamic Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee.grade,function_id:0
+#: field:hr.payslip.line,function_id:0
+msgid "Function"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:salary.structure:0
+msgid "PAN No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,pg_joining:0
+msgid "PF Join Date"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_view:wizard.employees.detail,init:0
+#: wizard_view:wizard.year.salary,init:0
+msgid "Year Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty,name:0
+msgid "Categoty Name"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.wizard,name:hr_payroll.wizard_payroll_analysis
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_payroll_analysis
+msgid "Create Analytic Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payslip.pdf:0
+#: rml:salary.structure:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Configure Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Cancel Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,type:0
+msgid "Advance"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:salary.structure:0
+msgid "Special Allowances and Deductions For Employee:"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:hr.payroll.advice,name:0
+#: field:hr.payroll.register,name:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip.line,name:0
+#: rml:salary.structure:0
+#: rml:year.salary:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leaved Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Statutory Information"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
+msgid "Employee Functions"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,employee_ids:0
+#: wizard_field:wizard.year.salary,init,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,property_bank_account:0
+#: rml:payroll.advice:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: wizard_field:wizard.employees.detail,init,fiscalyear_id:0
+#: wizard_field:wizard.year.salary,init,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:payroll.analysis,init,type:0
+msgid "By Allownce / Deduction"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Payroll Configurtion"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.passport,date_issue:0
+msgid "Passport Issue Date"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
+#: field:hr.payroll.register,allounce:0
+#: field:hr.payslip,allounce:0
+#: selection:hr.payslip.line,type:0
+msgid "Allowance"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,holiday_days:0
+msgid "No of Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Content"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payroll.advice:0
+msgid "By Sal"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:hr.payroll.register.sheet:0
+msgid "Net SAL"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
+msgid "Bank Payment Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+msgid "Print Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:payslip.pdf:0
+msgid "Total Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: rml:employees.salary:0
+#: rml:payroll.advice:0
+#: rml:year.salary:0
+msgid "Total"
+msgstr ""
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
new file mode 100644
index 00000000000..94b6b60f3df
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/de.po
@@ -0,0 +1,351 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 06:11+0000\n"
+"PO-Revision-Date: 2010-10-05 13:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid ""
+"Please defined bank account for %s !' % (slip.employee_id.name)))\n"
+"\n"
+"            if not slip.employee_id.bank_account_id.partner_id:\n"
+"                raise osv.except_osv(_('Integrity Error !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid ""
+"Period is not defined for slip date %s'%slip.date))\n"
+"            period_id = search_periods[0]\n"
+"            name = 'Payment of Salary to %s' % (slip.employee_id.name)\n"
+"            move = {\n"
+"                'journal_id': slip.bank_journal_id.id,\n"
+"                'period_id': period_id,\n"
+"                'date': slip.date,\n"
+"                'type':'bank_pay_voucher',\n"
+"                'ref':slip.number,\n"
+"                'narration': name\n"
+"            }\n"
+"            move_id = move_pool.create(cr, uid, move, context=context)\n"
+"            self.create_voucher(cr, uid, [slip.id], name, move_id)\n"
+"\n"
+"            name = \"To %s account\" % (slip.employee_id.name)\n"
+"            ded_rec = {\n"
+"                'move_id':move_id,\n"
+"                'name': name,\n"
+"                #'partner_id': partner_id,\n"
+"                'date': slip.date,\n"
+"                'account_id': slip.employee_id.property_bank_account.id,\n"
+"                'debit': 0.0,\n"
+"                'credit' : slip.total_pay,\n"
+"                'journal_id' : slip.journal_id.id,\n"
+"                'period_id' :period_id,\n"
+"                'ref':slip.number\n"
+"            }\n"
+"            line_ids += [movel_pool.create(cr, uid, ded_rec, "
+"context=context)]\n"
+"            name = \"By %s account\" % "
+"(slip.employee_id.property_bank_account.name)\n"
+"            cre_rec = {\n"
+"                'move_id':move_id,\n"
+"                'name': name,\n"
+"                'partner_id': partner_id,\n"
+"                'date': slip.date,\n"
+"                'account_id': partner.property_account_payable.id,\n"
+"                'debit':  slip.total_pay,\n"
+"                'credit' : 0.0,\n"
+"                'journal_id' : slip.journal_id.id,\n"
+"                'period_id' :period_id,\n"
+"                'ref':slip.number\n"
+"            }\n"
+"            line_ids += [movel_pool.create(cr, uid, cre_rec, "
+"context=context)]\n"
+"\n"
+"            other_pay = slip.other_pay\n"
+"            #Process all Reambuse Entries\n"
+"            for line in slip.line_ids:\n"
+"                if line.type == 'otherpay' and line.expanse_id.invoice_id:\n"
+"                    if not line.expanse_id.invoice_id.move_id:\n"
+"                        raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid ""
+"Period is not defined for slip date %s'%slip.date))\n"
+"                period_id = search_periods[0]\n"
+"\n"
+"            move = {\n"
+"                #'name': slip.name,\n"
+"                'journal_id': slip.journal_id.id,\n"
+"                'period_id': period_id,\n"
+"                'date': slip.date,\n"
+"                'ref':slip.number,\n"
+"                'narration': slip.name\n"
+"            }\n"
+"            move_id = move_pool.create(cr, uid, move, context=context)\n"
+"            self.create_voucher(cr, uid, [slip.id], slip.name, move_id)\n"
+"\n"
+"            line = {\n"
+"                'move_id':move_id,\n"
+"                'name': \"By Basic Salary / \" + slip.employee_id.name,\n"
+"                'date': slip.date,\n"
+"                'account_id': slip.employee_id.salary_account.id,\n"
+"                'debit': slip.basic,\n"
+"                'credit': 0.0,\n"
+"                'quantity':slip.working_days,\n"
+"                'journal_id': slip.journal_id.id,\n"
+"                'period_id': period_id,\n"
+"                'analytic_account_id': False,\n"
+"                'ref':slip.number\n"
+"            }\n"
+"\n"
+"            #Setting Analysis Account for Basic Salary\n"
+"            if slip.employee_id.analytic_account:\n"
+"                line['analytic_account_id'] = "
+"slip.employee_id.analytic_account.id\n"
+"\n"
+"            move_line_id = movel_pool.create(cr, uid, line, "
+"context=context)\n"
+"            line_ids += [move_line_id]\n"
+"\n"
+"            line = {\n"
+"                'move_id':move_id,\n"
+"                'name': \"To Basic Paysble Salary / \" + "
+"slip.employee_id.name,\n"
+"                'partner_id': partner_id,\n"
+"                'date': slip.date,\n"
+"                'account_id': slip.employee_id.employee_account.id,\n"
+"                'debit': 0.0,\n"
+"                'quantity':slip.working_days,\n"
+"                'credit': slip.basic,\n"
+"                'journal_id': slip.journal_id.id,\n"
+"                'period_id': period_id,\n"
+"                'ref':slip.number\n"
+"            }\n"
+"            line_ids += [movel_pool.create(cr, uid, line, context=context)]\n"
+"\n"
+"            for line in slip.line_ids:\n"
+"                name = \"[%s] - %s / %s\" % (line.code, line.name, "
+"slip.employee_id.name)\n"
+"                amount = line.total\n"
+"\n"
+"                if line.type == 'leaves':\n"
+"                    continue\n"
+"\n"
+"                rec = {\n"
+"                    'move_id':move_id,\n"
+"                    'name': name,\n"
+"                    'date': slip.date,\n"
+"                    'account_id': line.account_id.id,\n"
+"                    'debit': 0.0,\n"
+"                    'credit' : 0.0,\n"
+"                    'journal_id' : slip.journal_id.id,\n"
+"                    'period_id' :period_id,\n"
+"                    'analytic_account_id':False,\n"
+"                    'ref':slip.number,\n"
+"                    'quantity':1\n"
+"                }\n"
+"\n"
+"                #Setting Analysis Account for Salary Slip Lines\n"
+"                if line.analytic_account_id:\n"
+"                    rec['analytic_account_id'] = "
+"line.analytic_account_id.id\n"
+"                else:\n"
+"                    rec['analytic_account_id'] = slip.deg_id.account_id.id\n"
+"\n"
+"                if line.type == 'allowance' or line.type == 'otherpay':\n"
+"                    rec['debit'] = amount\n"
+"                    if not partner.property_account_payable:\n"
+"                        raise osv.except_osv(_('Integrity Error !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid ""
+"Fiscal Year is not defined for slip date %s'%slip.date))\n"
+"            search_periods = period_pool.search(cr, uid, "
+"[('date_start','<=',slip.date),('date_stop','>=',slip.date)], "
+"context=context)\n"
+"            if not search_periods:\n"
+"                raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid ""
+"Fiscal Year is not defined for slip date %s'%slip.date))\n"
+"                search_periods = "
+"period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',sl"
+"ip.date)], context=context)\n"
+"                if not search_periods:\n"
+"                    raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid ""
+"Please defined partner in bank account for %s !' % "
+"(slip.employee_id.name)))\n"
+"\n"
+"            partner = slip.employee_id.bank_account_id.partner_id\n"
+"            partner_id = slip.employee_id.bank_account_id.partner_id.id\n"
+"\n"
+"            period_id = False\n"
+"\n"
+"            if slip.period_id:\n"
+"                period_id = slip.period_id.id\n"
+"            else:\n"
+"                fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], "
+"context=context)\n"
+"                if not fiscal_year_ids:\n"
+"                    raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
new file mode 100644
index 00000000000..e0c0db11eda
--- /dev/null
+++ b/addons/hr_recruitment/i18n/de.po
@@ -0,0 +1,1008 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 06:21+0000\n"
+"PO-Revision-Date: 2010-10-05 13:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "is Open."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,opening_date:0
+msgid "Date of Opening"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "365 Days"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "30 Days"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+#: selection:hr.recruitment.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#, python-format
+msgid "Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,perc_done:0
+msgid "%Done"
+msgstr ""
+
+#. module: hr_recruitment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Forward"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule a Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,avg_answers:0
+msgid "Avg. Answers"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Print Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "Job request for"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_config_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_job_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,perc_cancel:0
+msgid "%Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "Applicant "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview Question"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_recruitment
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+"    "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "from Mailgate."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Communication history"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.report:0
+msgid "Current"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "A Job Request created"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "is Hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr ""
diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
new file mode 100644
index 00000000000..c2a625e82c6
--- /dev/null
+++ b/addons/knowledge/i18n/de.po
@@ -0,0 +1,160 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 06:56+0000\n"
+"PO-Revision-Date: 2010-10-05 13:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: knowledge
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr ""
+
+#. module: knowledge
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: knowledge
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: knowledge
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr ""
+
+#. module: knowledge
+#: view:ir.actions.todo:0
+msgid "Launch"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Templates of Content"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
diff --git a/addons/knowledge/i18n/hi.po b/addons/knowledge/i18n/hi.po
index f3fb68f029e..ac649466b76 100644
--- a/addons/knowledge/i18n/hi.po
+++ b/addons/knowledge/i18n/hi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 06:56+0000\n"
-"PO-Revision-Date: 2010-10-04 13:03+0000\n"
+"PO-Revision-Date: 2010-10-05 07:27+0000\n"
 "Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
 "Language-Team: Hindi <hi@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: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index dddbdd3e2fe..2e270076d5f 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 06:56+0000\n"
-"PO-Revision-Date: 2010-09-12 20:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-06 18:07+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -22,41 +22,42 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki:0
 msgid "Collaborative Content (Wiki)"
-msgstr ""
+msgstr "Gezamenlijke inhoud (Wiki)"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_quality_manual:0
 msgid "Creates an example skeleton for a standard quality manual."
-msgstr ""
+msgstr "Maakt een voorbeeld raamwerk voor een standaard kwaliteitshandboek."
 
 #. module: knowledge
 #: field:knowledge.installer,document_ftp:0
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "Gedeelde Repositories (FTP)"
 
 #. module: knowledge
 #: model:ir.module.module,shortdesc:knowledge.module_meta_information
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Kennis Management Systeem"
 
 #. module: knowledge
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief Menu maken."
 
 #. module: knowledge
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
-msgstr ""
+msgstr "Kennis"
 
 #. module: knowledge
 #: help:knowledge.installer,document_webdav:0
@@ -65,16 +66,18 @@ msgid ""
 "you access attachments and virtual documents through your standard file "
 "browser."
 msgstr ""
+"Voorziet in WebDAV toegang tot uw OpenERP Document Management Systeem. Laat "
+"u bijlagen en virtuele documenten benaderen via uw standaard bestandsbeheer."
 
 #. module: knowledge
 #: field:knowledge.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Voortgang configuratie"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "title"
-msgstr ""
+msgstr "titel"
 
 #. module: knowledge
 #: help:knowledge.installer,document_ftp:0
@@ -82,6 +85,8 @@ msgid ""
 "Provides an FTP access to your OpenERP's Document Management System. Lets "
 "you access attachments and virtual documents through a standard FTP client."
 msgstr ""
+"Voorziet in FTP toegang tot uw OpenERP Document Management Systeem. Laat u "
+"bijlagen en virtuele documenten benaderen via een standaard FTP client."
 
 #. module: knowledge
 #: model:ir.module.module,description:knowledge.module_meta_information
@@ -89,41 +94,43 @@ msgid ""
 "Installer for knowledge-based tools\n"
 "    "
 msgstr ""
+"Installer voor kennis gebaseerde tools\n"
+"    "
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Configuratie"
 
 #. module: knowledge
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
 msgid "Knowledge Modules Installation"
-msgstr ""
+msgstr "Kennis modules installatie"
 
 #. module: knowledge
 #: view:ir.actions.todo:0
 msgid "Launch"
-msgstr ""
+msgstr "Opstarten"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
 msgid "Quality Manual"
-msgstr ""
+msgstr "Kwaliteitshandboek"
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Templates of Content"
-msgstr ""
+msgstr "Inhoudssjablonen"
 
 #. module: knowledge
 #: field:knowledge.installer,document_webdav:0
 msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "Gedeelde Repositories (WebDAV)"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_faq:0
@@ -131,26 +138,28 @@ msgid ""
 "Creates a skeleton internal FAQ pre-filled with documentation about "
 "OpenERP's Document Management System."
 msgstr ""
+"Maakt een raamwerk 'veelgestelde vragen' voorgevuld met documentatie over "
+"OpenERP's Document Management Systeem."
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_faq:0
 msgid "Internal FAQ"
-msgstr ""
+msgstr "Veelgestelde vragen"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr ""
+msgstr "Gezamenlijke inhoud"
 
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Afbeelding"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_installer
 msgid "knowledge.installer"
-msgstr ""
+msgstr "knowledge.installer"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki:0
@@ -158,3 +167,5 @@ msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
 msgstr ""
+"Laat u wiki pagina's en pagina groepen maken om bedrijfskennis te volgen en "
+"te delen met en tussen uw medewerkers."
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
new file mode 100644
index 00000000000..7761c2921ff
--- /dev/null
+++ b/addons/marketing/i18n/de.po
@@ -0,0 +1,116 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 07:04+0000\n"
+"PO-Revision-Date: 2010-10-05 13:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: marketing
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: marketing
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign_mailchimp:0
+msgid ""
+"This modules integrate mailchimp.com's service with OpenERP to automate mass "
+"mailings."
+msgstr ""
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation within partners and design questionaires."
+msgstr ""
+
+#. module: marketing
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr ""
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign_mailchimp:0
+msgid "Mailchimp Integration"
+msgstr ""
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr ""
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index 75078a01151..bcf2ce6e299 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -8,45 +8,46 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 07:04+0000\n"
-"PO-Revision-Date: 2010-09-12 20:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-06 15:02+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 
 #. module: marketing
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: marketing
 #: field:marketing.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Voortgang configuratie"
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "title"
-msgstr ""
+msgstr "titel"
 
 #. module: marketing
 #: field:marketing.installer,email_template:0
 msgid "Automated E-Mails"
-msgstr ""
+msgstr "Automatische e-mails"
 
 #. module: marketing
 #: field:marketing.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Afbeelding"
 
 #. module: marketing
 #: help:marketing.installer,marketing_campaign:0
@@ -54,6 +55,8 @@ msgid ""
 "Helps you to manage marketing campaigns and automate actions and "
 "communication steps."
 msgstr ""
+"Helpt u marketing campagnes te beheren en acties en communicatie stappen te "
+"automatiseren."
 
 #. module: marketing
 #: help:marketing.installer,marketing_campaign_mailchimp:0
@@ -61,11 +64,13 @@ msgid ""
 "This modules integrate mailchimp.com's service with OpenERP to automate mass "
 "mailings."
 msgstr ""
+"Deze module integreert mailchimp.com's service met OpenERP om bulk mailings "
+"te automatiseren."
 
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
 msgid "Menu for Marketing"
-msgstr ""
+msgstr "Menu voor marketing"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -73,44 +78,47 @@ msgid ""
 "Helps you to design templates of emails and integrate them in your different "
 "processes."
 msgstr ""
+"Helpt u om email sjablonen te ontwerpen en te integreren in uw verschillende "
+"processen."
 
 #. module: marketing
 #: help:marketing.installer,crm_profiling:0
 msgid ""
 "Helps you to perform segmentation within partners and design questionaires."
 msgstr ""
+"Helpt u om binnen relaties te segmenteren en vragenlijsten te ontwerpen."
 
 #. module: marketing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: marketing
 #: model:ir.module.module,shortdesc:marketing.module_meta_information
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
 msgid "Profiling Tools"
-msgstr ""
+msgstr "Profilering gereedschappen"
 
 #. module: marketing
 #: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
-msgstr ""
+msgstr "Marketing Campagnes"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_installer
 msgid "marketing.installer"
-msgstr ""
+msgstr "marketing.installer"
 
 #. module: marketing
 #: field:marketing.installer,marketing_campaign_mailchimp:0
 msgid "Mailchimp Integration"
-msgstr ""
+msgstr "Mailchimp Integratie"
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
 msgid "Marketing Modules Installation"
-msgstr ""
+msgstr "Marketing modules installatie"
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
new file mode 100644
index 00000000000..2d9e2072807
--- /dev/null
+++ b/addons/marketing_campaign/i18n/de.po
@@ -0,0 +1,929 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 07:09+0000\n"
+"PO-Revision-Date: 2010-10-05 13:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Today"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself left this field empty."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "No preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"Describe type of action to be performed on the Activity.Eg : Send email,Send "
+"paper.."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Activity Definition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Keep as cancelled when condition not met"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Workitem creation mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign hasn't any starting activity nor any activity with a signal and "
+"no previous activity."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "If record created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Create After Sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Dates"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines when new workitems should be created for records matching a "
+"segment."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid ""
+"\n"
+"Allows you to setup leads automation through marketing campaigns. The "
+"campaigns\n"
+"are dynamic and multi-channels. The process:\n"
+"* Design marketing campaigns that incluces mail templates, reports to "
+"print,\n"
+"  miscelleanous actions, etc.\n"
+"* Define segments that are selections of target people\n"
+"* Launch your campaign to automate communications.\n"
+"\n"
+"If you need demo data, you can install the module "
+"marketing_campaign_crm_demo.\n"
+"    "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - object: the object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign cannot be started: an email account is missing in the email "
+"activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Latest Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launching Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Status"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Run Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for the campaign (used for campaign analysis), see also variable "
+"cost on activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the model on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
+msgid "marketing_campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are done"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is not approved in the "
+"email activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Modified after Sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Paper"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem have to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "If record modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/marketing_campaign_crm_demo/i18n/de.po b/addons/marketing_campaign_crm_demo/i18n/de.po
new file mode 100644
index 00000000000..33f699d828a
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/de.po
@@ -0,0 +1,171 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 08:14+0000\n"
+"PO-Revision-Date: 2010-10-05 13:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\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 ""
+
+#. 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 ""
+
+#. module: marketing_campaign_crm_demo
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: marketing_campaign_crm_demo
+#: rml:crm.lead.demo:0
+msgid "Partner :"
+msgstr ""
+
+#. 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 ""
+
+#. module: marketing_campaign_crm_demo
+#: rml:crm.lead.demo:0
+msgid "Company :"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. 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 ""
diff --git a/addons/partner_geo_assign/i18n/de.po b/addons/partner_geo_assign/i18n/de.po
new file mode 100644
index 00000000000..86d223a36ba
--- /dev/null
+++ b/addons/partner_geo_assign/i18n/de.po
@@ -0,0 +1,117 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 08:40+0000\n"
+"PO-Revision-Date: 2010-10-05 13:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: partner_geo_assign
+#: code:addons/partner_geo_assign/partner_geo_assign.py:0
+#, python-format
+msgid "Network error"
+msgstr ""
+
+#. module: partner_geo_assign
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: partner_geo_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr ""
+
+#. module: partner_geo_assign
+#: model:ir.module.module,description:partner_geo_assign.module_meta_information
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to his "
+"partners,\n"
+"based on geolocalization.\n"
+"    "
+msgstr ""
+
+#. module: partner_geo_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: partner_geo_assign
+#: model:ir.module.module,shortdesc:partner_geo_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr ""
+
+#. module: partner_geo_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr ""
+
+#. module: partner_geo_assign
+#: code:addons/partner_geo_assign/partner_geo_assign.py:0
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr ""
+
+#. module: partner_geo_assign
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: partner_geo_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr ""
+
+#. module: partner_geo_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr ""
+
+#. module: partner_geo_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: partner_geo_assign
+#: model:ir.model,name:partner_geo_assign.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: partner_geo_assign
+#: model:ir.model,name:partner_geo_assign.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: partner_geo_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr ""
+
+#. module: partner_geo_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr ""
+
+#. module: partner_geo_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
new file mode 100644
index 00000000000..9c99a624274
--- /dev/null
+++ b/addons/procurement/i18n/de.po
@@ -0,0 +1,850 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 08:51+0000\n"
+"PO-Revision-Date: 2010-10-05 13:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr ""
+
+#. module: procurement
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "No address defined for the supplier"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr ""
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'.           "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action11
+msgid "Temporary Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "has an exception."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action4
+msgid "Procurement Exceptions to Fix"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action3
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: procurement
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: procurement
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistic Scheduler"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"Wizard run all the procurements, and generate task, production order or "
+"purchase order based on the product type"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+"    This is the module for computing Procurements.\n"
+"    "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Procurement "
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for futur computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the orderpoint "
+"without removing it."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "is running."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Not enough stock "
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Project_mrp module not installed !"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid ""
+"Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
+"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
+"\n"
+"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
+"        \"\"\" Finds UoM and UoS of changed product.\n"
+"        @param product_id: Changed id of product.\n"
+"        @return: Dictionary of values.\n"
+"        \"\"\"\n"
+"        if product_id:\n"
+"            w = self.pool.get('product.product"
+msgstr ""
+
+#. module: procurement
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
new file mode 100644
index 00000000000..c4de97452cf
--- /dev/null
+++ b/addons/product/i18n/eu.po
@@ -0,0 +1,1704 @@
+# Basque translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-05 22:13+0000\n"
+"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Max. Margin"
+msgstr "Gehienezko Margina"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Base Price"
+msgstr "Oinarrizko Prezioa"
+
+#. module: product
+#: help:product.template,standard_price:0
+msgid ""
+"The cost of the product for accounting stock valuation. It can serves as a "
+"base price for supplier price."
+msgstr ""
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Service"
+msgstr "Zerbitzua"
+
+#. module: product
+#: help:product.template,purchase_ok:0
+msgid ""
+"Determine if the product is visible in the list of products within a "
+"selection from a purchase order line."
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,name:0
+msgid "Supplier of this product"
+msgstr "Produktu honen hornitzailea"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram512_product_template
+msgid "DDR 512MB PC400"
+msgstr "DDR 512MB PC400"
+
+#. module: product
+#: model:product.template,name:product.product_product_0_product_template
+msgid "Onsite Senior Intervention"
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,qty:0
+msgid ""
+"The minimal quantity to purchase for this supplier, expressed in the default "
+"unit of measure."
+msgstr ""
+
+#. module: product
+#: field:product.template,weight_net:0
+msgid "Net weight"
+msgstr ""
+
+#. module: product
+#: help:product.product,incoming_qty:0
+msgid ""
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+
+#. module: product
+#: help:product.product,virtual_available:0
+msgid ""
+"Futur stock for this product according to the selected location or all "
+"internal if none have been selected. Computed as: Real Stock - Outgoing + "
+"Incoming."
+msgstr ""
+
+#. module: product
+#: field:product.packaging,width:0
+msgid "Width"
+msgstr "Zabalera"
+
+#. module: product
+#: help:product.pricelist.item,product_tmpl_id:0
+msgid ""
+"Set a template if this rule only apply to a template of product. Keep empty "
+"for all products"
+msgstr ""
+
+#. module: product
+#: field:product.template,procure_method:0
+msgid "Procure Method"
+msgstr "Hornitzeko Modua"
+
+#. module: product
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: product
+#: model:process.process,name:product.process_process_productprocess0
+msgid "Product Process"
+msgstr ""
+
+#. module: product
+#: help:product.price.type,field:0
+msgid "Associated field in the product form."
+msgstr ""
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Standard Price"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,height:0
+msgid "The height of the package"
+msgstr "Paketearen altuera"
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price List"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.cat1
+msgid "Sellable"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_26_product_template
+msgid "Kit Keyboard + Mouse"
+msgstr "Teklatu eta Saguko Multzoa"
+
+#. module: product
+#: field:product.price.type,name:0
+msgid "Price Name"
+msgstr ""
+
+#. module: product
+#: field:product.product,price:0
+msgid "Customer Price"
+msgstr ""
+
+#. module: product
+#: field:product.template,company_id:0
+msgid "Company"
+msgstr "Enpresa"
+
+#. module: product
+#: field:product.template,rental:0
+msgid "Rentable Product"
+msgstr "Produktu Alokagarria"
+
+#. module: product
+#: field:product.product,lst_price:0
+msgid "List Price"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_price_type_action
+#: model:ir.ui.menu,name:product.menu_product_price_type_action
+msgid "Prices Types"
+msgstr ""
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_services
+msgid "Services"
+msgstr "Zerbitzuak"
+
+#. module: product
+#: help:product.template,list_price:0
+msgid ""
+"Base price for computing the customer price. Sometimes called the catalog "
+"price."
+msgstr ""
+
+#. module: product
+#: field:pricelist.partnerinfo,min_quantity:0
+msgid "Quantity"
+msgstr "Kopurua"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu3_product_template
+msgid "Processor AMD Athlon XP 2200+"
+msgstr "AMD Athlon XP 2200+ Prozesadorea"
+
+#. module: product
+#: help:product.price.type,name:0
+msgid "Name of this kind of price."
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.version,date_start:0
+msgid "Starting date for this pricelist version to be valid."
+msgstr ""
+
+#. module: product
+#: field:product.product,incoming_qty:0
+msgid "Incoming"
+msgstr ""
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Weigths"
+msgstr "Pisuak"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan2_product_template
+msgid "Silent fan"
+msgstr "Haizagailu Isila"
+
+#. module: product
+#: help:product.template,supply_method:0
+msgid ""
+"Produce will generate production order or tasks, according to the product "
+"type. Purchase will trigger purchase orders when requested."
+msgstr ""
+
+#. module: product
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid "You can see the list of suppliers for that product."
+msgstr "Produktu horren hornitzaileen zerrenda ikus dezakezu."
+
+#. module: product
+#: help:product.packaging,rows:0
+msgid "The number of layer on a palet or box"
+msgstr ""
+
+#. module: product
+#: model:product.pricelist.type,name:product.pricelist_type_sale
+#: field:res.partner,property_product_pricelist:0
+msgid "Sale Pricelist"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,base_pricelist_id:0
+msgid "If Other Pricelist"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_normal_action
+#: model:ir.actions.act_window,name:product.product_normal_action_tree
+#: model:ir.ui.menu,name:product.menu_main_product
+#: model:ir.ui.menu,name:product.menu_products
+#: view:product.product:0
+msgid "Products"
+msgstr "Produktuak"
+
+#. module: product
+#: help:product.pricelist.item,price_round:0
+msgid ""
+"Sets the price so that it is a multiple of this value.\n"
+"Rounding is applied after the discount and before the surcharge.\n"
+"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "New Price ="
+msgstr "Prezio Berria ="
+
+#. module: product
+#: field:product.product,virtual_available:0
+msgid "Virtual Stock"
+msgstr ""
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Fixed"
+msgstr "Finkoa"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr "Neurtzeko Unitateen Kategoriak"
+
+#. module: product
+#: help:product.pricelist.item,product_id:0
+msgid ""
+"Set a product if this rule only apply to one product. Keep empty for all "
+"products"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_type
+#: field:product.pricelist,type:0
+#: view:product.pricelist.type:0
+msgid "Pricelist Type"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Base Prices"
+msgstr "Oinarrizko Prezioak"
+
+#. module: product
+#: model:ir.ui.menu,name:product.menu_price
+msgid "Prices Computations"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: product
+#: model:ir.ui.menu,name:product.menu_config_product
+msgid "Configuration"
+msgstr "Konfigurazioa"
+
+#. module: product
+#: field:product.packaging,rows:0
+msgid "Number of Layer"
+msgstr ""
+
+#. module: product
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Errorea! Ezin dituzu kategoria errekurtsiboak sortu."
+
+#. module: product
+#: field:product.template,uom_id:0
+msgid "Default UoM"
+msgstr "NU Lehenetsia"
+
+#. module: product
+#: field:product.template,produce_delay:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,pricelist_ids:0
+msgid "Supplier Pricelist"
+msgstr ""
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Pallet Dimension"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,base:0
+msgid "Based on"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_24_product_template
+msgid "Keyboard"
+msgstr "Teklatua"
+
+#. module: product
+#: field:product.supplierinfo,name:0
+msgid "Partner"
+msgstr "Kidea"
+
+#. module: product
+#: field:product.template,sale_delay:0
+msgid "Customer Lead Time"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Mouse"
+msgstr "Sagua"
+
+#. module: product
+#: help:product.template,cost_method:0
+msgid ""
+"Standard Price: the cost price is fixed and recomputed periodically (usually "
+"at the end of the year), Average Price: the cost price is recomputed at each "
+"reception of products."
+msgstr ""
+
+#. module: product
+#: field:product.pricelist,name:0
+msgid "Pricelist Name"
+msgstr ""
+
+#. module: product
+#: field:product.template,seller_ids:0
+msgid "Partners"
+msgstr "Kideak"
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Average Price"
+msgstr "Batazbesteko Prezioa"
+
+#. module: product
+#: model:process.node,note:product.process_node_product0
+msgid "Create new Product"
+msgstr "Produktu berria sortu"
+
+#. module: product
+#: help:product.pricelist.item,name:0
+msgid "Explicit rule name for this pricelist line."
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Min. Margin"
+msgstr "Margin Minimoa"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "* ( 1 + "
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu1_product_template
+msgid "Processor AMD Athlon XP 1800+"
+msgstr "AMD Athlon XP 1800+ Prozesadorea"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Production"
+msgstr "Produkzioan"
+
+#. module: product
+#: field:product.category,child_id:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_accessories
+msgid "Accessories"
+msgstr "Osagaiak"
+
+#. module: product
+#: field:product.supplierinfo,sequence:0
+msgid "Priority"
+msgstr "Lehentasuna"
+
+#. module: product
+#: model:product.template,name:product.product_product_20_product_template
+msgid "HDD on demand"
+msgstr ""
+
+#. module: product
+#: field:product.uom,factor_inv:0
+#: field:product.uom,factor_inv_data:0
+msgid "Factor"
+msgstr "Faktorea"
+
+#. module: product
+#: wizard_button:product.price_list,init,price:0
+msgid "Print"
+msgstr "Inprimatu"
+
+#. module: product
+#: model:process.node,name:product.process_node_supplier0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: field:product.ul,type:0
+msgid "Type"
+msgstr "Mota"
+
+#. module: product
+#: wizard_field:product.price_list,init,price_list:0
+msgid "PriceList"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "UOM"
+msgstr "NU"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "PCE"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_main
+msgid "Pricelists"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,product_name:0
+msgid "Partner Product Name"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Miscelleanous"
+msgstr "Bestelakoak"
+
+#. module: product
+#: help:product.pricelist.item,base:0
+msgid "The mode for computing the price for this rule."
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_form_action
+#: model:ir.ui.menu,name:product.next_id_16
+#: view:product.uom:0
+msgid "Units of Measure"
+msgstr "Neurtze Unitateak"
+
+#. module: product
+#: field:product.product,partner_ref:0
+msgid "Customer ref"
+msgstr "Bezero erref."
+
+#. module: product
+#: field:product.supplierinfo,qty:0
+msgid "Minimal Quantity"
+msgstr "Kopuru Minimoa"
+
+#. module: product
+#: model:product.category,name:product.product_category_pc
+msgid "PC"
+msgstr "PC"
+
+#. module: product
+#: help:product.template,seller_delay:0
+msgid ""
+"This is the average delay in days between the purchase order confirmation "
+"and the reception of goods for this product and for the default supplier. It "
+"is used by the scheduler to order requests based on reordering delays."
+msgstr ""
+
+#. module: product
+#: field:product.template,seller_delay:0
+msgid "Supplier Lead Time"
+msgstr ""
+
+#. module: product
+#: model:product.pricelist.version,name:product.ver0
+msgid "Default Public Pricelist Version"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.type,key:0
+msgid "Key"
+msgstr "Gakoa"
+
+#. module: product
+#: field:product.pricelist.item,price_version_id:0
+msgid "Price List Version"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rules Test Match"
+msgstr ""
+
+#. module: product
+#: help:res.partner,property_product_pricelist:0
+msgid ""
+"This pricelist will be used, instead of the default one,                     "
+"for sales to the current partner"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist
+#: view:product.supplierinfo:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Consumable"
+msgstr ""
+
+#. module: product
+#: help:product.price.type,currency_id:0
+msgid "The currency the field is expressed in."
+msgstr ""
+
+#. module: product
+#: help:product.template,weight:0
+msgid "The gross weight in Kg."
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Box"
+msgstr "Kutxa"
+
+#. module: product
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML ezegokia Ikuspegi Arkitekturarako!"
+
+#. module: product
+#: help:product.template,sale_ok:0
+msgid ""
+"Determine if the product can be visible in the list of product within a "
+"selection from a sale order line."
+msgstr ""
+
+#. module: product
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: product
+#: field:product.category,parent_id:0
+msgid "Parent Category"
+msgstr "Goi kategoria"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Development"
+msgstr "Garapenean"
+
+#. module: product
+#: help:product.pricelist.type,key:0
+msgid ""
+"Used in the code to select specific prices based on the context. Keep "
+"unchanged."
+msgstr ""
+
+#. module: product
+#: help:product.product,outgoing_qty:0
+msgid ""
+"Quantities of products that are planned to leave in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+
+#. module: product
+#: field:product.packaging,weight:0
+msgid "Total Package Weight"
+msgstr "Paketearen Guztirako Pisua"
+
+#. module: product
+#: help:product.template,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action
+#: model:ir.ui.menu,name:product.menu_product_category_action
+msgid "Products by Category"
+msgstr "Produktuak Kategoriaka"
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd1_product_template
+msgid "HDD Seagate 7200.8 80GB"
+msgstr "Seagate 7200.8 80GB Disko Gogorra"
+
+#. module: product
+#: help:product.pricelist.version,active:0
+msgid ""
+"When a version is duplicated it is set to non active, so that the dates do "
+"not overlaps with original version. You should change the dates and "
+"reactivate the pricelist"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd3_product_template
+msgid "HDD Seagate 7200.8 160GB"
+msgstr "Seagate 7200.8 160GB Disko Gogorra"
+
+#. module: product
+#: view:product.product:0
+msgid "Product Variant"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,ul:0
+msgid "Type of Package"
+msgstr "Pakete Mota"
+
+#. module: product
+#: field:product.template,loc_rack:0
+msgid "Rack"
+msgstr ""
+
+#. module: product
+#: field:product.uom,category_id:0
+msgid "UoM Category"
+msgstr "NU Kategoria"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pack"
+msgstr ""
+
+#. module: product
+#: field:product.product,ean13:0
+msgid "EAN13"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_sale:0
+msgid "Sale Description"
+msgstr "Salmenta Deskribapena"
+
+#. module: product
+#: field:product.template,uos_id:0
+msgid "Unit of Sale"
+msgstr "Salmenta Unitatea"
+
+#. module: product
+#: field:product.template,mes_type:0
+msgid "Measure Type"
+msgstr "Neurketa Mota"
+
+#. module: product
+#: model:product.uom.categ,name:product.product_uom_categ_kgm
+msgid "Weight"
+msgstr "Pisua"
+
+#. module: product
+#: model:product.template,name:product.product_product_22_product_template
+msgid "Processor on demand"
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,product_name:0
+msgid ""
+"Name of the product for this partner, will be used when printing a request "
+"for quotation. Keep empty to use the internal one."
+msgstr ""
+
+#. module: product
+#: field:product.template,supply_method:0
+msgid "Supply method"
+msgstr "Hornitzeko modua"
+
+#. module: product
+#: model:product.category,name:product.product_category_11
+msgid "IT components kits"
+msgstr ""
+
+#. module: product
+#: view:product.uom.categ:0
+msgid "Units of Measure categories"
+msgstr "Neurtze Unitateen Kategoriak"
+
+#. module: product
+#: field:product.category,sequence:0
+#: field:product.packaging,sequence:0
+#: field:product.pricelist.item,sequence:0
+msgid "Sequence"
+msgstr "Sekuentzia"
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Supplier Information"
+msgstr "Hornitzaile Informazioa"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_ul_form_action
+#: model:ir.model,name:product.model_product_packaging
+#: model:ir.ui.menu,name:product.menu_product_ul_form_action
+#: view:product.packaging:0
+#: view:product.product:0
+#: view:product.ul:0
+msgid "Packaging"
+msgstr "Paketatzea"
+
+#. module: product
+#: field:product.price.type,currency_id:0
+#: field:product.pricelist,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu_gen_product_template
+msgid "Regular processor config"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Descriptions"
+msgstr "Deskribapenak"
+
+#. module: product
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Suppliers of Product"
+msgstr "Produktu Hornitzaileak"
+
+#. module: product
+#: field:product.pricelist.version,date_start:0
+msgid "Start Date"
+msgstr "Hasiera Data"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales Properties"
+msgstr "Salmenta Propietateak"
+
+#. module: product
+#: help:product.product,qty_available:0
+msgid ""
+"Current quantities of products in selected locations or all internal if none "
+"have been selected."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_pc1_product_template
+msgid "Basic PC"
+msgstr "Oinarrizko PCa"
+
+#. module: product
+#: field:product.template,loc_row:0
+msgid "Row"
+msgstr "Lerroa"
+
+#. module: product
+#: field:product.template,categ_id:0
+msgid "Category"
+msgstr "Kategoria"
+
+#. module: product
+#: help:product.pricelist.item,min_quantity:0
+msgid ""
+"The rule only applies if the partner buys/sells more than this quantity."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_ram_product_template
+msgid "DDR 256MB PC400"
+msgstr "DDR 256MB PC400"
+
+#. module: product
+#: field:product.product,qty_available:0
+msgid "Real Stock"
+msgstr ""
+
+#. module: product
+#: view:product.category:0
+msgid "Product Categories"
+msgstr "Produktu Kategoriak"
+
+#. module: product
+#: help:product.uom,category_id:0
+msgid ""
+"Unit of Measure of a category can be converted between each others in the "
+"same category."
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom
+msgid "Product Unit of Measure"
+msgstr "Produktuaren Neurtze Unitatea"
+
+#. module: product
+#: field:product.template,sale_ok:0
+msgid "Can be sold"
+msgstr "Saldu daiteke"
+
+#. module: product
+#: model:product.template,name:product.product_product_23_product_template
+msgid "Complete PC With Peripherals"
+msgstr "PC Osoa Periferikoekin"
+
+#. module: product
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Errorea: Defektuzko NU eta hornitzeko NUak kategoria berdinean egon behar "
+"dute."
+
+#. module: product
+#: model:product.template,name:product.product_product_mb2_product_template
+msgid "Mainboard ASUStek A7V8X-X"
+msgstr ""
+
+#. module: product
+#: field:product.uom,factor:0
+msgid "Rate"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Products Listprices Items"
+msgstr ""
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Borobiltze Zehaztasuna"
+
+#. module: product
+#: help:product.packaging,width:0
+msgid "The width of the package"
+msgstr "Paketearen zabalera"
+
+#. module: product
+#: field:product.packaging,qty:0
+msgid "Quantity by Package"
+msgstr "Paketeko Kopurua"
+
+#. module: product
+#: help:product.template,uos_id:0
+msgid ""
+"Used by companies that manages two unit of measure: invoicing and inventory "
+"management. For example, in food industries, you will manage a stock of ham "
+"but invoice in Kg. Keep empty to use the default UOM."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,state:0
+msgid "Status"
+msgstr "Egoera"
+
+#. module: product
+#: field:product.product,outgoing_qty:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Buy"
+msgstr "Erosi"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_version
+#: view:product.pricelist:0
+#: view:product.pricelist.version:0
+msgid "Pricelist Version"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_round:0
+msgid "Price Rounding"
+msgstr "Prezio Borobiltzea"
+
+#. module: product
+#: model:product.price.type,name:product.list_price
+msgid "Public Price"
+msgstr "Prezio Publikoa"
+
+#. module: product
+#: field:product.pricelist.item,price_max_margin:0
+msgid "Max. Price Margin"
+msgstr "Prezio Marjin Maximoa"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Salmetak eta Erosketak"
+
+#. module: product
+#: model:product.category,name:product.product_category_10
+msgid "IT components"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,weight_ul:0
+msgid "The weight of the empty UL"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,code:0
+msgid "The code of the transport unit."
+msgstr ""
+
+#. module: product
+#: field:product.template,uom_po_id:0
+msgid "Purchase UoM"
+msgstr "Hornitzeko NU"
+
+#. module: product
+#: view:product.price.type:0
+msgid "Products Price Type"
+msgstr ""
+
+#. module: product
+#: field:product.template,product_manager:0
+msgid "Product Manager"
+msgstr "Produktu Kudeatzailea"
+
+#. module: product
+#: field:product.product,price_extra:0
+msgid "Variant Price Extra"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_fan_product_template
+msgid "Regular case fan 80mm"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr "Produktu hornitzaile baten inguruko informazioa"
+
+#. module: product
+#: field:product.price.type,active:0
+#: field:product.pricelist,active:0
+#: field:product.pricelist.version,active:0
+#: field:product.product,active:0
+#: field:product.uom,active:0
+msgid "Active"
+msgstr "Gaituta"
+
+#. module: product
+#: field:product.product,price_margin:0
+msgid "Variant Price Margin"
+msgstr ""
+
+#. module: product
+#: wizard_view:product.price_list,init:0
+msgid "Price list"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_pc3_product_template
+msgid "Medium PC"
+msgstr "Tarteko PCa"
+
+#. module: product
+#: model:ir.model,name:product.model_pricelist_partnerinfo
+msgid "pricelist.partnerinfo"
+msgstr ""
+
+#. module: product
+#: model:product.price.type,name:product.standard_price
+#: field:product.template,standard_price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_purchase:0
+msgid "Purchase Description"
+msgstr "Horniketa Deskribapena"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Second UoM"
+msgstr "Bigarren NU"
+
+#. module: product
+#: model:product.category,name:product.product_category_4
+msgid "Dello Computer"
+msgstr "Dello Ordenagailua"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Storage Localisation"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,length:0
+msgid "The length of the package"
+msgstr "Paketearen luzera"
+
+#. module: product
+#: field:product.pricelist.item,price_min_margin:0
+msgid "Min. Price Margin"
+msgstr "Prezio Marjin Minimoa"
+
+#. module: product
+#: help:product.packaging,ean:0
+msgid "The EAN code of the package unit."
+msgstr ""
+
+#. module: product
+#: field:product.template,weight:0
+msgid "Gross weight"
+msgstr ""
+
+#. module: product
+#: help:product.product,packaging:0
+msgid ""
+"Gives the different ways to package the same product. This has no impact on "
+"the packing order and is mainly used if you use the EDI module."
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_category
+#: field:product.pricelist.item,categ_id:0
+msgid "Product Category"
+msgstr "Produktu Kategoria"
+
+#. module: product
+#: field:product.price.type,field:0
+msgid "Product Field"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_type_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action
+msgid "Pricelists Types"
+msgstr ""
+
+#. module: product
+#: help:product.template,state:0
+msgid "Tells the user if he can use the product or not."
+msgstr "Erabiltzaileari produktua erabil dezakeen edo ez esaten dio."
+
+#. module: product
+#: field:product.supplierinfo,product_code:0
+msgid "Partner Product Code"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_3
+msgid "Computer Stuff"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,code:0
+#: field:product.product,code:0
+#: field:product.product,default_code:0
+msgid "Code"
+msgstr "Kodea"
+
+#. module: product
+#: help:product.uom,factor_inv:0
+msgid ""
+"The coefficient for the formula:\n"
+"coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
+msgstr ""
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Seq"
+msgstr "Sek"
+
+#. module: product
+#: model:product.category,name:product.product_category_8
+msgid "Phone Help"
+msgstr "Telefono Laguntza"
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: product
+#: help:product.template,uom_id:0
+msgid "Default Unit of Measure used for all stock operation."
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_template
+#: field:product.pricelist.item,product_tmpl_id:0
+#: field:product.product,product_tmpl_id:0
+#: view:product.template:0
+msgid "Product Template"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_ul
+msgid "Shipping Unit"
+msgstr ""
+
+#. module: product
+#: help:product.uom,rounding:0
+msgid ""
+"The computed quantity will be a multiple of this value. Use 1.0 for products "
+"that can not be split."
+msgstr ""
+
+#. module: product
+#: field:product.packaging,height:0
+msgid "Height"
+msgstr "Altuera"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc4_product_template
+msgid "Customizable PC"
+msgstr "PC Moldagarria"
+
+#. module: product
+#: help:product.pricelist.version,date_end:0
+msgid "Ending date for this pricelist version to be valid."
+msgstr ""
+
+#. module: product
+#: field:pricelist.partnerinfo,suppinfo_id:0
+msgid "Partner Information"
+msgstr "Kide Informazioa"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,type:0
+msgid "Product Type"
+msgstr "Produktu Mota"
+
+#. module: product
+#: model:product.category,name:product.product_category_7
+#: model:product.template,name:product.product_product_1_product_template
+msgid "Onsite Intervention"
+msgstr "Lekuko Interbentzioa"
+
+#. module: product
+#: model:product.category,name:product.cat0
+msgid "All products"
+msgstr "Produktu guztiak"
+
+#. module: product
+#: wizard_button:product.price_list,init,end:0
+msgid "Cancel"
+msgstr "Ezeztatu"
+
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by palet or box."
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.wizard,name:product.report_wizard_price
+#: field:product.pricelist.version,pricelist_id:0
+msgid "Price List"
+msgstr ""
+
+#. module: product
+#: model:product.pricelist,name:product.list0
+msgid "Public Pricelist"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_21_product_template
+msgid "RAM on demand"
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+#: model:product.uom.categ,name:product.product_uom_categ_unit
+msgid "Unit"
+msgstr "Unitatea"
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd2_product_template
+msgid "HDD Seagate 7200.8 120GB"
+msgstr "Seagate 7200.8 120GB Disko Gogorra"
+
+#. module: product
+#: wizard_field:product.price_list,init,qty2:0
+msgid "Quantity-2"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Information"
+msgstr "Informazioa"
+
+#. module: product
+#: view:product.product:0
+msgid "Codes"
+msgstr "Kodeak"
+
+#. module: product
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: product
+#: wizard_field:product.price_list,init,qty4:0
+msgid "Quantity-4"
+msgstr ""
+
+#. module: product
+#: wizard_field:product.price_list,init,qty5:0
+msgid "Quantity-5"
+msgstr ""
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Other Info"
+msgstr "Bestelako Informazioa"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Delays"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.version,items_id:0
+msgid "Price List Items"
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,product_code:0
+msgid ""
+"Code of the product for this partner, will be used when printing a request "
+"for quotation. Keep empty to use the internal one."
+msgstr ""
+
+#. module: product
+#: selection:product.template,state:0
+msgid "Obsolete"
+msgstr "Zaharkitua"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pallet"
+msgstr ""
+
+#. module: product
+#: field:pricelist.partnerinfo,price:0
+msgid "Unit Price"
+msgstr "Unitateko prezioa"
+
+#. module: product
+#: field:product.template,warranty:0
+msgid "Warranty (months)"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,ul_qty:0
+msgid "Package by layer"
+msgstr ""
+
+#. module: product
+#: help:product.template,type:0
+msgid ""
+"Will change the way procurements are processed. Consumables are stockable "
+"products with infinite stock, or for use when you have no inventory "
+"management in the system."
+msgstr ""
+
+#. module: product
+#: model:process.node,note:product.process_node_supplier0
+msgid "Product suppliers, with their product name, price, etc."
+msgstr "Produktu hornitzaileak, bere produktu izena, prezio eta abarrekin."
+
+#. module: product
+#: model:ir.model,name:product.model_product_price_type
+msgid "Price type"
+msgstr "Prezio mota"
+
+#. module: product
+#: model:ir.model,name:product.model_product_product
+#: model:process.node,name:product.process_node_product0
+#: field:product.packaging,product_id:0
+#: field:product.pricelist.item,product_id:0
+#: view:product.product:0
+#: field:product.supplierinfo,product_id:0
+#: model:res.request.link,name:product.req_link_product
+msgid "Product"
+msgstr "Produktua"
+
+#. module: product
+#: field:product.template,volume:0
+msgid "Volume"
+msgstr "Bolumena"
+
+#. module: product
+#: field:pricelist.partnerinfo,name:0
+#: field:product.packaging,name:0
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description:0
+msgid "Description"
+msgstr "Deskribapena"
+
+#. module: product
+#: field:product.packaging,ean:0
+msgid "EAN"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Product Description"
+msgstr "Produktu Deskribapena"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid " ) + "
+msgstr ""
+
+#. module: product
+#: help:product.template,sale_delay:0
+msgid ""
+"This is the average time between the confirmation of the customer order and "
+"the delivery of the finished products. It's the time you promise to your "
+"customers."
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product uom categ"
+msgstr ""
+
+#. module: product
+#: wizard_field:product.price_list,init,qty3:0
+msgid "Quantity-3"
+msgstr ""
+
+#. module: product
+#: model:product.ul,name:product.product_ul_box
+msgid "Box 20x20x40"
+msgstr ""
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Produce"
+msgstr ""
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_surcharge:0
+msgid "Price Surcharge"
+msgstr ""
+
+#. module: product
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rounding Method"
+msgstr "Borobiltze Metodoa"
+
+#. module: product
+#: field:product.product,variants:0
+msgid "Variants"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Price Computation"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
+msgstr ""
+
+#. module: product
+#: field:product.template,loc_case:0
+msgid "Case"
+msgstr "Kutxa"
+
+#. module: product
+#: field:product.pricelist.version,date_end:0
+msgid "End Date"
+msgstr "Amaiera Data"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action_form
+#: model:ir.ui.menu,name:product.menu_product_category_action_form
+msgid "Products Categories"
+msgstr "Produktuen Kategoriak"
+
+#. module: product
+#: field:product.product,packaging:0
+msgid "Logistical Units"
+msgstr "Unitate Logistikoak"
+
+#. module: product
+#: field:product.category,complete_name:0
+#: field:product.category,name:0
+#: field:product.pricelist.type,name:0
+#: field:product.pricelist.version,name:0
+#: field:product.template,name:0
+#: field:product.ul,name:0
+#: field:product.uom,name:0
+#: field:product.uom.categ,name:0
+msgid "Name"
+msgstr "Izena"
+
+#. module: product
+#: help:product.template,uos_coeff:0
+msgid ""
+"Coefficient to convert UOM to UOS\n"
+" uom = uos * coeff"
+msgstr ""
+
+#. module: product
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr "Erosi daiteke"
+
+#. module: product
+#: field:product.template,uos_coeff:0
+msgid "UOM -> UOS Coeff"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu2_product_template
+msgid "High speed processor config"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_pc2_product_template
+msgid "Basic+ PC (assembly on order)"
+msgstr ""
+
+#. module: product
+#: field:product.template,cost_method:0
+msgid "Costing Method"
+msgstr ""
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Palletization"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Prices & Suppliers"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,weight:0
+msgid "The weight of a full of products palet or box."
+msgstr ""
+
+#. module: product
+#: selection:product.template,state:0
+msgid "End of Lifecycle"
+msgstr ""
+
+#. module: product
+#: model:ir.module.module,shortdesc:product.module_meta_information
+msgid "Products & Pricelists"
+msgstr ""
+
+#. module: product
+#: help:product.uom,factor:0
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coeff (this unit). Rate = 1 / Factor."
+msgstr ""
+
+#. module: product
+#: help:product.template,weight_net:0
+msgid "The net weight in Kg."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_tow1_product_template
+msgid "ATX Mid-size Tower"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,delay:0
+msgid "Delivery Delay"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action
+#: field:product.pricelist,version_id:0
+msgid "Pricelist Versions"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,weight_ul:0
+msgid "Empty Package Weight"
+msgstr ""
+
+#. module: product
+#: field:product.template,list_price:0
+msgid "Sale Price"
+msgstr "Salmenta Prezioa"
+
+#. module: product
+#: help:product.template,produce_delay:0
+msgid ""
+"Average time to produce this product. This is only for the production order "
+"and, if it is a multi-level bill of material, it's only for the level of "
+"this product. Different delays will be summed for all levels and purchase "
+"orders."
+msgstr ""
+
+#. module: product
+#: wizard_field:product.price_list,init,qty1:0
+msgid "Quantity-1"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,length:0
+msgid "Length"
+msgstr "Luzera"
+
+#. module: product
+#: model:product.category,name:product.cat2
+msgid "Private"
+msgstr "Pribatua"
+
+#. module: product
+#: help:product.supplierinfo,delay:0
+msgid ""
+"Delay in days between the confirmation of the purchase order and the "
+"reception of the products in your warehouse. Used by the scheduler for "
+"automatic computation of the purchase order planning."
+msgstr ""
+
+#. module: product
+#: help:product.template,uom_po_id:0
+msgid ""
+"Default Unit of Measure used for purchase orders. It must in the same "
+"category than the default unit of measure."
+msgstr ""
+
+#. module: product
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,min_quantity:0
+msgid "Min. Quantity"
+msgstr "Kopuru Minimoa"
+
+#. module: product
+#: help:product.pricelist.item,categ_id:0
+msgid ""
+"Set a category of product if this rule only apply to products of a category "
+"and his childs. Keep empty for all products"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_label
+msgid "Products Labels"
+msgstr "Produktu Etiketak"
+
+#. module: product
+#: help:product.template,volume:0
+msgid "The volume in m3."
+msgstr "Bolumena m3-tan."
+
+#. module: product
+#: model:product.ul,name:product.product_ul_big_box
+msgid "Box 30x40x60"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_kgm
+msgid "KGM"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
+msgstr ""
diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po
new file mode 100644
index 00000000000..0a452d38977
--- /dev/null
+++ b/addons/product_expiry/i18n/pl.po
@@ -0,0 +1,168 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-06-30 15:09+0000\n"
+"PO-Revision-Date: 2010-10-07 16:55+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product lifetime"
+msgstr "Okres przydatności produktu"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Szynka"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Mleko"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+msgid "Products date of expiry"
+msgstr "Data przydatności"
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
+
+#. module: product_expiry
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid "The date the lot may become dangerous and should not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "Data usunięcia"
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+"Śledzi różne daty na produktach i partie produktu:\n"
+" - Data przydatności\n"
+" - Należy użyć przed\n"
+" - Data usunięcia\n"
+" - Data ostrzegania\n"
+"Stosowane na przykład w przemyśle spożywczym."
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Chleb"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "Daty"
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Błąd: JS musi być innej kategorii niż JM."
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "Koniec przydatności"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "Data najlepszego użycia"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid "The date the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "Cammembert"
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+#: field:stock.production.lot,dlc:0
+msgid "Product usetime"
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "Data ostrzegawcza"
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product removal time"
+msgstr "Czas wycofania produktu"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Błąd: Niedozwolony kod EAN"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date the lot should be removed."
+msgstr "Data, w której produkt powinien być usunięty"
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product alert time"
+msgstr "Czas ostrzeżenia dla produktu"
diff --git a/addons/product_manufacturer/i18n/pl.po b/addons/product_manufacturer/i18n/pl.po
new file mode 100644
index 00000000000..455cdc33712
--- /dev/null
+++ b/addons/product_manufacturer/i18n/pl.po
@@ -0,0 +1,95 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-12 12:35+0000\n"
+"PO-Revision-Date: 2010-10-07 16:51+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\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 "Moduł do dodawania producentów i atrybutów w formularzu produktu"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Kod producenta produktu"
+
+#. module: product_manufacturer
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Nazwa szablonu produktu"
+
+#. module: product_manufacturer
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Atrybuty produktu"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Atrybuty produktu"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Atrybut"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Wartość"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Atrybuty"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Atrybuty i producenci produktu"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Nazwa produktu u producenta"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Producent"
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
new file mode 100644
index 00000000000..27209105cea
--- /dev/null
+++ b/addons/project/i18n/eu.po
@@ -0,0 +1,1424 @@
+# Basque translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-06 11:02+0000\n"
+"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned tasks"
+msgstr "Esleitutako Atazak"
+
+#. module: project
+#: model:process.process,name:project.process_process_tasksprocess0
+msgid "Tasks Process"
+msgstr "Ataza Prozesua"
+
+#. module: project
+#: help:project.task.delegate,init,name:0
+msgid "New title of the task delegated to the user."
+msgstr "Erabiltzailearen esku gelditu den atazaren izenburu berria."
+
+#. module: project
+#: view:config.compute.remaining:0
+msgid "Change Remaining Hours"
+msgstr "Gelditzen diren orduak aldatu"
+
+#. module: project
+#: model:ir.actions.wizard,name:project.wizard_close_task
+msgid "Close Task"
+msgstr "Ataza Itxi"
+
+#. module: project
+#: view:project.task:0
+msgid "Project Tasks"
+msgstr "Proiektuko Atazak"
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr "Ireki Burututako Ataza"
+
+#. module: project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Modelo izen ezegokia ekintza definizioan."
+
+#. module: project
+#: wizard_field:project.task.delegate,init,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr "Balidatzeko orduak"
+
+#. module: project
+#: field:project.project,progress_rate:0
+msgid "Progress"
+msgstr "Aurrerapena"
+
+#. module: project
+#: help:config.compute.remaining,remaining_hours:0
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+"Gelditzen den denbora osoa. Ataza esleituta duenak periodikoki ber-estimatu "
+"ahal du."
+
+#. module: project
+#: field:project.project,child_id:0
+msgid "Subproject"
+msgstr "Azpiproiektua"
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr "Proiektu Partaideak"
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_my_project_my_run
+#: model:ir.ui.menu,name:project.menu_open_view_my_project_my_run
+msgid "My Running Projects"
+msgstr "Abian dauden Nire Proiektuak"
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr "Delegatutako Atazak"
+
+#. module: project
+#: help:project.project,warn_header:0
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+"Ataza ixten denean bezeroari bidaltzen zaion abisu epostan goiburukoa "
+"gehituta."
+
+#. module: project
+#: field:project.task,priority:0
+msgid "Importance"
+msgstr "Garrantzia"
+
+#. module: project
+#: view:config.compute.remaining:0
+msgid "Update"
+msgstr "Eguneratu"
+
+#. module: project
+#: help:project.task.delegate,init,user_id:0
+msgid "User you want to delegate this task to."
+msgstr "Ataza hau delegatuko zaion erabiltzailea."
+
+#. module: project
+#: model:ir.actions.wizard,name:project.wizard_attachment_task
+msgid "All Attachments"
+msgstr "Eranskin Guztiak"
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr "Egiteko zain jarri"
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr "Betebeharrak Definitu eta Planteatutako Orduak Ezarri."
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+#: model:ir.ui.menu,name:project.menu_task_types
+msgid "Task Types"
+msgstr "Ataza Motak"
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr "Txantiloian oinarritutako proiektu berria"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr "Proiektuaren atazak"
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very urgent"
+msgstr "Oso urgentea"
+
+#. module: project
+#: wizard_button:project.task.delegate,init,valid:0
+msgid "Validate"
+msgstr "Balidatu"
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Project management module that track multi-level projects, tasks,\n"
+"works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+"    "
+msgstr ""
+"Proiektu kudeaketa modulua. Maila askotako proiektuak, atazak, atazetan "
+"egindako lanak,\n"
+" eta abarren jarraipena egiten du. Planifikazioa bistaratu, atazak ordenatu, "
+"eta abar egiteko gai da.\n"
+"    "
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
+#: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
+msgid "My Tasks in Progress"
+msgstr "Abian dauden Nire Atazak"
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr "Txantiloi bezala ezarri"
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr "Ataza zirriborroa"
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: field:project.task.work,task_id:0
+msgid "Task"
+msgstr "Ataza"
+
+#. module: project
+#: help:project.task.delegate,init,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task."
+msgstr ""
+"Ataza hau delegatu diozun erabiltzailearen lana balioztatzeko denbora "
+"estimatua."
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,notes:0
+#: view:project.task:0
+#: field:project.task,notes:0
+msgid "Notes"
+msgstr "Oharrak"
+
+#. module: project
+#: selection:res.company,project_time_mode:0
+msgid "Days"
+msgstr "Egunak"
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_analysis
+msgid "Analysis"
+msgstr "Analisia"
+
+#. module: project
+#: model:ir.model,name:project.model_project_project
+#: view:project.project:0
+#: field:project.task,project_id:0
+#: model:res.request.link,name:project.req_link_project
+msgid "Project"
+msgstr "Proiektua"
+
+#. module: project
+#: view:project.task:0
+msgid "Start Task"
+msgstr "Ataza Hasi"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
+#: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
+msgid "My Draft Tasks"
+msgstr "Nire Ataza Zirriborroak"
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Automatic variables for headers and footer. Use exactly the same notation."
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: selection:project.task,state:0
+msgid "Cancelled"
+msgstr "Ezeztatua"
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_header:0
+msgid "Mail Header"
+msgstr "Eposta Goiburua"
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr "Egindako ataza"
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr "Ataza Eginda"
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr "Atazak beste erabiltzaile batean delegatzen ditu."
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr "Atazan egindako lanen batura erabiliz kalkulatuta."
+
+#. module: project
+#: help:project.project,warn_customer:0
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,init,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user."
+msgstr ""
+
+#. module: project
+#: field:project.project,category_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+msgid "All Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Planning"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project
+#: field:project.project,partner_id:0
+#: field:project.task,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project
+#: field:project.task,planned_hours:0
+#: wizard_field:project.task.delegate,init,planned_hours:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Task: %(name)s"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegations"
+msgstr ""
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "My projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_open_view_project_all
+msgid "All projects"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr ""
+
+#. module: project
+#: wizard_view:project.task.delegate,init:0
+msgid "Delegated Task"
+msgstr ""
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project
+#: wizard_field:project.task.delegate,init,new_task_description:0
+msgid "New Task Description"
+msgstr ""
+
+#. module: project
+#: help:project.project,notes:0
+msgid "Internal description of the project."
+msgstr ""
+
+#. module: project
+#: field:project.project,parent_id:0
+msgid "Parent Project"
+msgstr ""
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project
+#: field:project.task,type:0
+#: field:project.task.type,name:0
+msgid "Type"
+msgstr ""
+
+#. module: project
+#: selection:res.company,project_time_mode:0
+msgid "Weeks"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task5_prog
+#: model:ir.ui.menu,name:project.menu_tasks_yours_prog
+msgid "My Current Tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_project
+#: model:ir.ui.menu,name:project.menu_open_view_project
+msgid "New Project"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project
+#: view:config.compute.remaining:0
+#: field:config.compute.remaining,remaining_hours:0
+#: field:project.task,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+msgid "Project task type"
+msgstr ""
+
+#. module: project
+#: field:project.project,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr ""
+
+#. module: project
+#: selection:res.company,project_time_mode:0
+msgid "Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task5_pending
+#: model:ir.ui.menu,name:project.menu_tasks_yours_pending
+msgid "My Pending Tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
+#: model:ir.actions.act_window,name:project.action_view_task6_prog
+#: model:ir.ui.menu,name:project.menu_action_view_task6_prog
+msgid "Tasks in Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task7
+#: model:ir.ui.menu,name:project.menu_action_view_task7
+msgid "Unassigned Tasks"
+msgstr ""
+
+#. module: project
+#: wizard_field:project.task.delegate,init,name:0
+msgid "Delegated Title"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_my_project
+#: model:ir.ui.menu,name:project.menu_open_view_my_project
+msgid "My Projects"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,init,planned_hours:0
+msgid "Estimated time to close this task by the delegated user."
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_definitions
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: project
+#: field:project.project,date_start:0
+#: field:project.task,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_all_project
+#: view:project.project:0
+msgid "Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Dates"
+msgstr ""
+
+#. module: project
+#: field:project.task,history:0
+msgid "Task Details"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_triggerinvoice0
+msgid "Trigger Invoice"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "User: %(user_id)s"
+msgstr ""
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project
+#: field:project.project,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+#: model:ir.ui.menu,name:project.menu_main
+#: view:res.company:0
+msgid "Project Management"
+msgstr ""
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_tasks
+#: view:project.task:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Task type"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_new
+#: model:ir.ui.menu,name:project.menu_action_view_task_new
+msgid "New Task"
+msgstr ""
+
+#. module: project
+#: help:project.project,timesheet_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project's members"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_taskinvoice0
+msgid "After task is completed, Create its invoice."
+msgstr ""
+
+#. module: project
+#: help:project.task,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task4
+#: model:ir.ui.menu,name:project.menu_action_view_task4
+msgid "My Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Status: %(state)s"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Planned"
+msgstr ""
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid "Sum of total hours of all tasks related to this project."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Information"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Review"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr ""
+
+#. module: project
+#: wizard_field:project.task.close,mail_ask,email:0
+msgid "E-Mails"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: view:project.task:0
+#: selection:project.task,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project
+#: field:project.project,manager:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,init,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project
+#: field:project.task,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,init,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed."
+msgstr ""
+
+#. module: project
+#: field:res.company,project_time_mode:0
+msgid "Project Time Unit"
+msgstr ""
+
+#. module: project
+#: field:project.project,complete_name:0
+#: field:project.project,name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project
+#: wizard_button:project.task.close,mail_ask,mail_send:0
+msgid "Send Message"
+msgstr ""
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project
+#: field:project.task,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_bug
+msgid "Bug"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_quote
+msgid "Quotation"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Task edition"
+msgstr ""
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr ""
+
+#. module: project
+#: field:project.project,timesheet_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project
+#: selection:res.company,project_time_mode:0
+msgid "Months"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr ""
+
+#. module: project
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project
+#: help:res.company,project_time_mode:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_project
+msgid "User's projects"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reactivate Project"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project
+#: wizard_view:project.task.delegate,init:0
+msgid "Delegate this task to a user"
+msgstr ""
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project
+#: field:project.task,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project
+#: field:project.task,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid "Sum of spent hours of all tasks related to this project."
+msgstr ""
+
+#. module: project
+#: help:project.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid "Sum of planned hours of all tasks related to this project."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
+msgid "Month works"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.report.xml,name:project.report_project_project_gantt
+#: model:ir.actions.report.xml,name:project.report_project_task_gantt
+msgid "Gantt Representation"
+msgstr ""
+
+#. module: project
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
+#. module: project
+#: field:project.project,state:0
+msgid "State"
+msgstr ""
+
+#. module: project
+#: field:project.task,name:0
+msgid "Task summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Date Start: %(date_start)s"
+msgstr ""
+
+#. module: project
+#: help:project.project,category_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,init,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project
+#: view:config.compute.remaining:0
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.project:0
+#: view:project.task:0
+#: wizard_button:project.task.close,mail_ask,end:0
+#: wizard_button:project.task.delegate,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
+msgid "Create a Task"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+msgid "Open"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "ID: %(task_id)s"
+msgstr ""
+
+#. module: project
+#: selection:project.task,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr ""
+
+#. module: project
+#: field:project.task,parent_id:0
+msgid "Parent Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delay"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project
+#: wizard_view:project.task.close,mail_ask:0
+msgid "Send mail to customer"
+msgstr ""
+
+#. module: project
+#: field:project.project,warn_manager:0
+msgid "Warn Manager"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_config_compute_remaining
+msgid "config.compute.remaining"
+msgstr ""
+
+#. module: project
+#: wizard_button:project.task.close,mail_ask,close:0
+msgid "Quiet close"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,init,prefix:0
+msgid "New title of your own task to validate the work done."
+msgstr ""
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project
+#: field:project.task,description:0
+#: wizard_field:project.task.close,mail_ask,description:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_taskinvoice0
+msgid "Task invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_my_project_open
+#: model:ir.ui.menu,name:project.menu_open_view_my_project_open
+msgid "Projects Structure"
+msgstr ""
+
+#. module: project
+#: wizard_view:project.task.delegate,init:0
+msgid "Validation Task"
+msgstr ""
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+msgid "Running"
+msgstr ""
+
+#. module: project
+#: help:project.project,parent_id:0
+msgid ""
+"If you have [?] in the name, it means there are no analytic account linked "
+"to project."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.wizard,name:project.wizard_delegate_task
+msgid "Delegate Task"
+msgstr ""
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Project tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,warn_manager:0
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_feature
+msgid "New Feature"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr ""
+
+#. module: project
+#: wizard_field:project.task.delegate,init,prefix:0
+msgid "Your Task Title"
+msgstr ""
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr ""
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project
+#: field:project.task,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+#: model:ir.ui.menu,name:project.menu_template_project
+msgid "Template of Projects"
+msgstr ""
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.task,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project
+#: help:project.project,warn_footer:0
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Partner Info"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_config_compute_remaining
+msgid "Compute Remaining Hours"
+msgstr ""
+
+#. module: project
+#: wizard_field:project.task.delegate,init,state:0
+msgid "Validation State"
+msgstr ""
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error ! You can not create recursive projects."
+msgstr ""
+
+#. module: project
+#: field:project.task,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project
+#: wizard_field:project.task.delegate,init,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Date Stop: %(date_stop)s"
+msgstr ""
+
+#. module: project
+#: field:project.project,date_end:0
+msgid "Expected End"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,warn_footer:0
+msgid "Mail Footer"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_project_open
+#: model:ir.ui.menu,name:project.menu_open_view_project_open
+msgid "Running projects"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My project's planning"
+msgstr ""
+
+#. module: project
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
+msgid "My Task's Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_board_note_tree
+msgid "Public Notes"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.ui.menu,name:project.menu_board_project
+msgid "Project Dashboard"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Board for project users"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_pipeline_user
+msgid "Pipeline of tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Planning"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.act_my_account
+msgid "My accounts to invoice"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project_manager
+#: model:ir.ui.menu,name:project.menu_board_project_manager
+msgid "Project Manager Dashboard"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Deadlines"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "User's timesheets"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "Project manager board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.action_view_task_tree
+msgid "My Open Tasks"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My tasks board"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My user's pipeline"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_tree_month
+msgid "Tasks finished by project (this month)"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,task_closed:0
+#: field:report.project.task.user,task_closed:0
+msgid "Task Closed"
+msgstr ""
+
+#. module: project
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_63
+msgid "This Month"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,closing_days:0
+#: field:report.project.task.user,closing_days:0
+msgid "Avg Closing Delay"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task
+#: view:report.project.task:0
+msgid "Tasks by project"
+msgstr ""
+
+#. module: project
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:report.project.task,name:0 field:report.project.task.user,name:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_tree
+#: model:ir.ui.menu,name:project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.task.user.pipeline.open:0
+msgid "Tasks by User"
+msgstr ""
+
+#. module: project
+#: selection:report.task.user.pipeline.open,task_state:0
+msgid "No Task"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,shortdesc:project.module_meta_information
+msgid "Report on tasks by user for projects"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project.menu_timesheet_task_user
+msgid "Timesheet / Task Hours Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.next_id_57
+msgid "Reporting"
+msgstr ""
+
+#. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_closed_task_board
+msgid "Task Closed Within Past 15 Days"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_hrs:0
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_nbr:0
+msgid "Task Number"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project
+#: field:report.task.user.pipeline.open,task_progress:0
+msgid "Task Progress"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_closed_task
+msgid "Closed Task Report"
+msgstr ""
+
+#. module: project
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project
+#: view:report.closed.task:0
+msgid "Closed Tasks"
+msgstr ""
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
new file mode 100644
index 00000000000..50dc71c0666
--- /dev/null
+++ b/addons/project_issue/i18n/de.po
@@ -0,0 +1,965 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 09:23+0000\n"
+"PO-Revision-Date: 2010-10-05 13:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+msgid "Severity"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "is Open."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "An Issue created"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "365 Days"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.stage,name:project_issue.stage2
+msgid "Fixed"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,user_id2losed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.resource.type,name:project_issue.type2
+msgid "Version 4.4"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr ""
+
+#. module: project_issue
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,perc_done:0
+msgid "%Done"
+msgstr ""
+
+#. module: project_issue
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,avg_answers:0
+msgid "Avg. Answers"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.stage,name:project_issue.stage3
+msgid "Won't fix"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,stage_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "Tasks"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,perc_cancel:0
+msgid "%Cancel"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication history"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Escalate"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Salesman"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid ""
+"\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_stage_act
+msgid "Issue Stages"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.resource.type,name:project_issue.type1
+msgid "Version 4.2"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_issue
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.stage,name:project_issue.stage6
+msgid "Works For Me"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "7 Days"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "Issue "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "30 Days"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.stage,name:project_issue.stage5
+msgid "Awaiting Response"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "from Mailgate."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "   Today   "
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.stage,name:project_issue.stage1
+msgid "Accepted as Bug"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Resolution"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,user_id2:0
+msgid "Assignee"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_issue
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.stage,name:project_issue.stage4
+msgid "Invalid"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr ""
+
+#. module: project_issue
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Emails"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,name:0
+msgid "Name"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:0
+#, python-format
+msgid "is Closed."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+msgid "Todo"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/project_issue_sheet/i18n/de.po b/addons/project_issue_sheet/i18n/de.po
new file mode 100644
index 00000000000..04d2b2afa0e
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/de.po
@@ -0,0 +1,88 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:05+0000\n"
+"PO-Revision-Date: 2010-10-05 13:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_issue_sheet
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: project_issue_sheet
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr ""
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
new file mode 100644
index 00000000000..4087328ec2c
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/pl.po
@@ -0,0 +1,90 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:05+0000\n"
+"PO-Revision-Date: 2010-10-07 16:53+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_issue_sheet
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Pozycja analaityczna"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "Problem w Projekcie"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Pozycja karty czasu pracy"
+
+#. module: project_issue_sheet
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Karta czasu pracy"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Data utworzenia"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Karty czasu pracy"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr "Problem"
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
new file mode 100644
index 00000000000..b78d2f7d390
--- /dev/null
+++ b/addons/project_long_term/i18n/de.po
@@ -0,0 +1,549 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:11+0000\n"
+"PO-Revision-Date: 2010-10-05 13:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+#: view:project.phase:0
+msgid "Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "_Compute"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_long_term
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.resource.allocation:0
+msgid "Resource Allocations"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "R.A."
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "Day"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.resource.allocation,useability:0
+msgid "Usability"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Usability of this resource for this project phase in percentage (=50%)"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+#: field:project.resource.allocation,phase_id_date_end:0
+msgid "Ending Date of the phase"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "This wizard will schedule phases for all or specified project"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+msgid "Compute Task Scheduling"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,constraint_date_start:0
+#: field:project.phase,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_tasks.py:0
+#, python-format
+msgid "Project must have members assigned !"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error! Task start-date must be lower then task end-date."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "User"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "No responsible person assigned !"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_tasks.py:0
+#: code:addons/project_long_term/wizard/project_schedule_tasks.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "You must assign a responsible person for phase '%s' !"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_schedule_tasks.py:0
+#, python-format
+msgid "Phase must have resources assigned !"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Other Info"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+#: field:project.resource.allocation,phase_id_date_start:0
+msgid "Starting Date of the phase"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+#: field:project.phase,date_end:0
+msgid "End Date"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+#: view:project.phase:0
+msgid "Scheduling"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr ""
diff --git a/addons/project_messages/i18n/de.po b/addons/project_messages/i18n/de.po
new file mode 100644
index 00000000000..b7199fb6ff4
--- /dev/null
+++ b/addons/project_messages/i18n/de.po
@@ -0,0 +1,119 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:28+0000\n"
+"PO-Revision-Date: 2010-10-05 13:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr ""
+
+#. module: project_messages
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr ""
+
+#. module: project_messages
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Communication Messages"
+msgstr ""
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr ""
+
+#. module: project_messages
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+
+#. module: project_messages
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr ""
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr ""
diff --git a/addons/project_messages/i18n/pl.po b/addons/project_messages/i18n/pl.po
new file mode 100644
index 00000000000..30c1ea5569c
--- /dev/null
+++ b/addons/project_messages/i18n/pl.po
@@ -0,0 +1,121 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:28+0000\n"
+"PO-Revision-Date: 2010-10-07 16:53+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"Language-Team: Polish <pl@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Do"
+
+#. module: project_messages
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Niewłaściwy XML dla architektury widoku!"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Od"
+
+#. module: project_messages
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Communication Messages"
+msgstr "Komunikacja"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "Pozostaw puste do rozpowszechnienia wiadomości"
+
+#. module: project_messages
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Wiadomości"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+
+#. module: project_messages
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Wiadomość"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr ""
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr ""
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
new file mode 100644
index 00000000000..44c3a464322
--- /dev/null
+++ b/addons/share/i18n/de.po
@@ -0,0 +1,227 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:39+0000\n"
+"PO-Revision-Date: 2010-10-05 13:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: share
+#: view:share.create:0
+msgid "Exising Users"
+msgstr ""
+
+#. module: share
+#: view:share.create:0
+msgid "Step 1: Chose the action and the additional domain"
+msgstr ""
+
+#. module: share
+#: field:share.create,user_ids:0
+msgid "Share Users"
+msgstr ""
+
+#. module: share
+#: view:share.create:0
+msgid "Step 3: Chose Access Mode"
+msgstr ""
+
+#. module: share
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: share
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: view:share.create:0
+msgid "New Users"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: share
+#: view:share.result:0
+msgid "Step 4: Share Users Detail"
+msgstr ""
+
+#. module: share
+#: view:share.create:0
+msgid "Next"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Share Group is exits without sharing !"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_result
+msgid "share.result"
+msgstr ""
+
+#. module: share
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: share
+#: selection:share.create,user_type:0
+msgid "New"
+msgstr ""
+
+#. module: share
+#: selection:share.create,access_mode:0
+msgid "READ ONLY"
+msgstr ""
+
+#. module: share
+#: field:share.result,users:0
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: view:share.result:0
+msgid "Send Email"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr ""
+
+#. module: share
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: share
+#: selection:share.create,access_mode:0
+msgid "READ & WRITE"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Step:3 Sharing Wizard"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_create
+msgid "Create share"
+msgstr ""
+
+#. module: share
+#: field:share.create,user_type:0
+msgid "User Type"
+msgstr ""
+
+#. module: share
+#: view:share.create:0
+msgid "Step 2: Chose the User type"
+msgstr ""
+
+#. module: share
+#: field:share.create,new_user:0
+msgid "New user"
+msgstr ""
+
+#. module: share
+#: field:share.create,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: share
+#: field:share.create,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: share
+#: field:share.create,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+#: field:res.users,share:0
+#: view:share.create:0
+#: view:share.result:0
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Step:2 Sharing Wizard"
+msgstr ""
+
+#. module: share
+#: selection:share.create,user_type:0
+msgid "Existing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Step:4 Share Users Detail"
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: view:share.create:0
+#: view:share.result:0
+msgid "Cancel"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: field:share.create,read_access:0
+#: field:share.create,write_access:0
+msgid "Write Access"
+msgstr ""
diff --git a/addons/stock_planning/i18n/de.po b/addons/stock_planning/i18n/de.po
new file mode 100644
index 00000000000..3234d49ae52
--- /dev/null
+++ b/addons/stock_planning/i18n/de.po
@@ -0,0 +1,1470 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:50+0000\n"
+"PO-Revision-Date: 2010-10-05 13:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Already Out: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#, python-format
+msgid "No products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Pick List "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "  Creation Date: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Manual planning for "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Procurement created in MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Requisition ("
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Already In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Minimum stock: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Confirmed In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid " according to state:"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Planned In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "MPS("
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Pick created from MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr ""
diff --git a/addons/thunderbird/i18n/eu.po b/addons/thunderbird/i18n/eu.po
new file mode 100644
index 00000000000..17c268d7652
--- /dev/null
+++ b/addons/thunderbird/i18n/eu.po
@@ -0,0 +1,86 @@
+# Basque translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:05+0000\n"
+"PO-Revision-Date: 2010-10-05 22:18+0000\n"
+"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "Hona Kopiatu"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Objetuaren izena x_ -z hasi behar da eta ezin ditu karaktere berezirik izan!"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "Deskribapena"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "Erreferentzia"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr "Thunderbird epostak"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "Erantsitako Fitxategiak"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "Erabiltzailea"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "Jasotzailea"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "Gaia"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr ""
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Thunderbird Interfazea"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "Bidaltzailea"
diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po
index 7064d8bab88..1da34d2bef1 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/wiki/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:49+0000\n"
+"PO-Revision-Date: 2010-10-07 19:19+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -140,7 +140,7 @@ msgstr "Hiskorisk skillnad"
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,page:0
 msgid "Group Home Page"
-msgstr ""
+msgstr "Gruppens hemsida"
 
 #. module: wiki
 #: field:wiki.wiki,write_uid:0
@@ -240,7 +240,7 @@ msgstr "Skapad datum"
 #: model:ir.actions.act_window,name:wiki.action_history
 #: model:ir.ui.menu,name:wiki.menu_action_history
 msgid "All Page Histories"
-msgstr ""
+msgstr "Alla sidors historik"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
new file mode 100644
index 00000000000..bacf06ac713
--- /dev/null
+++ b/addons/wiki_faq/i18n/de.po
@@ -0,0 +1,30 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 11:42+0000\n"
+"PO-Revision-Date: 2010-10-05 13:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr ""
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
new file mode 100644
index 00000000000..64a35b43a8e
--- /dev/null
+++ b/addons/wiki_quality_manual/i18n/de.po
@@ -0,0 +1,30 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 11:48+0000\n"
+"PO-Revision-Date: 2010-10-05 13:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
+msgid ""
+"Quality Manual Template\n"
+"    "
+msgstr ""
+
+#. module: wiki_quality_manual
+#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
+msgid "Document Management - Wiki - Quality Manual"
+msgstr ""
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
new file mode 100644
index 00000000000..8d74476d08f
--- /dev/null
+++ b/addons/wiki_sale_faq/i18n/de.po
@@ -0,0 +1,62 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 11:54+0000\n"
+"PO-Revision-Date: 2010-10-05 13:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
+msgid "Documents"
+msgstr ""
+
+#. module: wiki_sale_faq
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
+msgid "FAQ"
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
+msgid "Wiki Pages"
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+
+#. module: wiki_sale_faq
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: wiki_sale_faq
+#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
+msgid "Wiki -Sale - FAQ"
+msgstr ""

From 669e8176a4c968f4f3d893a47c625b975a4d5cab Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 10:42:30 +0530
Subject: [PATCH 433/632] [REF]

bzr revid: mra@mra-laptop-20101008051230-x75l5ste8z3vlkhn
---
 addons/account/account.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f6fc33668b5..0e458f3036d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1776,26 +1776,25 @@ class account_tax(osv.osv):
 
     def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None, quantity=0):
         taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
-
         res = []
         cur_price_unit=price_unit
         for tax in taxes:
             # we compute the amount for the current tax object and append it to the result
 
             data = {'id':tax.id,
-                            'name':tax.description and tax.description + " - " + tax.name or tax.name,
-                            'account_collected_id':tax.account_collected_id.id,
-                            'account_paid_id':tax.account_paid_id.id,
-                            'base_code_id': tax.base_code_id.id,
-                            'ref_base_code_id': tax.ref_base_code_id.id,
-                            'sequence': tax.sequence,
-                            'base_sign': tax.base_sign,
-                            'tax_sign': tax.tax_sign,
-                            'ref_base_sign': tax.ref_base_sign,
-                            'ref_tax_sign': tax.ref_tax_sign,
-                            'price_unit': cur_price_unit,
-                            'tax_code_id': tax.tax_code_id.id,
-                            'ref_tax_code_id': tax.ref_tax_code_id.id,
+                    'name':tax.description and tax.description + " - " + tax.name or tax.name,
+                    'account_collected_id':tax.account_collected_id.id,
+                    'account_paid_id':tax.account_paid_id.id,
+                    'base_code_id': tax.base_code_id.id,
+                    'ref_base_code_id': tax.ref_base_code_id.id,
+                    'sequence': tax.sequence,
+                    'base_sign': tax.base_sign,
+                    'tax_sign': tax.tax_sign,
+                    'ref_base_sign': tax.ref_base_sign,
+                    'ref_tax_sign': tax.ref_tax_sign,
+                    'price_unit': cur_price_unit,
+                    'tax_code_id': tax.tax_code_id.id,
+                    'ref_tax_code_id': tax.ref_tax_code_id.id,
             }
             res.append(data)
             if tax.type=='percent':

From 68fd91458dacb3dd1c4944359aea43fd6f4bf615 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 10:45:39 +0530
Subject: [PATCH 434/632] [MOD] small change in label

bzr revid: vir@tinyerp.com-20101008051539-mf3khodsfdcm5b1x
---
 addons/hr_holidays/wizard/hr_holidays_summary_department.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 4409254c16e..5ea75cb7e30 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -30,7 +30,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _columns = {
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holyday State', required=True)
+        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Leave Type', required=True)
     }
 
     _defaults = {

From 05ed5b453100d4d0cbb09af0856be5978df82ce7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 10:46:10 +0530
Subject: [PATCH 435/632] [Fix] hr_attendance: Fix the pylint warning

bzr revid: sbh@tinyerp.com-20101008051610-glvci1rbuc5ytuyo
---
 addons/hr_attendance/report/timesheet.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index b0845422655..abedddd50c5 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -83,7 +83,6 @@ class report_custom(report_rml):
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if att['action'] == 'sign_out':
                             week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + ((dt - ldt).seconds/3600)
-                        ldt = dt
 
                 # Week xml representation
                 week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]

From cf0cddde124c83e71d82a803a7f221b8b79037ca Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 10:47:56 +0530
Subject: [PATCH 436/632] [FIX] Account: Account tax if type=None

bzr revid: mra@mra-laptop-20101008051756-ds1bewpn9ltdas03
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 0e458f3036d..16e19efa050 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1815,7 +1815,7 @@ class account_tax(osv.osv):
                 data['amount'] = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)
                 data['balance'] = cur_price_unit
 
-            amount2 = data['amount']
+            amount2 = data.get('amount', 0.0)
             if len(tax.child_ids):
                 if tax.child_depend:
                     latest = res.pop()

From 86a51c61e926c1d03d13f5a202f6b92914c3455b Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 10:55:18 +0530
Subject: [PATCH 437/632] [MOD] small changes in leave report

bzr revid: vir@tinyerp.com-20101008052518-ip7ask30viaez2bx
---
 addons/hr_holidays/report/hr_holidays_report_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index ab8afeae30b..b2fa98a7720 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -54,7 +54,7 @@
 	                <separator orientation="vertical"/>
 	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
 	                	help = "Draft and Confirmed leaves"/>
-	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
+	               	<filter string="Validated" name="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
                   <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
 					<separator orientation="vertical"/>
@@ -98,7 +98,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_department':1, 'group_by':[], 'group_by_no_leaf':1} </field>
+        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 

From 0a97edf8b3606179c15bdc49d6bfbbf186d33dc3 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 11:05:00 +0530
Subject: [PATCH 438/632] [FIX] Account tax

bzr revid: mra@mra-laptop-20101008053500-dig729ksvzd997ju
---
 addons/account/account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 16e19efa050..65549a38088 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1893,9 +1893,9 @@ class account_tax(osv.osv):
         total = 0.0
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')) - total
+                r['amount'] = round(r.get('balance', 0.0) * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')) - total
             else:
-                r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+                r['amount'] = round(r.get('amount', 0.0) * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
                 total += r['amount']
         return res
 

From c2dd699dd3c6534d03d779c265bfbc1d94a42d01 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Fri, 8 Oct 2010 11:22:53 +0530
Subject: [PATCH 439/632] [REF]

bzr revid: vth@tinyerp.com-20101008055253-ijlsep448i0z71j9
---
 addons/account/account.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 65549a38088..2a994d1e533 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1891,11 +1891,12 @@ class account_tax(osv.osv):
         """
         res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
         total = 0.0
+        precision_pool = self.pool.get('decimal.precision')
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r.get('balance', 0.0) * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')) - total
+                r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
             else:
-                r['amount'] = round(r.get('amount', 0.0) * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+                r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
                 total += r['amount']
         return res
 

From 0943553c4df6a3693050f2870ff20a5a149a22c4 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 11:22:04 +0530
Subject: [PATCH 440/632] [REF] account

bzr revid: mra@mra-laptop-20101008055204-jlg6cov6m5hdadid
---
 addons/account/account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 2a994d1e533..fbbba2b9a6c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1859,7 +1859,7 @@ class account_tax(osv.osv):
                 tex.append(tax)
         tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
         for r in tin:
-            totalex -= r['amount']
+            totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
         try:
             totlex_qty=totalex/quantity
@@ -1867,7 +1867,7 @@ class account_tax(osv.osv):
             pass
         tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
         for r in tex:
-            totalin += r['amount']
+            totalin += r.get('amount', 0.0)
         return {
             'total': totalex,
             'total_included': totalin,

From 996e8d70fb83f378070a4e6640dd009c32d07b52 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Fri, 8 Oct 2010 11:27:25 +0530
Subject: [PATCH 441/632] [MOD/IMP] hr_holidays : Usability Improvement in
 reports

bzr revid: amp@tinyerp.com-20101008055725-xwvpyigj05e1uhhj
---
 addons/hr_holidays/report/hr_holidays_report.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 9a259f1fe15..5d2dc27c0de 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -64,9 +64,9 @@ class hr_holidays_report(osv.osv):
                      s.employee_id,
                      s.category_id,
                      s.user_id as user_id,
-                     to_char(s.create_date, 'YYYY') as year,
-                     to_char(s.create_date, 'MM') as month,
-                     to_char(s.create_date, 'YYYY-MM-DD') as day,
+                     to_char(s.date_from, 'YYYY') as year,
+                     to_char(s.date_from, 'MM') as month,
+                     to_char(s.date_from, 'YYYY-MM-DD') as day,
                      s.holiday_status_id,
                      s.department_id,
                      s.state,

From d7e360158f9565acd2d3a51f8abb76702de8919c Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 11:43:09 +0530
Subject: [PATCH 442/632] [REF]

bzr revid: mra@mra-laptop-20101008061309-k8yfv27lvhhrgoc7
---
 addons/account_voucher/account_voucher.py |  4 ++--
 addons/auction/auction.py                 |  4 ++--
 addons/point_of_sale/pos.py               | 12 ++++++------
 addons/purchase/purchase.py               |  6 +++---
 addons/sale/sale.py                       |  6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 6d3a70dd333..ed0d458337f 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -225,7 +225,7 @@ class account_voucher(osv.osv):
 
             if not tax[0].price_include:
                 for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes',[]):
-                    total_tax += tax_line.get('amount')
+                    total_tax += tax_line.get('amount', 0.0)
                 total += total_tax
             else:
                 line_ids2 = []
@@ -234,7 +234,7 @@ class account_voucher(osv.osv):
                     line_tax = 0.0
 
                     for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes',[]):
-                        line_tax += tax_line.get('amount')
+                        line_tax += tax_line.get('amount', 0.0)
                         line_total += tax_line.get('price_unit')
                     total_tax += line_tax
                     untax_amount = line.untax_amount or line.amount
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index c5d1c0fa89f..870194fa125 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -291,7 +291,7 @@ class auction_lots(osv.osv):
                         taxes += lot.auction_id.buyer_costs
                     tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes']
                     for t in tax:
-                        result += t['amount']
+                        result += t.get('amount', 0.0)
                     result += amount
                 elif name == "seller_price":
                     if lot.bord_vnd_id.tax_id:
@@ -300,7 +300,7 @@ class auction_lots(osv.osv):
                         taxes += lot.auction_id.seller_costs
                     tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes']
                     for t in tax:
-                        result += t['amount']
+                        result += t.get('amount', 0.0)
                     result += amount
                 elif name == "gross_revenue":
                     if lot.auction_id:
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 3132367d8bf..3b5f235251f 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -187,7 +187,7 @@ class pos_order(osv.osv):
                             res[order.id]['amount_tax'])
                 elif line.qty != 0.0:
                     for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.qty,  line.product_id, line.order_id.partner_id)['taxes']:
-                        val += c['amount']
+                        val += c.get('amount', 0.0)
                     res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
         return res
 
@@ -351,7 +351,7 @@ class pos_order(osv.osv):
 
 
     def test_order_lines(self, cr, uid, order, context=None):
-        """ Test order line is created or not for the order " 
+        """ Test order line is created or not for the order "
         @param name: Names of fields.
         @return: True
         """
@@ -552,7 +552,7 @@ class pos_order(osv.osv):
 
         """Create a new payment for the order"""
 
-        statement_obj= self.pool.get('account.bank.statement')        
+        statement_obj= self.pool.get('account.bank.statement')
         statementl_obj = self.pool.get('account.bank.statement.line')
         prod_obj = self.pool.get('product.product')
         property_obj=self.pool.get('ir.property')
@@ -625,7 +625,7 @@ class pos_order(osv.osv):
         return order_line_id, price
 
     def refund(self, cr, uid, ids, context=None):
-        """Create a copy of order  for refund order"""      
+        """Create a copy of order  for refund order"""
         clone_list = []
         line_obj = self.pool.get('pos.order.line')
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 51e294200cb..eb1f2a1ace0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -59,7 +59,7 @@ class purchase_order(osv.osv):
             for line in order.order_line:
                val1 += line.price_subtotal
                for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id.id, order.partner_id)['taxes']:
-                    val += c['amount']
+                    val += c.get('amount', 0.0)
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
             res[order.id]['amount_total']=res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
@@ -150,12 +150,12 @@ class purchase_order(osv.osv):
         ('wait', 'Waiting'),
         ('confirmed', 'Waiting Supplier Ack'),
         ('approved', 'Approved'),
-        ('except_picking', 'Shipping Exception'), 
+        ('except_picking', 'Shipping Exception'),
         ('except_invoice', 'Invoice Exception'),
         ('done', 'Done'),
         ('cancel', 'Cancelled')
     ]
-        
+
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True, select=True, help="unique number of the purchase order,computed automatically when the purchase order is created"),
         'origin': fields.char('Source Document', size=64,
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ad418a567bc..32e97a14d3c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -75,7 +75,7 @@ class sale_order(osv.osv):
             context = {}
         val = 0.0
         for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
-            val += c['amount']
+            val += c.get('amount', 0.0)
         return val
 
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
@@ -558,7 +558,7 @@ class sale_order(osv.osv):
             #
             if order.state == 'invoice_except':
                 self.write(cr, uid, [order.id], {'state' : 'progress'}, context=context)
-            
+
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -730,7 +730,7 @@ class sale_order(osv.osv):
             if picking_id:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-                
+
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
 

From f75a5aff9118bd1845755cad90925a568c3e8123 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 8 Oct 2010 11:45:23 +0530
Subject: [PATCH 443/632] [REM]:stock:removed lot location report.(same as
 location overviwe.)

bzr revid: apa@tinyerp.com-20101008061523-vmbl352ty3m5yhk5
---
 addons/stock/report/__init__.py      |   1 -
 addons/stock/report/lot_location.py  |  50 -------
 addons/stock/report/lot_location.rml | 212 ---------------------------
 addons/stock/stock_report.xml        |   1 -
 addons/stock/test/stock_report.yml   |  18 +--
 5 files changed, 5 insertions(+), 277 deletions(-)
 delete mode 100644 addons/stock/report/lot_location.py
 delete mode 100644 addons/stock/report/lot_location.rml

diff --git a/addons/stock/report/__init__.py b/addons/stock/report/__init__.py
index 63d02ca2717..5a53a5b79dd 100644
--- a/addons/stock/report/__init__.py
+++ b/addons/stock/report/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import product_stock
-import lot_location
 import ups
 import picking
 import lot_overview_all
diff --git a/addons/stock/report/lot_location.py b/addons/stock/report/lot_location.py
deleted file mode 100644
index c1b1ae9fe05..00000000000
--- a/addons/stock/report/lot_location.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-import pooler
-import time
-from report import report_sxw
-
-class lot_location(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(lot_location, self).__init__(cr, uid, name, context=context)
-        self.grand_total = 0.0
-
-        self.localcontext.update({
-            'time': time,
-            'process':self.process,
-            'qty_total':self._qty_total,
-        })
-
-    def process(self,location_id):
-        location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
-        data = location_obj._product_get_report(self.cr,self.uid, [location_id])
-        data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['name'])[0]['name']
-        self.grand_total += data['total']
-        return [data]
-
-    def _qty_total(self):
-        return str( self.grand_total)
-
-report_sxw.report_sxw('report.lot.location', 'stock.location', 'addons/stock/report/lot_location.rml', parser=lot_location)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml
deleted file mode 100644
index 76da9ec0480..00000000000
--- a/addons/stock/report/lot_location.rml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Locations" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-      <section>
-        <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
-        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table2">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] Location</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Product</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">Quantity</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">
-                <font color="white"> </font>
-              </para>
-            </td>
-          </tr>
-        </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table3">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-          </tr>
-        </blockTable>
-        <section>
-          <para style="terp_default_9">[[ repeatIn(ob['product'], 'p') ]]</para>
-          <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table6">
-            <tr>
-              <td>
-                <para style="terp_default_9">
-                  <font color="white"> </font>
-                </para>
-              </td>
-              <td>
-                <para style="terp_default_9">[ [[p['code'] ]] ] [[ p['prod_name'] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ p['prod_qty'] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Right_9">[[ p['uom'] ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </section>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-        <blockTable colWidths="138.0,254.0,57.0,33.0" style="Table5">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">Total :</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details_Right">[[ ob['total'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_tblheader_Details">
-                <font color="white"> </font>
-              </para>
-            </td>
-          </tr>
-        </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
-      </section>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-    </section>
-    <blockTable colWidths="138.0,255.0,56.0,34.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Grand Total:</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ qty_total() ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 1332e840e10..e634d27153e 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -5,7 +5,6 @@
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Inventory" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
-        <!-- ODO: Useless report, duplicates the previous one? <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/> -->
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Inventory (with child locations)" rml="stock/report/lot_overview_all.rml"/>
         <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Inventory" rml="stock/report/stock_inventory_move.rml"/>
     </data>
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index 3d31977f123..48396019c6c 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -1,22 +1,14 @@
 -
   In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
-- 
+-
   !python {model: stock.location}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_13')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on stock location, we will print a lot location report
-- 
-  !python {model: stock.location}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lot.location').create(cr, uid, [ref('stock.stock_location_components')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'stock-stock_lot_location.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on stock inventory, we will print a Stock Inventory Move report
-- 
+-
   !python {model: stock.inventory}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.inventory.move').create(cr, uid, [ref('stock.stock_inventory_0')], {}, {})
@@ -24,7 +16,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'stock-stock_inventory_move.'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a stock, we will print a Stock Overview report
-- 
+-
   !python {model: stock.location}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.lot.stock.overview').create(cr, uid, [ref('stock.stock_location_14')], {}, {})
@@ -32,7 +24,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'stock-overview'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a stock, we will print a Stock Picking List report
-- 
+-
   !python {model: stock.picking}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.picking.list').create(cr, uid, [ref('stock.stock_picking_0')], {}, {})
@@ -40,7 +32,7 @@
         file(os.path.join(tools.config['test_report_directory'], 'stock-picking_list'+format), 'wb+').write(data)
 -
   In order to test the PDF reports defined on a Stock, we will print Product Stock Report
-- 
+-
   !python {model: product.product}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.stock.product.history').create(cr, uid, [ref('product.product_product_pc1')], {}, {})

From 9b3bb243e5210d88994e15ba1a0974d9719b5ffe Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 8 Oct 2010 11:59:57 +0530
Subject: [PATCH 444/632] [IMP] account: removed the static width assignment
 for 'ref' field from field_view_get of account move line.

bzr revid: vra@tinyerp.com-20101008062957-ur3zpitd8d6r1y04
---
 addons/account/account_move_line.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e93eb85bf38..ba6f4110ec1 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -905,7 +905,6 @@ class account_move_line(osv.osv):
         fld = sorted(fld, key=itemgetter(1))
 
         widths = {
-            'ref': 50,
             'statement_id': 50,
             'state': 60,
             'tax_code_id': 50,

From e88f1cb71aa54a013e05b0aee7c340b18df5b075 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Fri, 8 Oct 2010 12:10:16 +0530
Subject: [PATCH 445/632] [REF]

bzr revid: vth@tinyerp.com-20101008064016-oni0z14l5tnw3o3g
---
 addons/account/account.py | 77 ++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index fbbba2b9a6c..a9a1a9bdf9e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -68,8 +68,9 @@ class account_payment_term(osv.osv):
         pt = self.browse(cr, uid, id, context=context)
         amount = value
         result = []
+        obj_precision = self.pool.get('decimal.precision')
         for line in pt.line_ids:
-            prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+            prec = obj_precision.precision_get(cr, uid, 'Account')
             if line.value == 'fixed':
                 amt = round(line.value_amount, prec)
             elif line.value == 'procent':
@@ -700,7 +701,7 @@ class account_journal(osv.osv):
         return self.name_get(cr, user, ids, context=context)
 
     def onchange_type(self, cr, uid, ids, type, currency):
-        data_pool = self.pool.get('ir.model.data')
+        obj_data = self.pool.get('ir.model.data')
         user_pool = self.pool.get('res.users')
 
         type_map = {
@@ -722,8 +723,8 @@ class account_journal(osv.osv):
         if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
             view_id = 'account_journal_bank_view_multi'
 
-        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
-        data = data_pool.browse(cr, uid, data_id[0])
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
+        data = obj_data.browse(cr, uid, data_id[0])
 
         res.update({
             'centralisation':type == 'situation',
@@ -1155,7 +1156,7 @@ class account_move(osv.osv):
 
         if not valid_moves:
             raise osv.except_osv(_('Integrity Error !'), _('You cannot validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
-
+        obj_sequence = self.pool.get('ir.sequence')
         for move in self.browse(cr, uid, valid_moves):
             if move.name =='/':
                 new_name = False
@@ -1166,7 +1167,7 @@ class account_move(osv.osv):
                 else:
                     if journal.sequence_id:
                         c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
-                        new_name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id, context=c)
+                        new_name = obj_sequence.get_id(cr, uid, journal.sequence_id.id, context=c)
                     else:
                         raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
 
@@ -1266,6 +1267,7 @@ class account_move(osv.osv):
 
     def unlink(self, cr, uid, ids, context={}, check=True):
         toremove = []
+        obj_move_line = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context):
             if move['state'] != 'draft':
                 raise osv.except_osv(_('UserError'),
@@ -1274,8 +1276,8 @@ class account_move(osv.osv):
             line_ids = map(lambda x: x.id, move.line_id)
             context['journal_id'] = move.journal_id.id
             context['period_id'] = move.period_id.id
-            self.pool.get('account.move.line')._update_check(cr, uid, line_ids, context)
-            self.pool.get('account.move.line').unlink(cr, uid, line_ids, context=context)
+            obj_move_line._update_check(cr, uid, line_ids, context)
+            obj_move_line.unlink(cr, uid, line_ids, context=context)
             toremove.append(move.id)
         result = super(account_move, self).unlink(cr, uid, toremove, context)
         return result
@@ -1349,12 +1351,13 @@ class account_move(osv.osv):
             del context['__last_update']
 
         valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
-
+        obj_analytic_line = self.pool.get('account.analytic.line')
+        obj_move_line = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context):
             # Unlink old analytic lines on move_lines
             for obj_line in move.line_id:
                 for obj in obj_line.analytic_lines:
-                    self.pool.get('account.analytic.line').unlink(cr,uid,obj.id)
+                    obj_analytic_line.unlink(cr,uid,obj.id)
 
             journal = move.journal_id
             amount = 0
@@ -1388,7 +1391,7 @@ class account_move(osv.osv):
                     continue
                 # Update the move lines (set them as valid)
 
-                self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
+                obj_move_line.write(cr, uid, line_draft_ids, {
                     'journal_id': move.journal_id.id,
                     'period_id': move.period_id.id,
                     'state': 'valid'
@@ -1408,7 +1411,7 @@ class account_move(osv.osv):
                             code = account[line.account_id.id][0]
                             amount = account[line.account_id.id][1] * (line.debit + line.credit)
                         if (code or amount) and not (line.tax_code_id or line.tax_amount):
-                            self.pool.get('account.move.line').write(cr, uid, [line.id], {
+                            obj_move_line.write(cr, uid, [line.id], {
                                 'tax_code_id': code,
                                 'tax_amount': amount
                             }, context, check=False)
@@ -1424,20 +1427,20 @@ class account_move(osv.osv):
                 #
                 self._centralise(cr, uid, move, 'debit', context=context)
                 self._centralise(cr, uid, move, 'credit', context=context)
-                self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
+                obj_move_line.write(cr, uid, line_draft_ids, {
                     'state': 'valid'
                 }, context, check=False)
             else:
                 # We can't validate it (it's unbalanced)
                 # Setting the lines as draft
-                self.pool.get('account.move.line').write(cr, uid, line_ids, {
+                obj_move_line.write(cr, uid, line_ids, {
                     'journal_id': move.journal_id.id,
                     'period_id': move.period_id.id,
                     'state': 'draft'
                 }, context, check=False)
         # Create analytic lines for the valid moves
         for record in valid_moves:
-            self.pool.get('account.move.line').create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
+            obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
 
         valid_moves = [move.id for move in valid_moves]
         return len(valid_moves) > 0 and valid_moves or False
@@ -1521,13 +1524,14 @@ class account_tax_code(osv.osv):
                     GROUP BY line.tax_code_id',
                        (parent_ids,) + where_params)
         res=dict(cr.fetchall())
+        obj_precision = self.pool.get('decimal.precision')
         for record in self.browse(cr, uid, ids, context):
             def _rec_get(record):
                 amount = res.get(record.id, 0.0)
                 for rec in record.child_ids:
                     amount += _rec_get(rec) * rec.sign
                 return amount
-            res[record.id] = round(_rec_get(record), self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+            res[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
         return res
 
     def _sum_year(self, cr, uid, ids, name, args, context=None):
@@ -1764,9 +1768,10 @@ class account_tax(osv.osv):
 
     def _applicable(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
         res = []
+        obj_partener_address = self.pool.get('res.partner.address')
         for tax in taxes:
             if tax.applicable_type=='code':
-                localdict = {'price_unit':price_unit, 'address':self.pool.get('res.partner.address').browse(cr, uid, address_id), 'product':product, 'partner':partner}
+                localdict = {'price_unit':price_unit, 'address':obj_partener_address.browse(cr, uid, address_id), 'product':product, 'partner':partner}
                 exec tax.python_applicable in localdict
                 if localdict.get('result', False):
                     res.append(tax)
@@ -1778,6 +1783,7 @@ class account_tax(osv.osv):
         taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
         res = []
         cur_price_unit=price_unit
+        obj_partener_address = self.pool.get('res.partner.address')
         for tax in taxes:
             # we compute the amount for the current tax object and append it to the result
 
@@ -1806,7 +1812,7 @@ class account_tax(osv.osv):
                 data['tax_amount']=quantity
                # data['amount'] = quantity
             elif tax.type=='code':
-                address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
+                address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
                 localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
                 exec tax.python_compute in localdict
                 amount = localdict['result']
@@ -1902,7 +1908,7 @@ class account_tax(osv.osv):
 
     def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
         taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
-
+        obj_partener_address = self.pool.get('res.partner.address')
         res = []
         taxes.reverse()
         cur_price_unit = price_unit
@@ -1927,7 +1933,7 @@ class account_tax(osv.osv):
                 amount = tax.amount
 
             elif tax.type=='code':
-                address = address_id and self.pool.get('res.partner.address').browse(cr, uid, address_id) or None
+                address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
                 localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
                 exec tax.python_compute_inv in localdict
                 amount = localdict['result']
@@ -1986,8 +1992,9 @@ class account_tax(osv.osv):
         """
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
         total = 0.0
+        obj_precision = self.pool.get('decimal.precision')
         for r in res:
-            prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+            prec = obj_precision.precision_get(cr, uid, 'Account')
             if r.get('balance',False):
                 r['amount'] = round(r['balance'] * quantity, prec) - total
             else:
@@ -2197,11 +2204,12 @@ class account_subscription_line(osv.osv):
     def move_create(self, cr, uid, ids, context=None):
         tocheck = {}
         all_moves = []
+        obj_model = self.pool.get('account.model')
         for line in self.browse(cr, uid, ids, context=context):
             datas = {
                 'date': line.date,
             }
-            move_ids = self.pool.get('account.model').generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
+            move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
             tocheck[line.subscription_id.id] = True
             self.write(cr, uid, [line.id], {'move_id':move_ids[0]})
             all_moves.extend(move_ids)
@@ -2552,9 +2560,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_acc_template = self.pool.get('account.account.template')
         obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
         obj_fiscal_position = self.pool.get('account.fiscal.position')
-        data_pool = self.pool.get('ir.model.data')
+        obj_data = self.pool.get('ir.model.data')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
-
+        obj_tax_code = self.pool.get('account.tax.code')
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2578,7 +2586,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'company_id': company_id,
                 'sign': tax_code_template.sign,
             }
-            new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals)
+            new_tax_code = obj_tax_code.create(cr, uid, vals)
             #recording the new tax code to do the mapping
             tax_code_template_ref[tax_code_template.id] = new_tax_code
 
@@ -2662,8 +2670,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Creating Journals Sales and Purchase
         vals_journal={}
-        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
-        data = data_pool.browse(cr, uid, data_id[0])
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
+        data = obj_data.browse(cr, uid, data_id[0])
         view_id = data.res_id
 
         seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
@@ -2713,12 +2721,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Bank Journals
-        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
-        data = data_pool.browse(cr, uid, data_id[0])
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
+        data = obj_pool.browse(cr, uid, data_id[0])
         view_id_cash = data.res_id
 
-        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
-        data = data_pool.browse(cr, uid, data_id[0])
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
+        data = obj_data.browse(cr, uid, data_id[0])
         view_id_cur = data.res_id
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
@@ -2807,6 +2815,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
 
         if fp_ids:
+
+            obj_tax_fp = self.pool.get('account.fiscal.position.tax')
+            obj_ac_fp = self.pool.get('account.fiscal.position.account')
+
             for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
 
                 vals_fp = {
@@ -2815,9 +2827,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 }
                 new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
 
-                obj_tax_fp = self.pool.get('account.fiscal.position.tax')
-                obj_ac_fp = self.pool.get('account.fiscal.position.account')
-
                 for tax in position.tax_ids:
                     vals_tax = {
                         'tax_src_id' : tax_template_ref[tax.tax_src_id.id],

From ee1e8d7a5278431503615027701c0c212f41e5af Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 12:21:33 +0530
Subject: [PATCH 446/632] [IMP] Coda: user id field set to widget=selection for
 logs

bzr revid: mra@mra-laptop-20101008065133-sih6356orpqggtqc
---
 addons/account_coda/account_coda_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 26415fa8e98..a85037bedab 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -48,7 +48,7 @@
                    <group col="10" colspan="4">
                         <field name="journal_id" widget='selection'/>
                         <field name="date"/>
-                        <field name="user_id" default="uid"/>
+                        <field name="user_id" default="uid" widget='selection'/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>

From 3ef727ebd3abefc317916921a3134737435f7daa Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 8 Oct 2010 12:23:45 +0530
Subject: [PATCH 447/632] [ADD] Membership: Add search view

bzr revid: psi@tinyerp.co.in-20101008065345-bvys0lj5q3bwmj0m
---
 addons/membership/membership_view.xml | 39 ++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 29b0cacb3e2..ad9c3bcf772 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -8,6 +8,32 @@
 
         <!-- MEMBERSHIP/MEMBERSHIP PRODUCTS -->
 
+        <record model="ir.ui.view" id="membership_product_search_form_view">
+            <field name="name">membership.product.search.form</field>
+            <field name="model">product.product</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Membership Products">
+                   <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
+                   <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
+                   <separator orientation="vertical"/>
+                   <field name="default_code"/>
+                   <field name="name"/>
+                   <field name="categ_id" widget="selection" operator="child_of"/>
+                   <newline/>
+                   <group  expand='0' string='Group by...' groups="base.group_extended">
+                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
+                       <separator orientation="vertical"/>
+                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
+                   </group>
+                   <newline/>
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
+                   </group>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="membership_products_tree">
             <field name="name">Membership products</field>
             <field name="model">product.product</field>
@@ -91,6 +117,7 @@
             <field name="res_model">product.product</field>
             <field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
             <field name="context">{'membership':True, 'type':'service'}</field>
+            <field name="search_view_id" ref="membership_product_search_form_view"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_product_view_tree">
@@ -109,13 +136,11 @@
 
         <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
         <menuitem name="Membership" id="menu_membership" sequence="0" parent="base.menu_association"/>
-        <menuitem name="Membership Products" parent="menu_membership"
-            id="menu_membership_products"
-            action="action_membership_products" sequence="1"/>
-
-
-
-
+        <menuitem name="Membership Products"
+                  parent="menu_membership"
+                  id="menu_membership_products"
+                  action="action_membership_products"
+                  sequence="1"/>
 
 
         <!-- MEMBERSHIP/CURRENT MEMBERS -->

From d270bee66ac71436061dcfff1ef779c25bed9b54 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 8 Oct 2010 12:34:38 +0530
Subject: [PATCH 448/632] [MOD/IMP] hr_timesheet_sheet : Usability Improvements
 in Timesheet Sheet Analysis Report

bzr revid: dbr@tinyerp.com-20101008070438-zc0g5fxb6kko2jmq
---
 .../security/hr_contract_security.xml         |  4 ----
 .../report/timesheet_report.py                | 19 ++++++++++---------
 .../report/timesheet_report_view.xml          | 10 +++++-----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index b891099e447..39f923a895b 100644
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.group_hr_contract" model="res.groups">
-            <field name="name">Human Resources / Contract</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index a8c0440a053..6688c747983 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -35,7 +35,7 @@ class timesheet_report(osv.osv):
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product'),
         'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
-        'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee',readonly=True),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'nbr': fields.integer('#Nbr',readonly=True),
@@ -60,8 +60,8 @@ class timesheet_report(osv.osv):
         tools.drop_view_if_exists(cr, 'timesheet_report')
         cr.execute("""
             create or replace view timesheet_report as (
-                    select
-                        min(aal.id) as id,
+                    select 
+			min(aal.id) as id,
                         htss.date_current,
                         htss.name,
                         htss.date_from,
@@ -91,14 +91,14 @@ class timesheet_report(osv.osv):
                             AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
                         aal.to_invoice,
                         aal.general_account_id,
-                        htss.user_id,
+                        htss.employee_id as employee_id,
                         htss.company_id,
                         htss.department_id,
                         htss.state
-                    from account_analytic_line as aal
-                    left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
-                    left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
-                    group by
+		from hr_timesheet_sheet_sheet as htss
+		left join hr_analytic_timesheet as hat ON (hat.create_uid=htss.create_uid)
+		left join account_analytic_line as aal ON (hat.line_id=aal.id)
+		group by
                         to_char(htss.date_current,'YYYY'),
                         to_char(htss.date_current,'MM'),
                         to_char(htss.date_current, 'YYYY-MM-DD'),
@@ -116,7 +116,8 @@ class timesheet_report(osv.osv):
                         htss.state,
                         htss.id,
                         htss.department_id,
-                        htss.user_id
+                        htss.employee_id
+  
             )
         """)
 timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index a015ff933d2..d7fa7681a6b 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -7,7 +7,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet" type="bar">
-                    <field name="user_id" />
+                    <field name="employee_id" />
                     <field name="quantity" operator = "+"/>
                     <field name="state" group = "True"/>
                 </graph>
@@ -21,7 +21,7 @@
                 <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
                     <field name="date_current" invisible="1"/>
                     <field name="name" invisible="1"/>
-                    <field name="user_id" invisible="1"/>
+                    <field name="employee_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>
                     <field name="date_to" invisible="1"/>
                     <field name="state" invisible="1"/>
@@ -72,7 +72,7 @@
                                     domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="account_id"/>
-                      <field name="user_id" />
+                      <field name="employee_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -90,7 +90,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Employee" name="Employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -117,7 +117,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_Employee_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"

From 3dab6ea173a74418c7f2dd30054047e2c8e80271 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 8 Oct 2010 12:35:33 +0530
Subject: [PATCH 449/632] [IMP] l10n_be:-improvements in the view of wizards

bzr revid: mtr@mtr-20101008070533-xokjnmxlepeodjr6
---
 .../wizard/l10n_be_account_vat_declaration.py |  4 +-
 .../l10n_be_account_vat_declaration_view.xml  | 52 ++++++++++---------
 .../wizard/l10n_be_partner_vat_listing.xml    |  2 +-
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index ae23bf926e9..4d86d5dae2e 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -39,8 +39,8 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)]),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save': fields.binary('Save File'),
-        'ask_resitution': fields.boolean('Ask Restitution'),
-        'ask_payment': fields.boolean('Ask Payment'),
+        'ask_resitution': fields.boolean('Ask Restitution',help='It indicates whether a resitution is to made or not?'),
+        'ask_payment': fields.boolean('Ask Payment',help='It indicates whether a payment is to made or not?'),
         'client_nihil': fields.boolean('Last Declaration of Enterprise',help='Tick this case only if it concerns only the last statement on the civil or cessation of activity'),
     }
     _defaults = {
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index f7f9ff9ed32..fe81a4f9848 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -13,24 +13,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Periodical VAT Declaration" >
-					<group height="250" width="330">
-						<group>
- 							<separator string="Declare Periodical VAT" colspan="2" /><newline/>
-							<field name="period_id" /><newline/>
-							<field name="tax_code_id" string="Company" widget="selection"/><newline/>
-							<field name="ask_resitution" colspan="2" align="1"/><newline/>
-							<field name="ask_payment" colspan="2"/><newline/>
-							<field name="client_nihil" colspan="2" string="Is Last Declaration"/><newline/><label/>
-	            		</group>
-						<newline/>
 					<group>
+					   <group colspan="4">
+ 							<separator string="Declare Periodical VAT" colspan="4"/><newline/>
+    						<field name="period_id" widget="selection"/>
+							<field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
+							<newline/>
+						</group>
+						<group>
+							<field name="ask_resitution" colspan="1"/>
+							<field name="ask_payment" colspan="1"/>
+							<field name="client_nihil" string="Is Last Declaration" colspan="1" /><label/>
+	            		</group>
+	            		<newline/>
+					<group>
+					<separator colspan="4"/>
+					<newline/>
 					<button special="cancel" string="Close" icon="gtk-cancel"/>
 					<button icon="gtk-execute"  name="create_xml" string="Create XML" type="object" default_focus="1" />
               		</group>
-              		</group>
-				</form>
-            </field>
-		</record>
+          		</group>
+			</form>
+        </field>
+	</record>
 
 		<record id="view_vat_save" model="ir.ui.view">
             <field name="name">Save XML</field>
@@ -38,17 +43,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Save xml">
-					<group height="200" width="400">
-						<separator colspan="2" string="Note: "/><newline/>
-							<label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
-								<field name="name"/><newline/>
-				    			<field name="file_save" readonly="True"/>
-				    			<newline/>
-			    			<label/>
-		              		<newline/>
-        		      		<label colspan="1"/>
-              				<button colspan="1" special="cancel" string="Close" icon="gtk-cancel" align="0.0"/>
-	              	</group>
+					<group colspan="3">
+						<label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
+							<field name="name"/><newline/>
+			    			<field name="file_save" readonly="True"/>
+              		<newline/>
+		      		<separator colspan="4"/><label/>
+          				<button special="cancel" string="Ok" icon="gtk-ok"/>
+      				</group>
 				</form>
 			</field>
 		</record>
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index 19ec96e8023..7ae3a0ab73e 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -15,7 +15,7 @@
 			<form string="Partner VAT Listing">
 			    <label string="This wizard will create an XML file for Vat details and total invoiced amounts per partner." colspan="4"/>
 				    <newline/>
-				    <field name="fyear" default_focus="1"/>
+				    <field name="fyear" default_focus="1" widget="selection"/>
 				    <newline/>
 				    <field name="mand_id"/>
 				    <newline/>

From ec4fc783a6a70c930f33433d2a25a04cbcb4bce2 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 12:37:11 +0530
Subject: [PATCH 450/632] [REM] Account and Account coda => Remove unused
 default=uid in xml

bzr revid: mra@mra-laptop-20101008070711-10d8mvxtbphtqyyv
---
 addons/account/account_invoice_view.xml   | 2 +-
 addons/account_coda/account_coda_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1db17ed16cf..a8193d084a1 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -363,7 +363,7 @@
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" select="1" default="uid" widget="selection" string="Salesman">
+                        <field name="user_id" select="1" widget="selection" string="Salesman">
                         <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" separator="1"/>
                         </field>
                         <field name="origin"/>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index a85037bedab..7c7a10a05a3 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -48,7 +48,7 @@
                    <group col="10" colspan="4">
                         <field name="journal_id" widget='selection'/>
                         <field name="date"/>
-                        <field name="user_id" default="uid" widget='selection'/>
+                        <field name="user_id" widget='selection'/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>

From 4f284c3ac2dca902caec96b3c291f9c1d16a4e05 Mon Sep 17 00:00:00 2001
From: "SKH(OpenERP)" <>
Date: Fri, 8 Oct 2010 14:06:39 +0530
Subject: [PATCH 451/632] [FIX] Account : General ledger report corrected for
 landscape mode

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

bzr revid: jvo@tinyerp.com-20101008083639-mpdry1mjkc2bfw21
---
 addons/account/report/account_general_ledger_landscape.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 1321bdea750..8c7572d1fc2 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -328,7 +328,7 @@
 			 	 			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 			  				<td><para style="Standard"></para></td>
 						  	<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
-					  		<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp=Account)) ]]</u></para></td>
+					  		<td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
 			  				<td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
 						</tr>
 					</blockTable>

From bae78575c82879fe64eac8ed2cf1c37f77e1d68a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 8 Oct 2010 10:38:47 +0200
Subject: [PATCH 452/632] [IMP] form view for widgets

bzr revid: xmo@openerp.com-20101008083847-0jy9px2ey4wwok81
---
 bin/addons/base/res/res_widget_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_widget_view.xml b/bin/addons/base/res/res_widget_view.xml
index 7164c504993..7ddd5a06e8a 100644
--- a/bin/addons/base/res/res_widget_view.xml
+++ b/bin/addons/base/res/res_widget_view.xml
@@ -11,15 +11,15 @@
                  </search>
             </field>
         </record>
-        
+
         <record id="res_widget_form" model="ir.ui.view">
             <field name="name">res.widget.form</field>
             <field name="model">res.widget</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Widgets">
-                    <field name="title"/>
-                    <field name="content"/>
+                    <field name="title" colspan="4"/>
+                    <field name="content" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -41,7 +41,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_res_widget_search"/>
         </record>
-        
+
         <menuitem
             action="res_widget_act_window"
             id="menu_res_widget_act_window"

From 560ccd262a68ecbfd703d8fbb5959c0bdab411f4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 8 Oct 2010 10:39:28 +0200
Subject: [PATCH 453/632] [IMP] make fields required in widget res

bzr revid: xmo@openerp.com-20101008083928-30ivjz573xgxykhk
---
 bin/addons/base/res/res_widget.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/res/res_widget.py b/bin/addons/base/res/res_widget.py
index 978a092c5db..a152a6bb5fd 100644
--- a/bin/addons/base/res/res_widget.py
+++ b/bin/addons/base/res/res_widget.py
@@ -25,7 +25,7 @@ class res_widget(osv.osv):
     _name = "res.widget"
     _rec_name = "title"
     _columns = {
-                'title' : fields.char('Title', size=64),
-                'content': fields.text('Content')
-                }
-res_widget()
\ No newline at end of file
+        'title' : fields.char('Title', size=64, required=True),
+        'content': fields.text('Content', required=True)
+    }
+res_widget()

From 697153f8bd23680bcb9f68e6c366e77e85834f40 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 8 Oct 2010 14:33:26 +0530
Subject: [PATCH 454/632] [FIX] Event: Creating invoice from registration now
 open with good search view and customer invoice instead of vendor ivnoices

bzr revid: ara@tinyerp.com-20101008090326-bzg7pmhymcwg8tsa
---
 addons/event/wizard/event_make_invoice.py | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 8540c267ddb..96bffff537c 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -28,10 +28,9 @@ class event_make_invoice(osv.osv_memory):
     _name = "event.make.invoice"
     _description = "Event Make Invoice"
     _columns = {
-
         'grouped': fields.boolean('Group the invoices'),
         'invoice_date':fields.date('Invoice Date'),
-         }
+    }
 
     def view_init(self, cr, uid, fields, context=None):
         """
@@ -65,22 +64,22 @@ class event_make_invoice(osv.osv_memory):
                         _("Registration doesn't have any partner to invoice."))
 
     def default_get(self, cr, uid, fields_list, context=None):
-        res = super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
-        return res
-
-    def make_invoice(self, cr, uid, ids, context={}):
+        return super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
 
+    def make_invoice(self, cr, uid, ids, context=None):
         reg_obj = self.pool.get('event.registration')
+        mod_obj = self.pool.get('ir.model.data')
         newinv = []
+        if context is None:
+            context = {}
 
         for data in self.browse(cr, uid, ids):
             res = reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
 
-        mod_obj =self.pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-
-        id = mod_obj.read(cr, uid, result, ['res_id'])
-
+        form_id = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
+        form_res = mod_obj.browse(cr, uid, form_id, context=context).res_id
+        tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
+        tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
         return {
             'domain': "[('id','in',%s)]" % res,
             'name': 'Invoices',
@@ -88,10 +87,11 @@ class event_make_invoice(osv.osv_memory):
             'view_mode': 'tree,form',
             'res_model': 'account.invoice',
             'view_id': False,
+            'views': [(tree_res, 'tree'), (form_res, 'form')],
             'context': "{'type':'out_refund'}",
             'type': 'ir.actions.act_window',
-            'search_view_id': id['id']
         }
 
 event_make_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From ec1d1384963682c7def886c636e78dda9ce2c7cf Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 8 Oct 2010 14:33:30 +0530
Subject: [PATCH 455/632] cost ledger

bzr revid: apa@tinyerp.com-20101008090330-g4q2y3jscfgaailf
---
 addons/account/project/report/cost_ledger.rml | 46 ++++++-------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index 4f495891378..a59e95724d0 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -181,13 +181,10 @@
           <para style="terp_tblheader_Details_Right">Credit</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Centre">Balance</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="62.0,250.0,57.0,56.0,57.0" style="Table_Grant_Total">
       <tr>
         <td>
@@ -199,21 +196,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
+          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_debit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
         </td>
         <td>
-          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
+          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
         </td>
         <td>
           <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+      <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
       <blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
         <tr>
           <td>
@@ -223,21 +217,18 @@
             <para style="terp_default_Bold_9">[[ o.complete_name ]]</para>
           </td>
           <td>
-            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
+            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_debit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
           </td>
           <td>
-            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]]</para>
+            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(o.id,data['form']['date1'],data['form']['date2'])) ]] </para>
           </td>
           <td>
             <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(o.id,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="Standard">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
+        <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
         <blockTable colWidths="62.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
           <tr>
             <td>
@@ -247,21 +238,18 @@
               <para style="terp_default_Bold_9">[[ move_g['name'] ]]</para>
             </td>
             <td>
-              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]]</para>
+              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['debit']) ]] </para>
             </td>
             <td>
-              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]]</para>
+              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
             </td>
             <td>
               <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
-        <para style="terp_default_2">
-          <font color="white"> </font>
-        </para>
         <section>
-          <para style="terp_default_9">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
+          <para style="terp_default_2">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
           <blockTable colWidths="60.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
             <tr>
               <td>
@@ -274,13 +262,13 @@
                 <para style="terp_default_9_Italic">[[ move_a['name'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['debit'] )]] </para>
               </td>
               <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
               </td>
               <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
               </td>
             </tr>
           </blockTable>
@@ -288,13 +276,7 @@
             <font color="white"> </font>
           </para>
         </section>
-        <para style="terp_default_8">
-          <font color="white"> </font>
-        </para>
       </section>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From 86a26c1d6b328278b3144ac2241ac3dec51e95fc Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 8 Oct 2010 14:35:55 +0530
Subject: [PATCH 456/632] [IMP]: now from the employee object we will get the
 earnings and computations

bzr revid: mga@tinyerp.com-20101008090555-24n0qrti5obce8bx
---
 addons/hr_payroll/hr_payroll.py       | 82 ++++++++++++++++++++++++---
 addons/hr_payroll/hr_payroll_view.xml |  9 +++
 2 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 0079d2376cb..058d5a092ff 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -135,6 +135,9 @@ class hr_contract(osv.osv):
         res = {}
         ids += context.get('employee_structure', [])
         
+        slip_pool = self.pool.get('hr.payslip')
+        slip_line_pool = self.pool.get('hr.payslip.line')
+        
         for contract in self.browse(cr, uid, ids, context):
             all_per = 0.0
             ded_per = 0.0
@@ -238,7 +241,12 @@ class hr_contract(osv.osv):
             res[contract.id] = basic
 
         return res
-    
+        
+    def check_vals(self, val1, val2):
+        if val1 == val2 and val1 == 0:
+            return True
+        return False
+        
     def _calculate_salary(self, cr, uid, ids, field_names, arg, context=None):
         res = self.compute_basic(cr, uid, ids, context)
         vals = {}
@@ -253,6 +261,12 @@ class hr_contract(osv.osv):
                 obj['net'] = rs.net
             
             if not rs.struct_id:
+                if self.check_vals(obj['basic'], obj['gross']):
+                    obj['gross'] = obj['basic'] = obj['net']
+                elif self.check_vals(obj['gross'], obj['net']):
+                    obj['gross']= obj['net'] = obj['basic']
+                elif self.check_vals(obj['net'], obj['basic']):
+                    obj['net'] = obj['basic'] = obj['gross']
                 record = {
                     'advantages_gross':0.0,
                     'advantages_net':0.0,
@@ -262,7 +276,7 @@ class hr_contract(osv.osv):
                 }
                 vals[rs.id] = record
                 continue
-                
+            
             for line in rs.struct_id.line_ids:
                 amount = 0.0
                 if line.amount_type == 'per':
@@ -288,9 +302,9 @@ class hr_contract(osv.osv):
             record = {
                 'advantages_gross':round(allow),
                 'advantages_net':round(deduct),
-                'basic':res[rs.id],
-                'gross':round(res[rs.id] + allow),
-                'net':round(res[rs.id] + allow - deduct)
+                'basic':obj['basic'],
+                'gross':round(obj['basic'] + allow),
+                'net':round(obj['basic'] + allow - deduct)
             }
             vals[rs.id] = record
 
@@ -1394,13 +1408,67 @@ class hr_employee(osv.osv):
     '''
     _inherit = 'hr.employee'
     _description = 'Employee'
-
+    
+    def _calculate_salary(self, cr, uid, ids, field_names, arg, context=None):
+        vals = {}
+        slip_line_pool = self.pool.get('hr.payslip.line')
+        
+        for employee in self.browse(cr, uid, ids, context):
+            if not employee.contract_id:
+                vals[employee.id] = {'basic':0.0, 'gross':0.0, 'net':0.0, 'advantages_gross':0.0, 'advantages_net':0.0}
+                continue
+            
+            basic = employee.contract_id.basic
+            gross = employee.contract_id.gross
+            net = employee.contract_id.net
+            allowance = employee.contract_id.advantages_gross
+            deduction = employee.contract_id.advantages_net
+            
+            obj = {
+                'basic':basic, 
+                'gross':gross, 
+                'net':net
+            }
+            for line in employee.line_ids:
+                base = line.category_id.base
+                try:
+                    amt = eval(base, obj)
+                except Exception, e:
+                    raise osv.except_osv(_('Variable Error !'), _('Variable Error : %s ' % (e)))
+                amount = 0.0
+                if line.amount_type == 'per':
+                    amount = amt * line.amount
+                elif line.amount_type == 'func':
+                    amount = slip_line_pool.execute_function(cr, uid, line.id, amt, context)
+                elif line.amount_type == 'fix':
+                    amount = line.amount
+                
+                if line.type == 'allowance':
+                    allowance += amount
+                elif line.type == 'deduction':
+                    deduction += amount
+            
+            vals[employee.id] = {
+                'basic':basic, 
+                'advantages_gross':allowance, 
+                'gross':basic + allowance, 
+                'advantages_net':deduction,
+                'net':basic + allowance - deduction
+            }
+        return vals
+    
     _columns = {
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
-        'otherid': fields.char('Other Id', size=64)
+        'otherid': fields.char('Other Id', size=64),
+        
+        'basic': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
+        'gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
+        'net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
+        'advantages_net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
+        'advantages_gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
     }
 hr_employee()
 
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 033368caaad..a25c2fdebf6 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -180,6 +180,15 @@
                 </xpath>
                 <xpath expr="/form/notebook/page[@string='Notes']" position="before">
                     <page string="Salary Structure" groups="base.group_extended">
+                        <group col="10" colspan="4">
+                            <separator string="Salary Computation" colspan="10"/>
+                            <field name="basic"/>
+                            <field name="advantages_gross"/>
+                            <field name="gross"/>
+                            <field name="advantages_net"/>
+                            <field name="net"/>
+                        </group>
+                        <separator string="Employee specific allowances and deductions" colspan="4"/>
                         <field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
                             <tree string="Salary Structure" editable="bottom">
                                 <field name="category_id" on_change="onchange_category(category_id)"/>

From 766b822f2c1a3542b16b0951dc91ab02f42cc8ae Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 8 Oct 2010 14:55:00 +0530
Subject: [PATCH 457/632] [IMP] sale:-security improvement for Reporting/Sales
 Dashboard

bzr revid: mtr@mtr-20101008092500-j628xx8698lkuma1
---
 addons/sale/board_sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 6da7f9e312b..0629ad041df 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -34,7 +34,7 @@
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
 		<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
-        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0"/>
+        <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_sales_manager"/>
     </data>
 </openerp>
\ No newline at end of file

From 62592beb07d76af1f063837d4cda2225290aba2e Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 8 Oct 2010 15:19:10 +0530
Subject: [PATCH 458/632] [IMP][FIX]hr_payroll: fixed the error if contract is
 not define and some improvement in report.

bzr revid: vra@tinyerp.com-20101008094910-psvxtftbau0txae6
---
 .../report/report_emp_salary_structure.py     | 42 +++++++++----------
 .../report/report_emp_salary_structure.rml    | 36 ++++++++--------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
index 7deafcf63e4..e875e774b43 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.py
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -33,32 +33,32 @@ class salary_structure_report(report_sxw.rml_parse):
           self.localcontext.update({
             'time': time,
             'get_type':self.get_type,
-            'get_contract':self.get_contract,
+            #'get_contract':self.get_contract,
             'get_line_amount_type':self.get_line_amount_type,
             'get_line_type':self.get_line_type,
             'get_line_amount_symbol':self.get_line_amount_symbol
           })
 
-    def get_contract(self,emp):
-        curr_date = "'"+time.strftime("%Y-%m-%d")+"'"
-        sql_req= '''
-            SELECT c.id as id, c.wage as wage, struct_id as struct
-            FROM hr_contract c
-              LEFT JOIN hr_employee emp on (c.employee_id=emp.id)
-              LEFT JOIN hr_contract_wage_type cwt on (cwt.id = c.wage_type_id)
-              LEFT JOIN hr_contract_wage_type_period p on (cwt.period_id = p.id)
-            WHERE
-              (emp.id=%s) AND
-              (date_start <= %s) AND
-              (date_end IS NULL OR date_end >= %s)
-            LIMIT 1
-            '''%(emp.id, curr_date, curr_date)
-        self.cr.execute(sql_req)
-        contract_id = self.cr.dictfetchone()
-        if not contract_id:
-            return []
-        contract = self.pool.get('hr.contract').browse(self.cr, self.uid, [contract_id['id']])
-        return contract
+#    def get_contract(self,emp):
+#        curr_date = "'"+time.strftime("%Y-%m-%d")+"'"
+#        sql_req= '''
+#            SELECT c.id as id, c.wage as wage, struct_id as struct
+#            FROM hr_contract c
+#              LEFT JOIN hr_employee emp on (c.employee_id=emp.id)
+#              LEFT JOIN hr_contract_wage_type cwt on (cwt.id = c.wage_type_id)
+#              LEFT JOIN hr_contract_wage_type_period p on (cwt.period_id = p.id)
+#            WHERE
+#              (emp.id=%s) AND
+#              (date_start <= %s) AND
+#              (date_end IS NULL OR date_end >= %s)
+#            LIMIT 1
+#            '''%(emp.id, curr_date, curr_date)
+#        self.cr.execute(sql_req)
+#        contract_id = self.cr.dictfetchone()
+#        if not contract_id:
+#            return []
+#        contract = self.pool.get('hr.contract').browse(self.cr, self.uid, [contract_id['id']])
+#        return contract
 
     def get_type(self,type):
         return type[0].swapcase() + type[1:] +' Salary'
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 1ccc327063e..20bdae2442e 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -267,7 +267,7 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_9">[[repeatIn(get_contract(employee),'cont')]]</para>
+      <para style="terp_default_9">[[ not employee.contract_id and removeParentNode('section') ]]</para>
       <blockTable colWidths="68.0,111.0,63.0,111.0,71.0,115.0" style="Table4">
         <tr>
           <td>
@@ -318,7 +318,7 @@
             <para style="terp_tblheader_Details">Designation</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.job_id.name or '' ]]</para>
+            <para style="terp_default_9">[[ employee.contract_id and employee.contract_id.job_id and employee.contract_id.job_id.name or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Phone No.</para>
@@ -334,7 +334,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_space">
+      <para style="terp_default_9">
         <font color="white"> </font>
       </para>
       <blockTable colWidths="539.0" style="Table13">
@@ -356,19 +356,19 @@
             <para style="terp_tblheader_Details">Start Date</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ formatLang(cont.date_start,date=True) or '' ]]</para>
+            <para style="terp_default_9">[[ employee.contract_id and formatLang(employee.contract_id.date_start,date=True) or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">End Date</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ formatLang(cont.date_end,date=True) or removeParentNode('para') ]]</para>
+            <para style="terp_default_9">[[ employee.contract_id and formatLang(employee.contract_id.date_end,date=True) or removeParentNode('para') ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Type</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ get_type(cont.wage_type_id.type) or '' ]]</para>
+            <para style="terp_default_9">[[ employee.contract_id and get_type(employee.contract_id.wage_type_id.type) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -378,13 +378,13 @@
             <para style="terp_tblheader_Details">Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
+            <para style="terp_default_9">[[ employee.contract_id and formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Notes:</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.notes or '' ]]</para>
+            <para style="terp_default_9">[[ employee.contract_id and employee.contract_id.notes or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -394,19 +394,19 @@
             <para style="terp_tblheader_Details">Basic</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.basic ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.basic ]] [[ employee.company_id.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Allowances</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.advantages_gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.advantages_gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Gross Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -416,17 +416,17 @@
             <para style="terp_tblheader_Details">Deductions</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.advantages_net ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.advantages_net ]] [[ employee.company_id.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Net Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.net ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.net ]] [[ employee.company_id.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_space">
+      <para style="terp_default_9">
         <font color="white"> </font>
       </para>
       <blockTable colWidths="539.0" style="Table9">
@@ -463,7 +463,7 @@
           <font color="white"> </font>
         </para>
         <section>
-          <para style="terp_default_9">[[repeatIn(cont.struct_id.line_ids,'line')]]</para>
+          <para style="terp_default_9">[[repeatIn(employee.contract_id and employee.contract_id.struct_id and employee.contract_id.struct_id.line_ids or [],'line')]]</para>
           <blockTable colWidths="34.0,340.0,80.0,84.0" style="Table8">
             <tr>
               <td>
@@ -473,7 +473,7 @@
                 <para style="terp_default_9">[[ line.name ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ get_line_amount_symbol(line.amount_type) ]]</para>
+                <para style="terp_default_Right_9">[[ line.amount or '']] [[ get_line_amount_symbol(line.amount_type) ]]</para>
               </td>
               <td>
                 <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
@@ -489,7 +489,7 @@
         </para>
       </section>
     </section>
-    <para style="terp_default_space">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="539.0" style="Table10">
@@ -536,7 +536,7 @@
               <para style="terp_default_9">[[ line1.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line1.amount) ]]</para>
+              <para style="terp_default_Right_9">[[ line1.amount ]] [[ get_line_amount_symbol(line1.amount_type) ]]</para>
             </td>
             <td>
               <para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>

From 15fee66dd01b024fab925bc101a2fff5c4a7ec19 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Fri, 8 Oct 2010 15:23:02 +0530
Subject: [PATCH 459/632] [FIX] account:Invoice Items

bzr revid: vth@tinyerp.com-20101008095302-0gxymcs3zxfjw8ne
---
 addons/account/account_invoice_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index a8193d084a1..02924dad580 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -519,10 +519,11 @@
             res_model="account.move.line"
             src_model="account.invoice"/>
 
+
         <act_window
-            context="{'search_default_move_id':move_id}"
+            context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
             id="act_account_invoice_account_move_invoice_link"
-            name="Invoice Items"
+            name="Invoice Items "
             res_model="account.move.line"
             src_model="account.invoice"/>
 

From 2ecf5a0b5d726f644d3a939d38ae443c97b99497 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 15:26:14 +0530
Subject: [PATCH 460/632] [REF] Account voucher: Warning removed from automated
 tests

bzr revid: mra@mra-laptop-20101008095614-c5516rk2a1h9c3wv
---
 addons/account_voucher/account_voucher.py | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index ed0d458337f..912a7864862 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -94,7 +94,7 @@ class account_voucher(osv.osv):
             journal = journal_pool.browse(cr, uid, journal_id)
             currency_id = journal.company_id.currency_id.id
             if journal.currency:
-                currency_id = journal.currency.id
+                return journal.currency.id
         return False
 
     def _get_partner(self, cr, uid, context={}):
@@ -114,7 +114,6 @@ class account_voucher(osv.osv):
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         if not view_id and context.get('invoice_type',False):
             mod_obj = self.pool.get('ir.model.data')
-            act_obj = self.pool.get('ir.actions.act_window')
             if context.get('invoice_type') in ('out_invoice','out_refund'):
                 result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
             else:
@@ -228,7 +227,6 @@ class account_voucher(osv.osv):
                     total_tax += tax_line.get('amount', 0.0)
                 total += total_tax
             else:
-                line_ids2 = []
                 for line in voucher.line_ids:
                     line_total = 0.0
                     line_tax = 0.0
@@ -247,12 +245,10 @@ class account_voucher(osv.osv):
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
         position_pool = self.pool.get('account.fiscal.position')
-        voucher_line_pool = self.pool.get('account.voucher.line')
         res = {
             'tax_amount':False,
             'amount':False,
         }
-        voucher_total_tax = 0.0
         voucher_total = 0.0
         voucher_line_ids = []
 
@@ -359,7 +355,6 @@ class account_voucher(osv.osv):
         if context is None:
             context = {}
         currency_pool = self.pool.get('res.currency')
-        move_pool = self.pool.get('account.move')
         line_pool = self.pool.get('account.voucher.line')
         move_line_pool = self.pool.get('account.move.line')
         partner_pool = self.pool.get('res.partner')
@@ -515,7 +510,6 @@ class account_voucher(osv.osv):
     def cancel_voucher(self, cr, uid, ids, context={}):
         reconcile_pool = self.pool.get('account.move.reconcile')
         move_pool = self.pool.get('account.move')
-        voucher_line_pool = self.pool.get('account.voucher.line')
 
         for voucher in self.browse(cr, uid, ids):
             recs = []
@@ -575,9 +569,7 @@ class account_voucher(osv.osv):
             context = {}
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
-        analytic_pool = self.pool.get('account.analytic.line')
         currency_pool = self.pool.get('res.currency')
-        invoice_pool = self.pool.get('account.invoice')
         bank_st_line_obj = self.pool.get('account.bank.statement.line')
         for inv in self.browse(cr, uid, ids):
             if inv.move_id:
@@ -709,7 +701,7 @@ class account_voucher(osv.osv):
                     account_id = inv.partner_id.property_account_payable.id
                 move_line['account_id'] = account_id
 
-                move_line_id = move_line_pool.create(cr, uid, move_line)
+                move_line_pool.create(cr, uid, move_line)
 
             self.write(cr, uid, [inv.id], {
                 'move_id': move_id,
@@ -799,13 +791,11 @@ class account_voucher_line(osv.osv):
         move_line_pool = self.pool.get('account.move.line')
         if move_line_id:
             move_line = move_line_pool.browse(cr, user, move_line_id, context=context)
-            move_id = move_line.move_id.id
             if move_line.credit:
                 ttype='dr'
                 amount = move_line.credit
             else:
                 ttype='cr'
-                amount = move_line.debit
             account_id = move_line.account_id.id
             res.update({
                 'account_id':account_id,
@@ -860,7 +850,6 @@ class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
 
     def button_cancel(self, cr, uid, ids, context=None):
-        done = []
         for st in self.browse(cr, uid, ids, context):
             voucher_ids = []
             for line in st.line_ids:
@@ -890,9 +879,8 @@ class account_bank_statement_line(osv.osv):
         if not ids:
             return {}
 
-        res_currency_obj = self.pool.get('res.currency')
         res = {}
-        company_currency_id = False
+#        company_currency_id = False
         for line in self.browse(cursor, user, ids, context=context):
 #            if not company_currency_id:
 #                company_currency_id = line.company_id.id

From 27834e2fa79e5e0c787141d5c1bd6af2dc01cfb7 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 8 Oct 2010 15:31:46 +0530
Subject: [PATCH 461/632] [IMP]hr_payroll: improved employee struture report.

bzr revid: vra@tinyerp.com-20101008100146-hv90z0sg9fffh7ms
---
 .../report/report_emp_salary_structure.rml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 20bdae2442e..2a5c2a0210f 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -318,7 +318,7 @@
             <para style="terp_tblheader_Details">Designation</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.contract_id and employee.contract_id.job_id and employee.contract_id.job_id.name or '' ]]</para>
+            <para style="terp_default_9">[[ employee.contract_id.job_id and employee.contract_id.job_id.name or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Phone No.</para>
@@ -356,19 +356,19 @@
             <para style="terp_tblheader_Details">Start Date</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.contract_id and formatLang(employee.contract_id.date_start,date=True) or '' ]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.contract_id.date_start,date=True) or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">End Date</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.contract_id and formatLang(employee.contract_id.date_end,date=True) or removeParentNode('para') ]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.contract_id.date_end,date=True) or removeParentNode('para') ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Type</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.contract_id and get_type(employee.contract_id.wage_type_id.type) or '' ]]</para>
+            <para style="terp_default_9">[[ get_type(employee.contract_id.wage_type_id.type) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -378,13 +378,13 @@
             <para style="terp_tblheader_Details">Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.contract_id and formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Notes:</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.contract_id and employee.contract_id.notes or '' ]]</para>
+            <para style="terp_default_9">[[ employee.contract_id.notes or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -463,7 +463,7 @@
           <font color="white"> </font>
         </para>
         <section>
-          <para style="terp_default_9">[[repeatIn(employee.contract_id and employee.contract_id.struct_id and employee.contract_id.struct_id.line_ids or [],'line')]]</para>
+          <para style="terp_default_9">[[repeatIn(employee.contract_id.struct_id and employee.contract_id.struct_id.line_ids or [],'line')]]</para>
           <blockTable colWidths="34.0,340.0,80.0,84.0" style="Table8">
             <tr>
               <td>
@@ -473,7 +473,7 @@
                 <para style="terp_default_9">[[ line.name ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ line.amount or '']] [[ get_line_amount_symbol(line.amount_type) ]]</para>
+                <para style="terp_default_Right_9">[[ line.amount_type =='per' and (line.amount*100) or line.amount]] [[ get_line_amount_symbol(line.amount_type) ]]</para>
               </td>
               <td>
                 <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
@@ -536,7 +536,7 @@
               <para style="terp_default_9">[[ line1.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ line1.amount ]] [[ get_line_amount_symbol(line1.amount_type) ]]</para>
+              <para style="terp_default_Right_9">[[ line1.amount_type =='per' and (line1.amount*100) or line1.amount ]] [[ get_line_amount_symbol(line1.amount_type) ]]</para>
             </td>
             <td>
               <para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>

From eecda53df51fddf7cd40cac667f68a6a83f84392 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 15:40:42 +0530
Subject: [PATCH 462/632] [MOD] improvements in access rights

bzr revid: vir@tinyerp.com-20101008101042-ak2z1vuzbmak7yt3
---
 addons/hr/security/ir.model.access.csv                 | 1 +
 addons/hr_attendance/security/ir.model.access.csv      | 1 +
 addons/hr_timesheet_sheet/security/ir.model.access.csv | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 4b2d72b017d..ab8eb568264 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
+"access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
 "access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 4b686dcb1b2..919aea0d57f 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
 "access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,0,0,0
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 79bc9263ec5..c11a3ce7099 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,6 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_system_user","hr_timesheet_sheet.sheet.system.user","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
 "access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
+"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0

From 34b5bac21a555d34d464d974a8e3aebfe0b2f145 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 8 Oct 2010 15:42:47 +0530
Subject: [PATCH 463/632] [FIX] Fix the warning of account_coda and l10n_ch
 module

bzr revid: ara@tinyerp.com-20101008101247-7a27nmqxeh0kknwd
---
 .../account_coda/wizard/account_coda_import.py   | 16 +++++++---------
 addons/l10n_ch/wizard/bvr_import.py              | 11 ++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index badd7ca77c6..1d34e28896f 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -59,12 +59,12 @@ class account_coda_import(osv.osv_memory):
         account_period_obj = self.pool.get('account.period')
         partner_bank_obj = self.pool.get('res.partner.bank')
         bank_statement_obj = self.pool.get('account.bank.statement')
-        move_line_obj = self.pool.get('account.move.line')
         bank_statement_line_obj = self.pool.get('account.bank.statement.line')
         voucher_obj = self.pool.get('account.voucher')
         voucher_line_obj = self.pool.get('account.voucher.line')
         account_coda_obj = self.pool.get('account.coda')
         mod_obj = self.pool.get('ir.model.data')
+        line_obj = self.pool.get('account.move.line')
 
         if not context:
             context = {}
@@ -78,7 +78,6 @@ class account_coda_import(osv.osv_memory):
         def_pay_acc = data['def_payable']
         def_rec_acc = data['def_receivable']
 
-        str_log = ""
         err_log = "Errors:\n------\n"
         nb_err=0
         std_log=''
@@ -230,23 +229,23 @@ class account_coda_import(osv.osv_memory):
                                 }
                                 voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
                                 context.update({'move_line_ids': rec_id})
-                                
+
                                 voucher_line_dict =  False
                                 if result['value']['line_ids']:
                                     for line_dict in result['value']['line_ids']:
                                         move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
                                         if line.move_id.id == move_line.move_id.id:
                                             voucher_line_dict = line_dict
-        
+
                                 if voucher_line_dict:
                                     voucher_line_dict.update({'voucher_id':voucher_id})
                                     voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
-        
+
         #                            reconcile_id = statement_reconcile_obj.create(cr, uid, {
         #                                'line_ids': [(6, 0, rec_id)]
         #                                }, context=context)
         #
-        
+
                                 mv = self.pool.get('account.move.line').browse(cr, uid, rec_id[0], context=context)
                                 if mv.partner_id:
                                     line['partner_id'] = mv.partner_id.id
@@ -257,7 +256,7 @@ class account_coda_import(osv.osv_memory):
                         str_not1 = ''
                         if line.has_key('contry_name') and line.has_key('cntry_number'):
                             str_not1="Partner name:%s \n Partner Account Number:%s \n Communication:%s \n Value Date:%s \n Entry Date:%s \n"%(line["contry_name"], line["cntry_number"], line["free_comm"]+line['extra_note'], line["val_date"][0], line["entry_date"][0])
-                        id = bank_statement_line_obj.create(cr, uid, {
+                        bank_statement_line_obj.create(cr, uid, {
                                    'name':line['name'],
                                    'date': line['date'],
                                    'amount': line['amount'],
@@ -304,7 +303,6 @@ class account_coda_import(osv.osv_memory):
         test = ''
         test = str_log1 + std_log + err_log
         self.write(cr, uid, ids, {'note': test}, context=context)
-        extraction = { 'statment_ids': bkst_list}
         context.update({ 'statment_ids': bkst_list})
         model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'account_coda_note_view')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
@@ -324,7 +322,7 @@ class account_coda_import(osv.osv_memory):
 
     def action_open_window(self, cr, uid, data, context=None):
         if not context:
-            cotext = {}
+            context = {}
 
         return {
             'domain':"[('id','in',%s)]"%(context.get('statment_ids', False)),
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index d15b66b92ce..3bcf4255f3f 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -78,8 +78,6 @@ def _import(obj, cursor, user, data, context=None):
     voucher_obj = pool.get('account.voucher')
     voucher_line_obj = pool.get('account.voucher.line')
     move_line_obj = pool.get('account.move.line')
-    property_obj = pool.get('ir.property')
-    model_fields_obj = pool.get('ir.model.fields')
     attachment_obj = pool.get('ir.attachment')
     file = data['form']['file']
     statement_id = data['id']
@@ -149,7 +147,7 @@ def _import(obj, cursor, user, data, context=None):
     account_receivable = False
     account_payable = False
     statement = statement_obj.browse(cursor, user, statement_id, context=context)
-   
+
     for record in records:
         # Remove the 11 first char because it can be adherent number
         # TODO check if 11 is the right number
@@ -162,7 +160,7 @@ def _import(obj, cursor, user, data, context=None):
             'type': (record['amount'] >= 0 and 'customer') or 'supplier',
             'statement_id': statement_id,
         }
-        
+
         line_ids = move_line_obj.search(cursor, user, [
             ('ref', 'like', reference),
             ('reconcile_id', '=', False),
@@ -171,7 +169,6 @@ def _import(obj, cursor, user, data, context=None):
         if not line_ids:
             line_ids = _reconstruct_invoice_ref(cursor, user, reference, None)
 
-        line2reconcile = False
         partner_id = False
         account_id = False
         for line in move_line_obj.browse(cursor, user, line_ids, context=context):
@@ -181,12 +178,12 @@ def _import(obj, cursor, user, data, context=None):
             move_id = line.move_id.id
             if record['amount'] >= 0:
                 if round(record['amount'] - line.debit, 2) < 0.01:
-                    line2reconcile = line.id
+#                    line2reconcile = line.id
                     account_id = line.account_id.id
                     break
             else:
                 if round(line.credit + record['amount'], 2) < 0.01:
-                    line2reconcile = line.id
+#                    line2reconcile = line.id
                     account_id = line.account_id.id
                     break
         result = voucher_obj.onchange_partner_id(cursor, user, [], partner_id=partner_id, journal_id=statement.journal_id.id, price=abs(record['amount']), currency_id= statement.currency.id, ttype='payment', context=context)

From 13e091dc0953edbb8b12ac9549dc9bf8e090de56 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 15:49:03 +0530
Subject: [PATCH 464/632] [REF] l10n_be: Warning removed from automated tests

bzr revid: mra@mra-laptop-20101008101903-tnb59uhiapc26tns
---
 addons/l10n_be/wizard/l10n_be_account_vat_declaration.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 4d86d5dae2e..e6e08e83b01 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -65,7 +65,6 @@ class l10n_be_vat_declaration(osv.osv_memory):
             obj_company = data_tax.tax_code_id.company_id
         else:
             obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
-        user_cmpny = obj_company.name
         vat_no = obj_company.partner_id.vat
         if not vat_no:
             raise osv.except_osv(_('Data Insufficient'), _('No VAT Number Associated with Main Company!'))
@@ -78,10 +77,8 @@ class l10n_be_vat_declaration(osv.osv_memory):
 
         address = post_code = city = country_code = ''
         city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address)
-        year_id = obj_fyear.find(cr, uid)
 
         account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
-        period_code = account_period.code
 
         send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
         data_of_file = '<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-14.xml">'

From a2656467c93456a97748ebad36cf20dbff5621ce Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 8 Oct 2010 16:08:28 +0530
Subject: [PATCH 465/632] [FIX]hr_payroll: fixed the not require company issue
 in employee object for salary struture report.

bzr revid: vra@tinyerp.com-20101008103828-4vef8aef3qkq39ry
---
 .../report/report_emp_salary_structure.rml           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 2a5c2a0210f..aba8fcf1906 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -378,7 +378,7 @@
             <para style="terp_tblheader_Details">Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Notes:</para>
@@ -394,19 +394,19 @@
             <para style="terp_tblheader_Details">Basic</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.basic ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.basic ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Allowances</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.advantages_gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.advantages_gross ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Gross Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.gross ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.gross ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -416,13 +416,13 @@
             <para style="terp_tblheader_Details">Deductions</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.advantages_net ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.advantages_net ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Net Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.net ]] [[ employee.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_9">[[ employee.net ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>

From 0935df7cbab6366dd177022babd9b8d004e505a8 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 8 Oct 2010 16:26:03 +0530
Subject: [PATCH 466/632] salary structure

bzr revid: apa@tinyerp.com-20101008105603-r53paarjw8rotym8
---
 .../report/report_emp_salary_structure.rml    | 38 ++-----------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 6bfc528e4e0..105bf823b43 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -290,10 +290,10 @@
             <para style="terp_default_9">[[ employee.name ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details">Other Id</para>
+            <para style="terp_tblheader_Details">PAN No.</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.otherid or '' ]]</para>
+            <para style="terp_default_9">[[ employee.pan_no or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Address</para>
@@ -369,7 +369,7 @@
             <para style="terp_tblheader_Details">Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
+            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]] [[ employee.company_id and employee.company_id.currency_id.symbol]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Notes:</para>
@@ -389,13 +389,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
         <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
           <tr>
             <td>
@@ -457,18 +451,9 @@
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
     </section>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="539.0" style="Table10">
       <tr>
         <td>
@@ -476,13 +461,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
         <tr>
           <td>
@@ -508,11 +487,8 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
+        <para style="terp_default_1">[[repeatIn(employee.line_ids,'line1')]]</para>
         <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
           <tr>
             <td>
@@ -542,12 +518,6 @@
           <font color="white"> </font>
         </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
\ No newline at end of file

From 2605be141302923ae37df3e36468af9407aa374f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 16:28:14 +0530
Subject: [PATCH 467/632] [IMP] Imrpove the demo data [ADD] Add new yml for
 push and pull flow and remove the old yml

bzr revid: sbh@tinyerp.com-20101008105814-9cc86y4h0hj12a5r
---
 addons/stock_location/__openerp__.py          |   6 +-
 addons/stock_location/stock_location_demo.xml |  53 +++-
 addons/stock_location/test/stock_location.yml | 271 ------------------
 .../test/stock_location_pull_flow.yml         | 226 +++++++++++++++
 .../test/stock_location_push_flow.yml         | 133 +++++++++
 5 files changed, 401 insertions(+), 288 deletions(-)
 delete mode 100644 addons/stock_location/test/stock_location.yml
 create mode 100644 addons/stock_location/test/stock_location_pull_flow.yml
 create mode 100644 addons/stock_location/test/stock_location_push_flow.yml

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index a0d2118b754..b4d6c5577ac 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -82,8 +82,10 @@ product (i.e. the destination location of that procurement order).
     'demo_xml': ['stock_location_demo.xml',],
     
     'installable': True,
-    'test':[
-            'test/stock_location.yml'
+    'test':[''
+            'test/stock_location.yml',
+            'test/stock_location_pull_flow.yml',
+            'test/stock_location_push_flow.yml',
             ],
     'active': False,
     'certificate': '0046505115101',
diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index f79026f66fc..461579eabce 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -4,35 +4,58 @@
 	     <record id="product.product_product_cpu1" model="product.product">
             <field name="description">This product use for  push/pull path </field>
         </record>
-		<record id="stock_location_path_0" model="stock.location.path">
+		<record id="stock_location_input0" model="stock.location">
+			<field name="location_id" ref="stock.stock_location_company"/>
+			<field eval="0" name="scrap_location"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="usage">internal</field>
+			<field name="chained_location_type">none</field>
+			<field eval="1" name="active"/>
+			<field eval="27" name="parent_right"/>
+			<field name="name">Input</field>
+			<field name="chained_auto_packing">manual</field>
+			<field eval="26" name="parent_left"/>
+		</record>
+		<record id="stock_location_qualitytest0" model="stock.location">
+				<field name="location_id" ref="stock.stock_location_company"/>
+				<field eval="0" name="scrap_location"/>
+				<field name="company_id" ref="base.main_company"/>
+				<field name="usage">internal</field>
+				<field name="chained_location_type">none</field>
+				<field eval="1" name="active"/>
+				<field eval="25" name="parent_right"/>
+				<field name="name">Quality test</field>
+				<field name="chained_auto_packing">manual</field>
+				<field eval="24" name="parent_left"/>
+			</record> 
+		<record id="stock_location_path_3" model="stock.location.path">
 			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="auto">auto</field>
 			<field name="invoice_state">none</field>
 			<field eval="1" name="delay"/>
-			<field name="location_dest_id" ref="stock.stock_location_stock"/>
+			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
 			<field name="picking_type">out</field>
 		</record>
-		<record id="stock_location_path_1" model="stock.location.path">
-			<field name="location_from_id" ref="stock.stock_location_output"/>
+		<record id="stock_location_path_4" model="stock.location.path">
+			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="auto">auto</field>
 			<field name="invoice_state">none</field>
 			<field eval="1" name="delay"/>
+			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
+			<field name="picking_type">out</field>
+		</record>
+		<record id="stock_location_path_5" model="stock.location.path">
+			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
+			<field name="product_id" ref="product.product_product_cpu1"/>
+			<field name="auto">auto</field>
+			<field name="invoice_state">none</field>
+			<field eval="5" name="delay"/>
 			<field name="location_dest_id" ref="stock.stock_location_stock"/>
 			<field name="picking_type">out</field>
 		</record>
-		<record id="product_pulled_flow_l0" model="product.pulled.flow">
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_id" ref="stock.stock_location_shop0"/>
-			<field name="invoice_state">none</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="type_proc">move</field>
-			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_order</field>
-			<field name="picking_type">out</field>
-			<field name="name">L001</field>
-		</record>
+		
 		<record id="product_pulled_flow_l1" model="product.pulled.flow">
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="location_src_id" ref="stock.stock_location_suppliers"/>
diff --git a/addons/stock_location/test/stock_location.yml b/addons/stock_location/test/stock_location.yml
deleted file mode 100644
index 609d0af4147..00000000000
--- a/addons/stock_location/test/stock_location.yml
+++ /dev/null
@@ -1,271 +0,0 @@
-
--
-  In order to test the stock location module, I will create product, locations, SO, warehouse. 
-  
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_asset0}:
-    close_method: balance
-    code: asset
-    name: Asset
-    sign: 1
-    
-
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: income
-    name: Income
-    sign: 1
-    
-    
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: expense
-    name: Expense
-    sign: 1    
-- 
-  Creating a account.account.type record
-- 
-  !record {model: account.account.type, id: account_account_type_receivable0}:
-    close_method: balance
-    code: receivable
-    name: Receivable
-    sign: 1
--
- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_receivable0}:
-    code: '40000'
-    company_id: base.main_company
-    currency_mode: current
-    name: Receivable
-    parent_left: 1
-    parent_right: 2
-    type: receivable
-    user_type: account_account_type_receivable0
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_payable0}:
-    code: '440000'
-    company_id: base.main_company
-    currency_mode: current
-    name: Payable
-    parent_left: 3
-    parent_right: 4
-    type: payable
-    user_type: account_account_type_expense0    
-- 
-  Creating a account.journal record
-- 
-  !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: pur
-    company_id: base.main_company
-    name: Purchase Journal
-    sequence_id:  account.sequence_purchase_journal
-    type: purchase
-    view_id: account.account_journal_bank_view
-    
-- 
-  Creating a account.journal record
-- 
-  !record {model: account.journal, id: account_journal_salejouran0}:
-    code: sal
-    company_id: base.main_company
-    name: Sale Jouran
-    sequence_id: account.sequence_sale_journal
-    type: sale
-    view_id: account.account_journal_view
-    
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_expenseaccount0}:
-    code: Expe
-    company_id: base.main_company
-    currency_mode: current
-    name: Expense Account
-    parent_left: 5
-    parent_right: 6
-    type: consolidation
-    user_type: account_account_type_asset0
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_productsale0}:
-    code: '001'
-    company_id: base.main_company
-    currency_mode: current
-    name: Product Sale
-    type: other
-    user_type: account_account_type_income0
-
-- 
-  Creating a account.account record
-- 
-  !record {model: account.account, id: account_account_productpurchase0}:
-    code: '0002'
-    company_id: base.main_company
-    currency_mode: current
-    name: Product Purchase
-    type: other
-    user_type: account_account_type_expense0
-        
-- 
-  Creating a res.partner record
-- 
-  !record {model: res.partner, id: res_partner_shawtrust0}:
-    address:
-      - country_id: base.in    
-      - street: St James House, Vicar Lane, Sheffield
-    lang: en_US
-    name: 'Shaw Trust '
-    property_account_payable: account_account_payable0
-    property_account_receivable: account_account_receivable0
--    
-  Creating a res.partner record
-- 
-  !record {model: res.partner, id: res_partner_diasorinltd0}:
-    address:
-      - country_id: base.in
-        street: Ash House, Ash Road
-    name: DiaSorin Ltd
-    supplier: true
-    
-        
--
-  Creating a res.partner record
-- 
-  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
-    address:
-      - street: Kailash Vaibhav, Parksite
-    name: Micro Link Technologies
-    property_account_payable: account_account_payable0
-    property_account_receivable: account_account_receivable0   
-    supplier: true        
-    
--
-  Creating a res.partner.address record
-- 
-  !record {model: res.partner.address, id: res_partner_address_0}:
-    country_id: base.in
-    partner_id: res_partner_microlinktechnologies0
-    street: Ash House, Ash Road
-    title: base.res_partner_title_miss
-    
-               
--     
-  Creating a product.category record
-- 
-  !record {model: product.category, id: product_category_computer0}:
-    name: Computer
--
-  Creating a stock.location record
-- 
-  !record {model: stock.location, id: stock_location_suppiler0}:
-    chained_auto_packing: auto
-    chained_delay: 15
-    chained_location_type: none
-    company_id: base.main_company
-    name: Suppiler1
-    usage: supplier
-- 
-
-  Creating a product.product record
-- 
-  !record {model: product.product, id: product_product_hpcdwriters0}:
-    categ_id: product_category_computer0
-    cost_method: standard
-    list_price: 1000.0
-    mes_type: fixed
-    name: HP CD writers
-    procure_method: make_to_stock
-    seller_ids:
-      - delay: 1
-        name: res_partner_shawtrust0
-        min_qty: 5.0
-    supply_method: buy
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
-    property_account_expense: account_account_productpurchase0
-    property_account_income: account_account_productsale0
-    path_ids:
-      - auto: auto
-        delay: 30
-        location_dest_id: stock.location_inventory
-        location_from_id: stock_location_suppiler0
-    property_stock_inventory: stock.location_inventory
-    property_stock_procurement: stock.location_procurement
-    property_stock_production: stock.location_production
--
-  Creating a stock.location record
-- 
-  !record {model: stock.location, id: stock_location_suppiler0}:
-    address_id: res_partner_address_0
-    chained_auto_packing: manual
-    chained_delay: 20
-    chained_location_type: none
-    company_id: base.main_company
-    name: Suppiler 1
-    usage: internal
--
-  I create warehouse.
-- 
-  !record {model: stock.warehouse, id: warehouse0}:
-    company_id: base.main_company
-    lot_input_id: stock.stock_location_stock
-    lot_output_id: stock_location_suppiler0
-    lot_stock_id: stock_location_suppiler0
-    name: OpenERP S.A.
-    partner_address_id: res_partner_address_0
-- 
-  I create outgoing picking order for HP CD writers.
-- 
-  !record {model: stock.picking, id: stock_picking_out0}:
-    address_id: base.res_partner_address_1
-    company_id: base.main_company
-    invoice_state: none
-    move_lines:
-      - date_expected: '2010-10-07 10:52:54'
-        location_dest_id: stock.stock_location_customers
-        location_id: stock_location_suppiler0
-        name: '[MB1] Mainboard ASUStek A7N8X'
-        product_id: product.product_product_mb1
-        product_qty: 1.0
-        product_uom: product.product_uom_unit
-        product_uos_qty: 1.0
-    move_type: direct
-    name: OUT/00007
-    type: out
-- 
-  I confirm the picking.
-- 
-   !python {model: stock.picking}: |
-    self.draft_validate(cr, uid, [ref("stock_picking_out0")], {"lang": "en_US",
-      "search_default_available": 1, "tz": False, "active_model": "ir.ui.menu",
-      "contact_display": "partner_address", "active_ids": [ref("stock.menu_action_picking_tree")],
-      "active_id": ref("stock.menu_action_picking_tree"), })
-
--
-  I check the delay mentioned in pushed flow in move. 
--  
-  !python {model: stock.move}: |
-    product_id=self.pool.get('product.product').search(cr,uid,[('name','=','HP CD writers')])
-    location_id=self.pool.get('stock.location').search(cr,uid,[('name','=','Inventory loss')])
-    move_ids =self.search(cr, uid, [('product_id','in',product_id),('location_dest_id','=',location_id)])
-    if move_ids:
-      move_obj=self.browse(cr,uid,move_ids)[0]
-      import time
-      from_dt = time.mktime(time.strptime(move_obj.date,'%Y-%m-%d %H:%M:%S'))
-      to_dt = time.mktime(time.strptime(move_obj.date_planned,'%Y-%m-%d %H:%M:%S'))
-      diff_day = (to_dt-from_dt)/(3600*24)
-      assert (round(diff_day)+1 ==30)    
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
new file mode 100644
index 00000000000..b51f82ae92c
--- /dev/null
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -0,0 +1,226 @@
+-
+  In order to test the product pulled flow , I create ,partner,product,procument 
+- 
+  I create a account type Asset.
+- 
+  !record {model: account.account.type, id: account_account_type_asset0}:
+    close_method: balance
+    code: asset
+    name: Asset
+    sign: 1
+- 
+  I create a account type income.
+- 
+  !record {model: account.account.type, id: account_account_type_income0}:
+    close_method: unreconciled
+    code: income
+    name: Income
+    sign: 1
+- 
+  I create a account type Expense.
+- 
+  !record {model: account.account.type, id: account_account_type_expense0}:
+    close_method: unreconciled
+    code: expense
+    name: Expense
+    sign: 1    
+- 
+  I create a account type Receivable.
+- 
+  !record {model: account.account.type, id: account_account_type_receivable0}:
+    close_method: balance
+    code: receivable
+    name: Receivable
+    sign: 1
+-
+ 
+  I create a account  Receivable.
+- 
+  !record {model: account.account, id: account_account_receivable0}:
+    code: '40000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Receivable
+    parent_left: 1
+    parent_right: 2
+    type: receivable
+    user_type: account_account_type_receivable0
+- 
+  I create a account  Payable.
+- 
+  !record {model: account.account, id: account_account_payable0}:
+    code: '440000'
+    company_id: base.main_company
+    currency_mode: current
+    name: Payable
+    parent_left: 3
+    parent_right: 4
+    type: payable
+    user_type: account_account_type_expense0    
+- 
+  I create a Purchase Journal.
+- 
+  !record {model: account.journal, id: account_journal_purchasejournal0}:
+    code: pur
+    company_id: base.main_company
+    name: Purchase Journal
+    sequence_id:  account.sequence_purchase_journal
+    type: purchase
+    view_id: account.account_journal_bank_view
+    
+- 
+  I create a Sale Journal.
+- 
+  !record {model: account.journal, id: account_journal_salejouran0}:
+    code: sal
+    company_id: base.main_company
+    name: Sale Journal
+    sequence_id: account.sequence_sale_journal
+    type: sale
+    view_id: account.account_journal_view
+    
+- 
+  I create a Sale Journal.
+- 
+  !record {model: account.account, id: account_account_expenseaccount0}:
+    code: Expe
+    company_id: base.main_company
+    currency_mode: current
+    name: Expense Account
+    parent_left: 5
+    parent_right: 6
+    type: consolidation
+    user_type: account_account_type_asset0
+- 
+  I create  Product Sale account.
+- 
+  !record {model: account.account, id: account_account_productsale0}:
+    code: '001'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Sale
+    type: other
+    user_type: account_account_type_income0
+
+- 
+  I create  Product Product Purchase.
+- 
+  !record {model: account.account, id: account_account_productpurchase0}:
+    code: '0002'
+    company_id: base.main_company
+    currency_mode: current
+    name: Product Purchase
+    type: other
+    user_type: account_account_type_expense0
+- 
+  I create  Supplier.
+- 
+  !record {model: res.partner, id: res_partner_shawtrust0}:
+    address:
+      - country_id: base.in    
+      - street: St James House, Vicar Lane, Sheffield
+    lang: en_US
+    name: 'Shaw Trust '
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0  
+-     
+  I create product category.
+- 
+  !record {model: product.category, id: product_category_computer0}:
+    name: Computer
+-
+  I create product and define the  pulled flow condition for stock move.
+  I set shipping type Sending Goods. and set Procurement type move.
+- 
+  !record {model: product.product, id: product_product_hpcdwriters0}:
+    categ_id: product_category_computer0
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: HP CD writers
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: res_partner_shawtrust0
+        min_qty: 5.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_account_expense: account_account_productpurchase0
+    property_account_income: account_account_productsale0
+    flow_pull_ids:
+      - invoice_state: none
+        location_id: stock.stock_location_shop0
+        location_src_id: stock.stock_location_shop1
+        name: E001
+        partner_address_id: base.res_partner_address_2
+        picking_type: out
+        procure_method: make_to_stock
+        type_proc: move
+      - invoice_state: none
+        location_id: stock.stock_location_shop1
+        location_src_id: stock.stock_location_suppliers
+        name: E002
+        partner_address_id: base.res_partner_address_7
+        picking_type: out
+        procure_method: make_to_stock
+        type_proc: move
+      - invoice_state: none
+        location_id: stock.stock_location_suppliers
+        location_src_id: stock.stock_location_stock
+        name: E003
+        type_proc: buy
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+    qty_available: 15
+-   
+  I create procurement order.
+- 
+  !record {model: procurement.order, id: procurement_order_test0}:
+    company_id: base.main_company
+    date_planned: '2010-10-07 18:24:24'
+    location_id: stock.stock_location_shop0
+    name: Testing pulled flow
+    priority: '1'
+    procure_method: make_to_order
+    product_id: product_product_hpcdwriters0
+    product_qty: 5.0
+    product_uom: product.product_uom_unit
+    product_uos: product.product_uom_unit
+    product_uos_qty: 0.0
+- 
+  I confirm  procurement order.
+- 
+  !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_test0}
+- 
+  I launch the scheduler to compute  procurement.
+-  
+  !python {model: procurement.order.compute.all}: |
+    proc_obj = self.pool.get('procurement.order')
+    proc_obj._procure_confirm(cr,uid)
+-
+  I check the state of procurement order is cancel and stock move is cancel.  
+-  
+  !python {model: procurement.order }: |  
+   from tools.translate import _   
+   procurement_ids=self.search(cr, uid, [('id', '=', ref('procurement_order_test0'))])
+   if procurement_ids:
+    order=self.browse(cr,uid,procurement_ids)[0]
+    assert(order.state=='cancel')  
+-
+  I check the new of procurement order  create .
+-
+  !python {model: procurement.order }: |  
+   from tools.translate import _   
+   procurement_ids=self.search(cr, uid, [('name','=','E001')])
+   assert len(procurement_ids), "Procurement order hasn't Created."  
+-
+  I check the Outgoing Picking  is create for source location Shop 2 and destination shop1.
+-
+  !python {model: stock.picking }: |
+    from tools.translate import _   
+    picking_id = self.search(cr, uid, [('origin','=','Testing pulled flow:E001'),('type','=','out')])
+    assert len(picking_id), "Picking  hasn't Created."  
+    
\ No newline at end of file
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
new file mode 100644
index 00000000000..480feae0b91
--- /dev/null
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -0,0 +1,133 @@
+-
+  In order to test the product pushed flow , I create account ,partner,product,shipment
+  Push flow specification indicates which location is chained with which location.
+-
+  I create product category.
+- 
+  !record {model: product.category, id: product_category_computer0}:
+    name: Computer
+        
+-
+  I create Supplier.
+- 
+  !record {model: res.partner, id: res_partner_microlinktechnologies0}:
+    address:
+      - street: Kailash Vaibhav, Parksite
+    name: Micro Link Technologies
+    property_account_payable: account_account_payable0
+    property_account_receivable: account_account_receivable0   
+    supplier: true        
+    
+-
+  I create Supplier address.
+- 
+  !record {model: res.partner.address, id: res_partner_address_0}:
+    country_id: base.in
+    partner_id: res_partner_microlinktechnologies0
+    street: Ash House, Ash Road
+    title: base.res_partner_title_miss
+    
+-
+  I create product and define the pushed flow .
+-
+  I set the chain location Supplier to stock Input
+  Stock Input to Quality test and Quality test -Stock  .  
+- 
+  !record {model: product.product, id: product_product_hpcdwriters0}:
+    categ_id: product_category_computer0
+    cost_method: standard
+    list_price: 1000.0
+    mes_type: fixed
+    name: HP CD writers
+    procure_method: make_to_stock
+    seller_ids:
+      - delay: 1
+        name: res_partner_diasorinltd0
+        min_qty: 5.0
+    path_ids:
+      - auto: auto
+        invoice_state: none
+        location_dest_id: stock_location.stock_location_input0
+        location_from_id: stock.stock_location_suppliers
+      - auto: auto
+        invoice_state: none
+        location_dest_id: stock_location.stock_location_qualitytest0
+        location_from_id: stock_location.stock_location_input0
+      - auto: auto
+        invoice_state: none
+        location_dest_id: stock.stock_location_stock
+        location_from_id: stock_location.stock_location_qualitytest0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    property_stock_inventory: stock.location_inventory
+    property_stock_procurement: stock.location_procurement
+    property_stock_production: stock.location_production
+-
+  In order to test pushed flow .I buy the product from Micro Link Technologies supplier. I create a Picking.
+- 
+   !record {model: stock.picking , id: stock_picking_in0}:
+    address_id: res_partner_address_0
+    company_id: base.main_company
+    invoice_state: none
+    move_lines:
+      - date_expected: '2010-10-08 15:36:53'
+        location_dest_id: stock_location.stock_location_input0
+        location_id: stock.stock_location_suppliers
+        name: 'HP CD writers'
+        product_id: product_product_hpcdwriters0
+        product_qty: 6.0
+        product_uom: product.product_uom_unit
+        product_uos_qty: 6.0
+    name: Pushed Flow Test
+    type: in
+-
+  I confirm picking.    
+-
+  !python {model: stock.picking }: |
+    self.draft_force_assign(cr, uid, [ref("stock_picking_in0")], {"lang": "en_US",
+      "search_default_available": 1, "tz": False, "active_model": "ir.ui.menu",
+      "contact_display": "partner_address", "active_ids": [ref("stock.menu_action_picking_tree4")],
+      "active_id": ref("stock.menu_action_picking_tree4"), })
+-
+  I check that the outgoing order of the supplier  is create with two move line.
+  Stock/Input To Quality test and Quality test  To Stock.  
+  I check the move is in waiting state.
+-  
+  !python {model: stock.picking }: |
+   from tools.translate import _
+   picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      for move in pick.move_lines:
+         assert(move.state == 'waiting'), _('Stock  is  not in waiting state')
+-
+  I receive the order of the supplier DiaSorin from the Incoming Shipments menu.
+-
+  !python {model: stock.picking }: |
+   import time
+   picking_id = self.search(cr, uid, [('address_id.partner_id','=',ref('res_partner_microlinktechnologies0')),('type','=','in')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      move =pick.move_lines[0]
+      partial_datas = {
+           'partner_id':pick.address_id.partner_id.id,
+            'address_id': pick.address_id.id,
+            'delivery_date' : time.strftime('%Y-%m-%d'),
+           }
+      partial_datas['move%s'%(move.id)]= {
+          'product_id': move.product_id.id,
+          'product_qty': move.product_qty,
+          'product_uom': move.product_uom.id,
+      } 
+      self.do_partial(cr, uid, picking_id,partial_datas)  
+-
+  I check the Outgoing Orders is automatically  done.
+-  
+  !python {model: stock.picking }: |
+   from tools.translate import _
+   picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')])
+   if picking_id:
+      pick=self.browse(cr,uid,picking_id[0])
+      assert(pick.state == 'done'), _('Picking  is  not in done state')

From a186491d9107d630bd2d3d4ebe30d4ade5d9d678 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 8 Oct 2010 16:29:48 +0530
Subject: [PATCH 468/632] [IMP] event: Improve search view and small change in
 Make invoice wizard

bzr revid: psi@tinyerp.co.in-20101008105948-1qflslhcp1qla6qo
---
 addons/event/event.py                     |  3 ++-
 addons/event/event_view.xml               | 13 +++++++++++--
 addons/event/security/event_security.xml  |  9 ++++-----
 addons/event/wizard/event_make_invoice.py |  7 ++-----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index d76dd2ee0b2..fc01ae8bdfc 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -37,7 +37,7 @@ class event_type(osv.osv):
     }
 event_type()
 
-class event_event(osv.osv):
+class event_event(crm.crm_case, osv.osv):
     """Event"""
     _name = 'event.event'
     _description = __doc__
@@ -246,6 +246,7 @@ class event_event(osv.osv):
         'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
+        'section_id': crm.crm_case._get_section,
     }
 
     def _check_recursion(self, cr, uid, ids):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed1e13ceec8..185b1d33ec9 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -164,6 +164,7 @@
             <field name="arch" type="xml">
                 <tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
                     <field name="name" string="Name"/>
+                    <field name="user_id"/>
                     <field name="main_speaker_id"/>
                     <field name="language"/>
                     <field name="type"/>
@@ -171,6 +172,7 @@
                     <field name="date_end"/>
                     <field name="register_min"/>
                     <field name="register_current"/>
+                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
                     <field name="state"/>
                     <button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                     <button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
@@ -231,13 +233,20 @@
                         </field>
                         <field name="date_begin" select="1"/>
                         <field name="state" select="1"/>
+                        <field name="section_id" default="context.get('section_id', False)" widget="selection" groups="base.group_extended">
+                          <filter icon="terp-personal+"
+                                  context="{'invisible_section': False}"
+                                  domain="[('section_id.user_id','=',uid)]"
+                                  groups="base.group_extended"
+                                  help="My Sales Team(s)"/>
+                        </field>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="12">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
-                        <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Beginning Date" icon="terp-go-month"
                             domain="[]" context="{'group_by':'date_begin'}"/>
@@ -254,7 +263,7 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form,calendar,graph</field>
-           <field name="context">{"search_default_draft": "1"}</field>
+           <field name="context">{"search_default_draft": "1", "search_default_section_id": section_id}</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
 
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index a847550d7dd..bcd172ce8c7 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-	
-	
+  <data>
+
     <record id="base.group_marketing_manager" model="res.groups">
         <field name="name">Marketing / Manager</field>
     </record>
+
     <record id="base.res_groups_email_template_admin" model="res.groups">
         <field name="name">Marketing / User</field>
     </record>
@@ -17,8 +17,7 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-  
 
-	</data>
+  </data>
 </openerp>
 
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 96bffff537c..12ad2cf0d68 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -45,12 +45,9 @@ class event_make_invoice(osv.osv_memory):
         data = context and context.get('active_ids', [])
 
         for event_reg in obj_event_reg.browse(cr, uid, data, context=context):
-            if event_reg.state == 'draft':
+            if event_reg.state in ('draft', 'done', 'cancel'):
                      raise osv.except_osv(_('Warning !'),
-                        _("Invoice cannot be created if the registration is in draft state."))
-            if event_reg.state == 'done':
-                     raise osv.except_osv(_('Warning !'),
-                        _("Invoice cannot be created if the registration is in done state."))
+                        _("Invoice cannot be created if the registration is in %s state.") % (event_reg.state))
 
             if (not event_reg.tobe_invoiced):
                     raise osv.except_osv(_('Warning !'),

From 7dd989a7d6029fa50e5df441db99a99e1adba4f1 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 8 Oct 2010 16:52:36 +0530
Subject: [PATCH 469/632] [IMP] sale:-improvements in the access rights of
 sales for user and manager

bzr revid: mtr@mtr-20101008112236-u4ufgpvq9p3d4r32
---
 addons/sale/security/ir.model.access.csv | 31 +++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 273029ad0ce..0d523202a10 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,18 +1,21 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,1,1,1
-"access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,1
-"access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,0
+"access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,1,1,0
+"access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
+"access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
 "access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1
-"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,1
+"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
+"access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
 "access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,1
 "access_account_payment_term_salesman","account_payment_term salesman","account.model_account_payment_term","base.group_sale_salesman",1,0,0,0
-"access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","base.group_sale_salesman",1,1,1,1
-"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","base.group_sale_salesman",1,1,1,1
+"access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","base.group_sale_salesman",1,1,1,0
+"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","base.group_sale_salesman",1,1,1,0
 "access_stock_move_salesman","stock_move salesman","stock.model_stock_move","base.group_sale_salesman",1,1,1,0
-"access_procurement_salesman","procurement.order salesman","procurement.model_procurement_order","base.group_sale_salesman",1,1,1,1
+"access_stock_move_manager","stock_move manager","stock.model_stock_move","base.group_sale_manager",1,1,1,1
+"access_procurement_salesman","procurement.order salesman","procurement.model_procurement_order","base.group_sale_salesman",1,1,1,0
+"access_procurement_manager","procurement.order manager","procurement.model_procurement_order","base.group_sale_manager",1,1,1,1
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
-"access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,0,0,0
+"access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,1,1,1
 "access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0
 "access_sale_report_salesman","sale.report","model_sale_report","base.group_sale_salesman",1,1,1,0
 "access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
@@ -27,12 +30,12 @@
 "access_product_product_sale_user","product.product sale use","product.model_product_product","base.group_sale_salesman",1,0,0,0
 "access_product_template_sale","product.template sale manager","product.model_product_template","base.group_sale_manager",1,0,0,0
 "access_product_product_sale","product.product sale manager","product.model_product_product","base.group_sale_manager",1,0,0,0
-"access_sale_shop_manager","account.journal sale order.user","model_sale_shop","base.group_sale_manager",1,0,0,0
+"access_sale_shop_manager","account.journal sale order.user","model_sale_shop","base.group_sale_manager",1,1,1,1
 "access_account_fiscalyear_manager","account.fiscalyear.manager","account.model_account_fiscalyear","base.group_sale_manager",1,0,0,0
-"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,1,1,1
+"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_sale_salesman",1,0,0,0
 "access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0
-"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,1
-"access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,1
+"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,0
+"access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,0
 "access_res_country_system","res.country system","base.model_res_country","base.group_system",1,1,1,1
 "access_res_country_state_system","res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
 "access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
@@ -42,8 +45,8 @@
 "access_stock_picking_system","stock.picking.system","stock.model_stock_picking","base.group_system",1,0,0,0
 "access_sale_report_system","sale.report.system","model_sale_report","base.group_system",1,0,0,0
 "access_ir_attachment_system","ir.attachment.system","base.model_ir_attachment","base.group_system",1,0,0,0
-"access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,1
-"access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,0,0,0
+"access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,0
+"access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
 "access_res_partner_bank_type_system","res.partner.bank.type.system","base.model_res_partner_bank_type","base.group_system",1,0,0,0
 "access_stock_warehouse_manager","stock.warehouse.manager","stock.model_stock_warehouse","base.group_sale_manager",1,0,0,0
 "access_product_uom_manager","product.uom.manager","product.model_product_uom","base.group_sale_manager",1,0,0,0

From 4889376decc6873159e935bbcb6851b9efaccc95 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 8 Oct 2010 16:58:58 +0530
Subject: [PATCH 470/632] [IMP] Account: Customer invoice/refund => Change
 string to Partner to Customer in form and tree view,  same for vendor
 invoice/refund

bzr revid: mra@mra-laptop-20101008112858-ye1u84bvyfdyomwj
---
 addons/account/account_invoice_view.xml |  4 ++--
 addons/account/invoice.py               | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 02924dad580..48624253bc6 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -156,7 +156,7 @@
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
+                        <field string="Vendor" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -265,7 +265,7 @@
                     <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
-                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
+                    <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 870b3b853bb..79978c0bbaf 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+from lxml import etree
 import decimal_precision as dp
 
 import netsvc
@@ -346,6 +347,16 @@ class account_invoice(osv.osv):
             if field == 'journal_id':
                 journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
                 res['fields'][field]['selection'] = journal_select
+
+        if view_type == 'tree':
+            doc = etree.XML(res['arch'])
+            nodes = doc.xpath("//field[@name='partner_id']")
+            partner_string = 'Customer'
+            if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
+                partner_string = 'Vendor'
+            for node in nodes:
+                node.set('string', partner_string)
+            res['arch'] = etree.tostring(doc)
         return res
 
     def create(self, cr, uid, vals, context=None):

From f0175be9248729074c4860c83decba78af59dd1d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 17:09:47 +0530
Subject: [PATCH 471/632] [IMP] Improve yml

bzr revid: sbh@tinyerp.com-20101008113947-b91cg9mnubkdh1n2
---
 addons/stock_location/__openerp__.py                    | 1 -
 addons/stock_location/test/stock_location_pull_flow.yml | 2 +-
 addons/stock_location/test/stock_location_push_flow.yml | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index b4d6c5577ac..befec3a55ae 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -83,7 +83,6 @@ product (i.e. the destination location of that procurement order).
     
     'installable': True,
     'test':[''
-            'test/stock_location.yml',
             'test/stock_location_pull_flow.yml',
             'test/stock_location_push_flow.yml',
             ],
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index b51f82ae92c..a6f7a8e913a 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the product pulled flow , I create ,partner,product,procument 
+  In order to test the product pulled flow , I create ,partner,product,procurement  
 - 
   I create a account type Asset.
 - 
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index 480feae0b91..8463daf3196 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -42,7 +42,7 @@
     procure_method: make_to_stock
     seller_ids:
       - delay: 1
-        name: res_partner_diasorinltd0
+        name: res_partner_microlinktechnologies0
         min_qty: 5.0
     path_ids:
       - auto: auto
@@ -103,7 +103,7 @@
       for move in pick.move_lines:
          assert(move.state == 'waiting'), _('Stock  is  not in waiting state')
 -
-  I receive the order of the supplier DiaSorin from the Incoming Shipments menu.
+  I receive the order of the supplier Micro Link Technologies from the Incoming Shipments menu.
 -
   !python {model: stock.picking }: |
    import time

From 594c9f9357c13854d0ed93841b6e2283c039c690 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 8 Oct 2010 17:27:11 +0530
Subject: [PATCH 472/632] [IMP] stock_location: Imrpove the demo data

bzr revid: sbh@tinyerp.com-20101008115711-3p5931w34aafjois
---
 addons/stock_location/__openerp__.py           |  2 +-
 addons/stock_location/stock_location_demo.xml  | 18 +++++++++++-------
 .../test/stock_location_push_flow.yml          |  3 ++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index befec3a55ae..e5d6f767975 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -38,7 +38,7 @@ Typically this could be used to:
 * Help rental management, by generating automated return moves for rented products
 
 Once this module is installed, an additional tab appear on the product form, where you can add
-Push and Pull flow specifications.
+Push and Pull flow specifications. The demo data of  CPU1 product for that push/pull :
 
 Push flows
 ----------
diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index 461579eabce..012602735e7 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -56,25 +56,29 @@
 			<field name="picking_type">out</field>
 		</record>
 		
-		<record id="product_pulled_flow_l1" model="product.pulled.flow">
+		<record id="product_pulled_flow_l0" model="product.pulled.flow">
 			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_src_id" ref="stock.stock_location_suppliers"/>
-			<field name="location_id" ref="stock.stock_location_stock"/>
+			<field name="location_src_id" ref="stock.stock_location_stock"/>
+			<field name="location_id" ref="stock.stock_location_shop0"/>
+			<field name="partner_address_id" ref="base.main_address"/>
 			<field name="invoice_state">none</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="type_proc">move</field>
 			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_order</field>
+			<field name="procure_method">make_to_stock</field>
 			<field name="picking_type">out</field>
-			<field name="name">L002</field>
+			<field name="name">L001</field>
 		</record>
-		<record id="product_pulled_flow_l2" model="product.pulled.flow">
+		<record id="product_pulled_flow_l1" model="product.pulled.flow">
 			<field name="product_id" ref="product.product_product_cpu1"/>
 			<field name="location_id" ref="stock.stock_location_suppliers"/>
 			<field name="invoice_state">none</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="type_proc">buy</field>
-			<field name="name">L003</field>
+			<field eval="0" name="cancel_cascade"/>
+			<field name="procure_method">make_to_stock</field>
+			<field name="picking_type">out</field>
+			<field name="name">L002</field>
 		</record>
 	</data>
 </openerp>
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index 8463daf3196..989134c13bb 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -92,7 +92,8 @@
       "active_id": ref("stock.menu_action_picking_tree4"), })
 -
   I check that the outgoing order of the supplier  is create with two move line.
-  Stock/Input To Quality test and Quality test  To Stock.  
+  Stock/Input To Quality test and Quality test  To Stock.
+-
   I check the move is in waiting state.
 -  
   !python {model: stock.picking }: |

From f14feff3b2de05a1b98ca798ed124eb625ba5bf9 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Fri, 8 Oct 2010 17:28:01 +0530
Subject: [PATCH 473/632] [IMP]Improved reports of point of sale

bzr revid: azaz.201186@gmail.com-20101008115801-sh5n8v5jckxp3sf1
---
 addons/point_of_sale/pos_demo.xml             | 135 +++++++++++-
 .../report/account_statement.rml              |  21 +-
 .../report/all_closed_cashbox_of_the_day.rml  |   9 +-
 addons/point_of_sale/report/pos_details.rml   | 196 +++++++++---------
 .../report/pos_details_summary.py             |  17 +-
 .../report/pos_details_summary.rml            |  64 +++---
 addons/point_of_sale/report/pos_lines.rml     |  15 +-
 .../report/pos_payment_report.rml             |  20 +-
 .../report/pos_payment_report_date.rml        |   2 +-
 .../report/pos_payment_report_user.rml        |  13 +-
 .../point_of_sale/report/pos_sales_user.rml   |   3 -
 .../report/pos_sales_user_today.rml           |   3 -
 .../pos_sales_user_today_current_user.rml     |  11 +-
 13 files changed, 326 insertions(+), 183 deletions(-)

diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 80ba3d24397..913a2907e03 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -1,7 +1,140 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+    	 <record id="account_invoice_invoicefrompospos0" model="account.invoice">
+			<field name="origin">POS/019</field>
+			<field name="reference">POS/019</field>
+			<field name="number">SAJ/2010/010</field>
+			<field name="journal_id" ref="account.sales_journal"/>
+			<field name="currency_id" ref="base.EUR"/>
+			<field name="address_invoice_id" ref="base.res_partner_address_8invoice"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="address_contact_id" ref="base.res_partner_address_8"/>
+			<field name="reference_type">none</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="state">open</field>
+			<field name="type">out_invoice</field>
+			<field name="internal_number">SAJ/2010/010</field>
+			<field name="account_id" ref="account.a_recv"/>
+			<field eval="0" name="reconciled"/>
+			<field eval="450.0" name="residual"/>
+			<field name="move_name">/</field>
+			<field name="date_invoice">2010-10-07</field>
+			<field name="period_id" ref="account.period_10"/>
+			<field eval="450.0" name="amount_untaxed"/>
+			<field model="account.move" name="move_id" search="[('name', '=', u'SAJ/2010/010')]"/>
+			<field eval="450.0" name="amount_total"/>
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field name="name">Invoice from POS: POS/019</field>
+		</record>
+		<record id="account_invoice_line_pcbasicpc0" model="account.invoice.line">
+			<field name="uos_id" ref="product.product_uom_unit"/>
+			<field name="account_id" ref="account.a_recv"/>
+			<field name="name">[PC1] Basic PC</field>
+			<field model="account.invoice" name="invoice_id" search="[('name', '=', 'Invoice from POS: POS/019')]"/>
+			<field eval="450.0" name="price_unit"/>
+			<field eval="450.0" name="price_subtotal"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="[(6,0,[])]" name="invoice_line_tax_id"/>
+			<field eval="1.0" name="quantity"/>
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field name="product_id" ref="product.product_product_pc1"/>
+		</record>
+    	<record id="pos_order_pos11" model="pos.order">
+			<field name="sale_journal" ref="account.sales_journal"/>
+			<field eval="0" name="journal_entry"/>
+			<field name="date_validity">2011-04-07</field>
+			<field name="shop_id" ref="sale.shop"/>
+			<field name="user_salesman_id" ref="base.user_root"/>
+			<field name="date_order">2010-10-07 16:53:11</field>
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field eval="1" name="nb_print"/>
+			<field name="user_id" ref="base.user_root"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="1" name="invoice_wanted"/>
+			<field name="state">paid</field>
+			<field name="sale_manager" ref="base.user_root"/>
+			<field name="pricelist_id" ref="product.list0"/>
+			<field name="date_validation">2010-10-07</field>
+			<field name="name">POS/019</field>
+			<field name="price_type">tax_excluded</field>
+			<field model="account.invoice" name="invoice_id" search="[('name', '=', u'Invoice from POS: POS/019')]"/>
+			<field eval="0" name="remboursed"/>
+			<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
+		</record>
+		<record id="account_bank_statement_0" model="account.bank.statement">
+			<field name="user_id" ref="base.user_root"/>
+			<field name="name">10</field>
+			<field name="state">open</field>
+			<field name="journal_id" ref="account.sales_journal"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="period_id" ref="account.period_10"/>
+			<field name="date">2010-10-07</field>
+		</record>
+		<record id="account_bank_statement_line_paymentpos0" model="account.bank.statement.line">
+			<field name="partner_id" ref="base.res_partner_agrolait"/>
+			<field model="account.bank.statement" name="statement_id" search="[('name', '=', u'10')]"/>
+			<field name="type">general</field>
+			<field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="account_id" ref="account.a_recv"/>
+			<field name="journal_id">Cash Journal - (test)</field>
+			<field eval="[(6,0,[])]" name="move_ids"/>
+			<field name="date">2010-10-07</field>
+			<field eval="450.0" name="amount"/>
+			<field eval="0" name="is_acc"/>
+			<field eval="0" name="am_out"/>
+			<field name="name">Payment POS/019</field>
+			
+		</record>
+	
+		<record id="stock_picking_out0" model="stock.picking">
+			<field name="origin">POS/019</field>
+			<field model="pos.order" name="pos_order" search="[('name', '=', u'POS/019')]"/>
+			<field name="date_done">2010-10-07 16:53:46</field>
+			<field eval="1" name="auto_picking"/>
+			<field name="move_type">direct</field>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="note">POS notes </field>
+			<field name="state">done</field>
+			<field name="type">out</field>
+			<field name="min_date">2010-10-07 16:53:46</field>
+			<field name="date">2010-10-07 16:33:30</field>
+			<field name="name">OUT/00019</field>
+			<field name="invoice_state">none</field>
+			<field name="max_date">2010-10-07 16:53:46</field>
+		</record>
+		<record id="stock_move_stockmovepos0" model="stock.move">
+			<field name="origin">POS/019</field>
+			<field eval="1.0" name="product_uos_qty"/>
+			<field name="product_uom" ref="product.product_uom_unit"/>
+			<field eval="1.0" name="product_qty"/>
+			<field name="product_uos" ref="product.product_uom_unit"/>
+			<field name="location_id" ref="stock.stock_location_stock"/>
+			<field name="priority">1</field>
+			<field eval="0" name="auto_validate"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field name="state">done</field>
+			<field eval="[(6,0,[])]" name="move_history_ids"/>
+			<field name="date_expected">2010-10-07 16:33:30</field>
+			<field name="date">2010-10-07 16:33:30</field>
+			<field name="name">Stock move (POS 12)</field>
+			<field eval="[(6,0,[])]" name="move_history_ids2"/>
+			<field name="product_id" ref="product.product_product_pc1"/>
+			<field name="date_planned">2010-10-07 16:53:46</field>
+			<field name="location_dest_id" ref="stock.stock_location_customers"/>
+			<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
+		</record>
+		<record id="pos_order_line_orderline0" model="pos.order.line">
+			<field name="notice">No Discount</field>
+			<field name="product_id" ref="product.product_product_pc1"/>
+			<field model="pos.order" name="order_id" search="[('name', '=', u'POS/019')]"/>
+			<field eval="450.0" name="price_unit"/>
+			<field name="company_id" ref="base.main_company"/>
+			<field eval="1.0" name="qty"/>
+			<field name="name">Order Line/07</field>
+		</record>
+	
      <!--Resource: pos.order-->
      
     	<record id="order_pos1" model="pos.order">
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index c576828cac1..66579ca6eaa 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -101,6 +101,7 @@
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -140,17 +141,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="P3">Statement</para>
-    <para style="P3">
+    <para style="P4">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
+    <para style="P4">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table1">
@@ -213,7 +208,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.date,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date=True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date=True) or '' ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]]</para>
@@ -229,7 +224,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="122.0,256.0,104.0" style="Table5">
+    <blockTable colWidths="122.0,270.0,90.0" style="Table5">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -242,7 +237,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="122.0,256.0,104.0" style="Table6">
+    <blockTable colWidths="122.0,270.0,90.0" style="Table6">
       <tr>
         <td>
           <para style="P2">[[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
@@ -257,7 +252,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="326.0,52.0,104.0" style="Table7">
+    <blockTable colWidths="347.0,45.0,90.0" style="Table7">
       <tr>
         <td>
           <para style="P1">
@@ -268,7 +263,7 @@
           <para style="terp_default_Right_9_Bold">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index 658e7e958b9..f8381c76741 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Cashbox of the day" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -71,6 +71,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -146,7 +147,7 @@
           <para style="terp_tblheader_General">St.Name</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Journal</para>
+          <para style="terp_tblheader_General">Journal</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Opening Date</para>
@@ -201,10 +202,10 @@
             <para style="terp_default_Bold_8">[[ statement['journal'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8">[[ statement['date'] ]]</para>
+            <para style="P2">[[ statement['date'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
+            <para style="P2">[[ statement['closing_date'] ]]</para>
           </td>
           <td>
             <para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 045adf0763c..f99835a3bff 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -66,72 +66,64 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,2" stop="0,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,3" stop="0,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,3" stop="1,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,4" stop="0,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,4" stop="1,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,5" stop="0,5"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,5" stop="1,5"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,5" stop="0,5"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,5" stop="1,5"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -167,14 +159,14 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_header_Centre">
+    <para style="P2">
       <font color="white"> </font>
     </para>
     <para style="terp_header_Centre">Details of Sales</para>
-    <para style="P1">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table1">
+    <blockTable colWidths="161.0,161.0,80.0,81.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -206,10 +198,10 @@
         </td>
       </tr>
     </blockTable>
-    <para style="Text body">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="88.0,38.0,168.0,52.0,35.0,33.0,69.0" style="Table4">
+    <blockTable colWidths="76.0,82.0,91.0,51.0,40.0,45.0,96.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -227,95 +219,97 @@
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc </para>
+          <para style="terp_tblheader_Details_Right">Disc(%) </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Invoiced </para>
+          <para style="P6">Invoiced </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="88.0,38.0,168.0,52.0,35.0,33.0,69.0" style="Table6">
-      <tr>
-        <td>
-          <para style="terp_default_9">[[ pos_sales_details(data['form'],user) and '' or removeParentNode('blockTable') ]]</para>
-          <para style="terp_default_9">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]] [[ formatLang(line_ids['date_order'],date = True) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]][[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]][[ company.currency_id.symbol ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_header">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="241.0,241.0" style="Table3">
+    <section>
+      <para style="terp_default_1">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
+      <blockTable colWidths="77.0,82.0,91.0,52.0,41.0,44.0,96.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P3">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line_ids['pos_name'] ]]</para>
+          </td>
+          <td>
+            <para style="P3">[[ line_ids['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]][[ company.currency_id.symbol ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ formatLang(line_ids['qty']) ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ formatLang(line_ids['discount']) ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="241.0,241.0" style="Table5">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Taxes</para>
         </td>
         <td>
-          <para style="terp_default_Bold_8">
+          <para style="P1">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.0" style="Table12">
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Helvetica" size="6.0">[[ repeatIn(gettaxamount(data['form'],user), 'p') ]]</font><font face="Helvetica" size="6.0"/>[[ p['name'] or removeParentNode('tr') ]]</para>
+          <para style="terp_default_9">[[ repeatIn(gettaxamount(data['form'],user), 'p')]]</para>
+          <para style="terp_default_9"><font face="Helvetica" size="6.0"/>[[ p['name'] or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(p['amount']) or removeParentNode('font') ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('font') ]][[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table5">
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="241.0,241.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Payment</para>
         </td>
         <td>
-          <para style="terp_default_9">
+          <para style="P1">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="241.0,241.0" style="Table10">
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Helvetica" size="6.0">[[ repeatIn(getpayments(data['form'],user), 'p') ]] </font>[[ p['name'] or removeParentNode('tr') ]]</para>
+          <para style="terp_default_9">[[ repeatIn(getpayments(data['form'],user), 'p') ]]</para>
+          <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="241.0,241.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Summary</para>
+          <para style="terp_tblheader_Details">Summary</para>
         </td>
         <td>
           <para style="terp_default_9">
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a629929e204..e15238f96f9 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -38,7 +38,8 @@ class pos_details_summary(report_sxw.rml_parse):
             'getsuminvoice': self._sum_invoice,
             'gettaxamount': self._get_tax_amount,
             'getsalestotal': self._get_sales_total,
-            'getperiod': self._get_period,
+            'getstartperiod': self._get_start_period,
+            'getendperiod': self._get_end_period,            
             'getcompany':self.get_company
         })
 
@@ -119,14 +120,24 @@ class pos_details_summary(report_sxw.rml_parse):
     def _get_sales_total(self, objects):
         return reduce(lambda x, o: x + len(o.lines), objects, 0)
 
-    def _get_period(self, objects):
+    def _get_start_period(self, objects):
         date_orders = [obj.date_order for obj in objects]
         min_date = min(date_orders)
         max_date = max(date_orders)
         if min_date == max_date:
             return '%s' % min_date
         else:
-            return '%s - %s' % (min_date, max_date)
+            return '%s' % (min_date)
+
+    def _get_end_period(self, objects):
+        date_orders = [obj.date_order for obj in objects]
+        min_date = min(date_orders)
+        max_date = max(date_orders)
+        if min_date == max_date:
+            return '%s' % max_date
+        else:
+            return '%s' % (max_date)
+            
 
 
 
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 5f68c7869f0..f525bdb2346 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Detail of sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -20,9 +20,12 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
@@ -34,9 +37,12 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -108,7 +114,8 @@
     <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -147,14 +154,14 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P4">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <para style="P4">Details of Sales</para>
-    <para style="P5">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
+    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -163,24 +170,30 @@
           <para style="terp_tblheader_General_Centre">Print Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Period</para>
+          <para style="terp_tblheader_General_Centre">Start Period</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">End Period</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
+    <blockTable colWidths="161.0,161.0,80.0,80.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
+          <para style="P5">[[ '%s' % getcompany(objects)]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P5">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getperiod(objects) ]]</para>
+          <para style="P5">[[ '%s' % getstartperiod(objects) ]]</para>
+        </td>
+        <td>
+          <para style="P5">[[ '%s' % getendperiod(objects) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="241.0,241.0" style="Table3">
@@ -196,13 +209,10 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9">
-            <font face="Helvetica" size="6.0">[[ repeatIn(gettaxamount(objects).items(),'p') ]] </font>
-            <font face="Helvetica" size="8.0">[[ p[0] ]]</font>
-          </para>
+          <para style="P6">[[ repeatIn(gettaxamount(objects).items(),'p') ]] [[ p[0] ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ p[1] ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ p[1] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -219,32 +229,20 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9">
-            <font face="Helvetica" size="6.0">[[ repeatIn(getpayments(objects).items(),'t') ]]</font>
-            <font face="Helvetica" size="9.0">[[ t[0] ]]</font>
-          </para>
+          <para style="P6">[[ repeatIn(getpayments(objects).items(),'t') ]] <font face="Helvetica">[[ t[0] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % (t[1],) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="241.0,241.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Summary</para>
+          <para style="terp_tblheader_Details">Summary</para>
         </td>
         <td>
           <para style="P2">
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 7f2d97f1c18..9a9292b7869 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="SalesLines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="2.0" y1="57.0" width="537" height="728"/>
     </pageTemplate>
@@ -118,6 +118,9 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="179.0,179.0,179.0" style="Table3">
       <tr>
         <td>
@@ -177,16 +180,16 @@
       <blockTable colWidths="178.0,61.0,71.0,77.0,73.0,76.0" style="Tableau7">
         <tr>
           <td>
-            <para style="terp_default_9">[[l.product_id.code]] [[l.product_id.name]]</para>
+            <para style="terp_default_9">[ [[l.product_id.code]] ] [[l.product_id.name]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[taxes(l)]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]] </para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para>
@@ -276,10 +279,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Total</para>
+          <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 01fcdf355e1..be7b5c1bf72 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -110,6 +110,7 @@
   </stylesheet>
   <images/>
   <story>
+	  <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>  
   	<para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -169,32 +170,31 @@
      </tr>
     </blockTable>
     <section>
-	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
 	<section>
-      <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
+<!--      <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>-->
       <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+	          <para style="terp_default_8">[[ repeatIn(o.lines,'l') ]]</para>	      		          
+            <para style="terp_default_9">[ [[l.product_id.code]] ] [[ l.product_id.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal_incl)]] [[ company.currency_id.symbol ]]</para>
           </td>
-
         </tr>
       </blockTable>
        </section>
        </section>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Table1">
+      <blockTable colWidths="228.0,81.0,87.0,70.0,70.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -215,7 +215,7 @@
           <para style="terp_tblheader_Details">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total+o.amount_tax) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 35e605d0bff..c994e53d933 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 4779fad9e6b..815638d165b 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment By User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -61,6 +61,7 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -104,7 +105,13 @@
       <font color="white"> </font>
     </para>
     <para style="P2">Payment By User </para>
-    <para style="P2">
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="241.0,241.0" style="Table1">
@@ -195,7 +202,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index 5a98c092a3a..e61287ea8c5 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -168,9 +168,6 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
     </section>
     <para style="Standard">
       <font color="white"> </font>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 9f1bc6eb14b..103bd9f3b61 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -169,9 +169,6 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
     </section>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index c4d046ad9f8..14152609c42 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Todays Sales By Current User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -67,6 +67,7 @@
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -110,6 +111,12 @@
       <font color="white"> </font>
     </para>
     <para style="P3">Today's Sales By Current User</para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -194,7 +201,7 @@
           <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_qty(user))) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>

From 7375e8f1ce4de2949b317b442a49672c2afeddbb Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 8 Oct 2010 17:45:06 +0530
Subject: [PATCH 474/632] [IMP] membership: code cleaning

bzr revid: psi@tinyerp.co.in-20101008121506-ta7l3q9tnbixj3ch
---
 addons/membership/membership.py               | 100 ++++++++----------
 addons/membership/report/report_membership.py |  46 ++++----
 .../membership/wizard/membership_invoice.py   |   5 +-
 3 files changed, 70 insertions(+), 81 deletions(-)

diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index f6a4592cab2..8f68149f9e3 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -68,13 +68,13 @@ class membership_line(osv.osv):
 
         cr.execute('''
          SELECT MIN(ml.date_to - ai.date_invoice)
-         FROM membership_membership_line ml
-         JOIN account_invoice_line ail ON (
-            ml.account_invoice_line = ail.id
-            )
-        JOIN account_invoice ai ON (
+             FROM membership_membership_line ml
+             JOIN account_invoice_line ail ON (
+                ml.account_invoice_line = ail.id
+                )
+            JOIN account_invoice ai ON (
             ai.id = ail.invoice_id)
-        WHERE ml.id IN %s''',(tuple(ids),))
+            WHERE ml.id IN %s''',(tuple(ids),))
         res = cr.fetchall()
         for r in res:
             if r[0] and r[0] < 0:
@@ -92,6 +92,7 @@ class membership_line(osv.osv):
         @param return: Dictionary of state Value
         """
         res = {}
+        inv_obj = self.pool.get('account.invoice')
         for line in self.browse(cr, uid, ids, context=context):
             cr.execute('''
             SELECT i.state, i.id FROM
@@ -119,7 +120,7 @@ class membership_line(osv.osv):
                 state = 'invoiced'
             elif istate == 'paid':
                 state = 'paid'
-                inv = self.pool.get('account.invoice').browse(cr, uid, fetched[1], context=context)
+                inv = inv_obj.browse(cr, uid, fetched[1], context=context)
                 for payment in inv.payment_ids:
                     if payment.invoice and payment.invoice.type == 'out_refund':
                         state = 'canceled'
@@ -255,26 +256,20 @@ class Partner(osv.osv):
         return res
 
     def _membership_date(self, cr, uid, ids, name, args, context=None):
-
         """Return  date of membership"""
-
         name = name[0]
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
-
         for partner in self.browse(cr, uid, ids, context=context):
-
             if partner.associate_member:
                  partner_id = partner.associate_member.id
             else:
                  partner_id = partner.id
-
             res[partner.id] = {
                  'membership_start': False,
                  'membership_stop': False,
                  'membership_cancel': False
             }
-
             if name == 'membership_start':
                 line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id)],
                             limit=1, order='date_from', context=context)
@@ -288,19 +283,19 @@ class Partner(osv.osv):
                 if line_id1:
                       res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
                                 ['date_to'], context=context)['date_to']
+
             if name == 'membership_cancel':
                 if partner.membership_state == 'canceled':
                     line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
                     if line_id2:
                         res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
-
         return res
 
-    def _get_partners(self, cr, uid, ids, context={}):
+    def _get_partners(self, cr, uid, ids, context=None):
         ids2 = ids
         while ids2:
             ids2 = self.search(cr, uid, [('associate_member','in',ids2)], context=context)
-            ids+=ids2
+            ids += ids2
         return ids
 
     def __get_membership_state(self, *args, **kwargs):
@@ -312,48 +307,44 @@ class Partner(osv.osv):
         'free_member': fields.boolean('Free member'),
         'membership_amount': fields.float(
                     'Membership amount', digits=(16, 2),
-                    help='The price negociated by the partner'),
+                    help = 'The price negociated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state, method = True,
                     string = 'Current Membership State', type = 'selection',
-                    selection = STATE ,store = {
-                        'account.invoice':(_get_invoice_partner,['state'], 10),
-                        'membership.membership_line':(_get_partner_id,['state'], 10),
-                        'res.partner':(_get_partners, ['free_member', 'membership_state','associate_member'], 10)
-                        }
-                    ),
+                    selection = STATE,
+                    store = {
+                        'account.invoice': (_get_invoice_partner, ['state'], 10),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10),
+                        'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
+                    }),
         'membership_start': fields.function(
-                    _membership_date, method=True, multi='membeship_start',
+                    _membership_date, method = True, multi = 'membeship_start',
                     string = 'Start membership date', type = 'date',
                     store = {
-                        'account.invoice':(_get_invoice_partner,['state'], 10),
-                        'membership.membership_line':(_get_partner_id,['state'], 10, ),
-                        'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
-                        }
-                    ),
+                        'account.invoice': (_get_invoice_partner, ['state'], 10),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10, ),
+                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
+                    }),
         'membership_stop': fields.function(
                     _membership_date, method = True,
                     string = 'Stop membership date', type = 'date', multi='membership_stop',
                     store = {
-                        'account.invoice':(_get_invoice_partner,['state'], 10),
-                        'membership.membership_line':(_get_partner_id,['state'], 10),
-                        'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
-                        }
-                    ),
-
+                        'account.invoice': (_get_invoice_partner, ['state'], 10),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10),
+                        'res.partner': (lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
+                    }),
         'membership_cancel': fields.function(
                     _membership_date, method = True,
                     string = 'Cancel membership date', type='date', multi='membership_cancel',
                     store = {
-                        'account.invoice':(_get_invoice_partner,['state'], 11),
-                        'membership.membership_line':(_get_partner_id,['state'], 10),
-                        'res.partner':(lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
-                        }
-                    ),
+                        'account.invoice': (_get_invoice_partner, ['state'], 11),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10),
+                        'res.partner': (lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10)
+                    }),
     }
     _defaults = {
-        'free_member': lambda *a: False,
-        'membership_cancel' : lambda *d : False,
+        'free_member': False,
+        'membership_cancel' : False,
     }
 
     def _check_recursion(self, cr, uid, ids):
@@ -361,7 +352,7 @@ class Partner(osv.osv):
         """
         level = 100
         while len(ids):
-            cr.execute('select distinct associate_member from res_partner where id IN %s',(tuple(ids),))
+            cr.execute('SELECT DISTINCT associate_member FROM res_partner WHERE id IN %s', (tuple(ids),))
             ids = filter(None, map(lambda x:x[0], cr.fetchall()))
             if not level:
                 return False
@@ -387,7 +378,6 @@ class Partner(osv.osv):
                       datas = {'membership_product_id': None, 'amount':None}
         """
         invoice_obj = self.pool.get('account.invoice')
-        product_obj = self.pool.get('product.product')
         invoice_line_obj = self.pool.get('account.invoice.line')
         invoice_tax_obj = self.pool.get('account.invoice.tax')
         product_id = product_id or datas.get('membership_product_id',False)
@@ -409,7 +399,7 @@ class Partner(osv.osv):
                         _("Partner doesn't have an address to make the invoice."))
             quantity = 1
             line_value =  {
-                'product_id' : product_id,
+                'product_id': product_id,
             }
 
             line_dict = invoice_line_obj.product_id_change(cr, uid, {},
@@ -420,14 +410,14 @@ class Partner(osv.osv):
                 line_value['invoice_line_tax_id'] = tax_tab
 
             invoice_id = invoice_obj.create(cr, uid, {
-                'partner_id' : partner.id,
+                'partner_id': partner.id,
                 'address_invoice_id': addr.get('invoice', False),
                 'account_id': account_id,
                 'fiscal_position': fpos_id or False
                 }, context=context)
             line_value['invoice_id'] = invoice_id
             invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
-            invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
+            invoice_obj.write(cr, uid, invoice_id, {'invoice_line': [(6, 0, [invoice_line_id])]}, context=context)
             invoice_list.append(invoice_id)
             if line_value['invoice_line_tax_id']:
                 tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
@@ -450,12 +440,12 @@ class Product(osv.osv):
         model_obj = self.pool.get('ir.model.data')
 
         if ('product' in context) and (context['product']=='membership_product'):
-            model_data_ids_form = model_obj.search(cr,user,[('model','=','ir.ui.view'),('name','in',['membership_products_form','membership_products_tree'])], context=context)
-            resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id','name'], context=context)
-            dict_model={}
+            model_data_ids_form = model_obj.search(cr, user, [('model','=','ir.ui.view'), ('name','in',['membership_products_form', 'membership_products_tree'])], context=context)
+            resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id', 'name'], context=context)
+            dict_model = {}
             for i in resource_id_form:
-                dict_model[i['name']]=i['res_id']
-            if view_type=='form':
+                dict_model[i['name']] = i['res_id']
+            if view_type == 'form':
                 view_id = dict_model['membership_products_form']
             else:
                 view_id = dict_model['membership_products_tree']
@@ -470,14 +460,13 @@ class Product(osv.osv):
     }
 
     _defaults = {
-        'membership': lambda *args: False
+        'membership': False
     }
 Product()
 
 
 class Invoice(osv.osv):
     '''Invoice'''
-
     _inherit = 'account.invoice'
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -488,7 +477,7 @@ class Invoice(osv.osv):
             mlines = member_line_obj.search(cr, uid,
                     [('account_invoice_line','in',
                         [ l.id for l in invoice.invoice_line])])
-            member_line_obj.write(cr, uid, mlines, {'date_cancel':today})
+            member_line_obj.write(cr, uid, mlines, {'date_cancel': today})
         return super(Invoice, self).action_cancel(cr, uid, ids)
 Invoice()
 
@@ -543,7 +532,6 @@ class account_invoice_line(osv.osv):
         line = self.browse(cr, uid, result, context=context)
         member_line_obj = self.pool.get('membership.membership_line')
         if line.invoice_id.type == 'out_invoice':
-
             ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context)
             if line.product_id and line.product_id.membership and not ml_ids:
                 # Product line is a membership product
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index c4d31354840..b631ef64d9b 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,8 +50,8 @@ class report_membership(osv.osv):
                                   ('07', 'July'), ('08', 'August'),\
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        'date_from': fields.datetime('Start Date', readonly=True, help="Start membership date"),                          
-        'date_to': fields.datetime('End Date', readonly=True, help="End membership date"),                          
+        'date_from': fields.datetime('Start Date', readonly=True, help="Start membership date"),
+        'date_to': fields.datetime('End Date', readonly=True, help="End membership date"),
         'num_canceled': fields.integer('# Canceled', readonly=True),
         'num_old': fields.integer('# Old', readonly=True),
         'num_waiting': fields.integer('# Waiting', readonly=True),
@@ -59,7 +59,7 @@ class report_membership(osv.osv):
         'num_free': fields.integer('# Free', readonly=True),
         'num_paid': fields.integer('# Paid', readonly=True),
         'tot_pending': fields.float('Pending Amount', digits_compute= dp.get_precision('Account'), readonly=True),
-        'tot_earned': fields.float('Earned Amount', digits_compute= dp.get_precision('Account'), readonly=True),            
+        'tot_earned': fields.float('Earned Amount', digits_compute= dp.get_precision('Account'), readonly=True),
         'state':fields.selection(STATE, 'Membership State'),
         'partner_id': fields.many2one('res.partner', 'Members', readonly=True),
         'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True),
@@ -73,15 +73,15 @@ class report_membership(osv.osv):
         cr.execute("""
     CREATE OR REPLACE VIEW report_membership AS (
         SELECT
-        MIN(id) as id,
-        COUNT(num_canceled) as num_canceled,
-        COUNT(num_old) as num_old,
-        COUNT(num_waiting) as num_waiting,
-        COUNT(num_invoiced) as num_invoiced,
-        COUNT(num_free) as num_free,
-        COUNT(num_paid) as num_paid,
-        SUM(tot_pending) as tot_pending,
-        SUM(tot_earned) as tot_earned,
+        MIN(id) AS id,
+        COUNT(num_canceled) AS num_canceled,
+        COUNT(num_old) AS num_old,
+        COUNT(num_waiting) AS num_waiting,
+        COUNT(num_invoiced) AS num_invoiced,
+        COUNT(num_free) AS num_free,
+        COUNT(num_paid) AS num_paid,
+        SUM(tot_pending) AS tot_pending,
+        SUM(tot_earned) AS tot_earned,
         year,
         month,
         date_from,
@@ -91,7 +91,7 @@ class report_membership(osv.osv):
         company_id,
         user_id,
         state
-        FROM 
+        FROM
         (SELECT
             CASE WHEN ml.state = 'canceled' THEN ml.id END AS num_canceled,
             CASE WHEN ml.state = 'old'      THEN ml.id END AS num_old,
@@ -115,20 +115,20 @@ class report_membership(osv.osv):
             LEFT JOIN account_invoice_line il ON (ml.account_invoice_line = il.id)
             LEFT JOIN account_invoice ai ON (il.invoice_id = ai.id)
             LEFT JOIN res_partner p ON (ml.partner = p.id)
-            GROUP BY 
-                 TO_CHAR(ml.date_from, 'YYYY'),  
-                 TO_CHAR(ml.date_from, 'MM'), 
-                 TO_CHAR(ml.date_from, 'YYYY-MM-DD'), 
-                 TO_CHAR(ml.date_to, 'YYYY-MM-DD'), 
+            GROUP BY
+                 TO_CHAR(ml.date_from, 'YYYY'),
+                 TO_CHAR(ml.date_from, 'MM'),
+                 TO_CHAR(ml.date_from, 'YYYY-MM-DD'),
+                 TO_CHAR(ml.date_to, 'YYYY-MM-DD'),
                  ml.partner,
-                 ml.id, 
+                 ml.id,
                  p.user_id,
                  ml.company_id,
                  ml.state,
                  ml.membership_id) AS foo
         GROUP BY year, month, date_from, date_to, partner_id, user_id, membership_id, company_id, state)
                 """)
-        
+
 report_membership()
 
-#
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index 7536bd4b942..9b9fddc2313 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import fields, osv
@@ -27,12 +28,12 @@ import decimal_precision as dp
 
 class membership_invoice(osv.osv_memory):
     """Membership Invoice"""
-    
+
     _name = "membership.invoice"
     _description = "Membership Invoice"
     _columns = {
         'product_id': fields.many2one('product.product','Membership', required=True),
-        'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
     }
     def onchange_product(self, cr, uid, ids, product_id):
         """This function returns value of  product's member price based on product id.

From b845e6557e338138e8ff3b64d876b4b8107af5d8 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Fri, 8 Oct 2010 18:19:22 +0530
Subject: [PATCH 475/632] [REF] account

bzr revid: vth@tinyerp.com-20101008124922-h3rxefxmldl4300l
---
 addons/account/account.py                     | 72 +++++++++----------
 addons/account/account_bank_statement.py      |  2 +-
 addons/account/account_invoice_view.xml       |  1 -
 addons/account/installer.py                   | 22 +++---
 .../project/report/analytic_balance.py        | 16 ++---
 .../project/wizard/account_analytic_chart.py  |  4 +-
 .../account/report/account_balance_sheet.py   | 46 ++++++------
 .../account/report/account_partner_ledger.py  | 18 ++---
 addons/account/report/account_profit_loss.py  | 38 +++++-----
 addons/account/report/account_tax_report.py   | 44 ++++++------
 addons/account/wizard/account_move_journal.py | 36 +++++-----
 .../account_report_aged_partner_balance.py    |  4 +-
 12 files changed, 152 insertions(+), 151 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index a9a1a9bdf9e..9176a2eec64 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -343,7 +343,7 @@ class account_account(osv.osv):
         accounts = self.browse(cr, uid, ids)
         for account in accounts:
             level = 0
-            if account.parent_id :
+            if account.parent_id:
                 obj = self.browse(cr, uid, account.parent_id.id)
                 level = obj.level + 1
             res[account.id] = level
@@ -463,7 +463,7 @@ class account_account(osv.osv):
         return self.name_get(cr, user, ids, context=context)
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
         reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
         res = []
@@ -661,13 +661,13 @@ class account_journal(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         if not 'sequence_id' in vals or not vals['sequence_id']:
-            vals.update({'sequence_id' : self.create_sequence(cr, uid, vals, context)})
+            vals.update({'sequence_id': self.create_sequence(cr, uid, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
         """
         Returns a list of tupples containing id, name.
-        result format : {[(id, name), (id, name), ...]}
+        result format: {[(id, name), (id, name), ...]}
 
         @param cr: A database cursor
         @param user: ID of the user currently logged in
@@ -1014,7 +1014,7 @@ class account_move(osv.osv):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         """
         Returns a list of tupples containing id, name, as internally it is called {def name_get}
-        result format : {[(id, name), (id, name), ...]}
+        result format: {[(id, name), (id, name), ...]}
 
         @param cr: A database cursor
         @param user: ID of the user currently logged in
@@ -1046,7 +1046,7 @@ class account_move(osv.osv):
     def name_get(self, cursor, user, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if not len(ids):
+        if not ids:
             return []
         res = []
         data_move = self.pool.get('account.move').browse(cursor,user,ids)
@@ -1088,7 +1088,7 @@ class account_move(osv.osv):
                 if cond[1] in ['=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of']:
                     continue
 
-            cr.execute("select move_id from account_move_line group by move_id having sum(debit) %s %%s" % (cond[1]) ,(amount,))
+            cr.execute("select move_id from account_move_line group by move_id having sum(debit) %s %%s" % (cond[1]),(amount,))
             res_ids = set(id[0] for id in cr.fetchall())
             ids = ids and (ids & res_ids) or res_ids
         if ids:
@@ -1199,7 +1199,7 @@ class account_move(osv.osv):
         for line in self.browse(cr, uid, ids, context):
             if not line.journal_id.update_posted:
                 raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
-        if len(ids):
+        if ids:
             cr.execute('UPDATE account_move '\
                        'SET state=%s '\
                        'WHERE id IN %s', ('draft', tuple(ids),))
@@ -1387,7 +1387,7 @@ class account_move(osv.osv):
 
                 # Check whether the move lines are confirmed
 
-                if not len(line_draft_ids):
+                if not line_draft_ids:
                     continue
                 # Update the move lines (set them as valid)
 
@@ -1473,7 +1473,7 @@ class account_move_reconcile(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
         result = []
         for r in self.browse(cr, uid, ids, context):
@@ -1564,7 +1564,7 @@ class account_tax_code(osv.osv):
             period_id = context['period_id']
         else:
             period_id = self.pool.get('account.period').find(cr, uid)
-            if not len(period_id):
+            if not period_id:
                 return dict.fromkeys(ids, 0.0)
             period_id = period_id[0]
         return self._sum(cr, uid, ids, name, args, context,
@@ -1600,7 +1600,7 @@ class account_tax_code(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if not len(ids):
+        if not ids:
             return []
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -1691,7 +1691,7 @@ class account_tax(osv.osv):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         """
         Returns a list of tupples containing id, name, as internally it is called {def name_get}
-        result format : {[(id, name), (id, name), ...]}
+        result format: {[(id, name), (id, name), ...]}
 
         @param cr: A database cursor
         @param user: ID of the user currently logged in
@@ -1733,7 +1733,7 @@ class account_tax(osv.osv):
         return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
         res = []
         for record in self.read(cr, uid, ids, ['description','name'], context=context):
@@ -1748,8 +1748,8 @@ class account_tax(osv.osv):
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
-        'python_compute': '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
-        'python_compute_inv': '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
+        'python_compute': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
+        'python_compute_inv': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
         'applicable_type': 'true',
         'type': 'percent',
         'amount': 0,
@@ -1822,7 +1822,7 @@ class account_tax(osv.osv):
                 data['balance'] = cur_price_unit
 
             amount2 = data.get('amount', 0.0)
-            if len(tax.child_ids):
+            if tax.child_ids:
                 if tax.child_depend:
                     latest = res.pop()
                 amount = amount2
@@ -1963,7 +1963,7 @@ class account_tax(osv.osv):
                 'tax_code_id': tax.tax_code_id.id,
                 'ref_tax_code_id': tax.ref_tax_code_id.id,
             })
-            if len(tax.child_ids):
+            if tax.child_ids:
                 if tax.child_depend:
                     del res[-1]
                     amount = price_unit
@@ -2015,7 +2015,7 @@ class account_model(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'lines_id': fields.one2many('account.model.line', 'model_id', 'Model Entries'),
-        'legend' :fields.text('Legend', readonly=True, size=100),
+        'legend': fields.text('Legend', readonly=True, size=100),
     }
 
     _defaults = {
@@ -2159,7 +2159,7 @@ class account_subscription(osv.osv):
                     break
             if ok:
                 todone.append(sub.id)
-        if len(todone):
+        if todone:
             self.write(cr, uid, todone, {'state':'done'})
         return False
 
@@ -2169,7 +2169,7 @@ class account_subscription(osv.osv):
             for line in sub.lines_id:
                 if not line.move_id.id:
                     toremove.append(line.id)
-        if len(toremove):
+        if toremove:
             self.pool.get('account.subscription.line').unlink(cr, uid, toremove)
         self.write(cr, uid, ids, {'state':'draft'})
         return False
@@ -2263,7 +2263,7 @@ class account_account_template(osv.osv):
 
     _defaults = {
         'reconcile': False,
-        'type' : 'view',
+        'type': 'view',
         'nocreate': False,
     }
 
@@ -2274,7 +2274,7 @@ class account_account_template(osv.osv):
 
 
     def name_get(self, cr, uid, ids, context={}):
-        if not len(ids):
+        if not ids:
             return []
         reads = self.read(cr, uid, ids, ['name','code'], context)
         res = []
@@ -2362,7 +2362,7 @@ class account_tax_code_template(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -2394,7 +2394,7 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
-        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
     }
 
 account_chart_template()
@@ -2440,7 +2440,7 @@ class account_tax_template(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context={}):
-        if not len(ids):
+        if not ids:
             return []
         res = []
         for record in self.read(cr, uid, ids, ['description','name'], context):
@@ -2455,8 +2455,8 @@ class account_tax_template(osv.osv):
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
-        'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
-        'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',
+        'python_compute': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
+        'python_compute_inv': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
         'applicable_type': 'true',
         'type': 'percent',
         'amount': 0,
@@ -2822,24 +2822,24 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
 
                 vals_fp = {
-                    'company_id' : company_id,
-                    'name' : position.name,
+                    'company_id': company_id,
+                    'name': position.name,
                 }
                 new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
 
                 for tax in position.tax_ids:
                     vals_tax = {
-                        'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
-                        'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                        'position_id' : new_fp,
+                        'tax_src_id': tax_template_ref[tax.tax_src_id.id],
+                        'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                        'position_id': new_fp,
                     }
                     obj_tax_fp.create(cr, uid, vals_tax)
 
                 for acc in position.account_ids:
                     vals_acc = {
-                        'account_src_id' : acc_template_ref[acc.account_src_id.id],
-                        'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
-                        'position_id' : new_fp,
+                        'account_src_id': acc_template_ref[acc.account_src_id.id],
+                        'account_dest_id': acc_template_ref[acc.account_dest_id.id],
+                        'position_id': new_fp,
                     }
                     obj_ac_fp.create(cr, uid, vals_acc)
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index fcd4aa95c09..a7b6b66d2c1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -284,7 +284,7 @@ class account_bank_statement(osv.osv):
                         account=acc_cur)
             val['amount_currency'] = amount_cur
 
-        move_line_id = account_move_line_obj.create(cr, uid, val , context=context)
+        move_line_id = account_move_line_obj.create(cr, uid, val, context=context)
         torec.append(move_line_id)
 
         # Fill the secondary amount/currency
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 48624253bc6..3cf67c9eb91 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -519,7 +519,6 @@
             res_model="account.move.line"
             src_model="account.invoice"/>
 
-
         <act_window
             context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
             id="act_account_invoice_account_move_invoice_link"
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 680f8284295..cf0049efa54 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -124,6 +124,8 @@ class account_installer(osv.osv_memory):
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         obj_multi = self.pool.get('account.chart.template').browse(cr, uid, id)
 
+        record = self.browse(cr, uid, ids, context=context)[0]
+
         if context is None:
             context = {}
         company_id = self.browse(cr, uid, ids, context)[0].company_id
@@ -250,7 +252,7 @@ class account_installer(osv.osv_memory):
                 check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk')
                 check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'])[0]['res_id']
 
-                record = self.browse(cr, uid, ids, context=context)[0]
+#                record = self.browse(cr, uid, ids, context=context)[0]
                 code_cnt = 1
                 vals_seq = {
                         'name': _('Bank Journal '),
@@ -485,8 +487,8 @@ class account_installer(osv.osv_memory):
             for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
 
                 vals_fp = {
-                           'company_id' : company_id.id,
-                           'name' : position.name,
+                           'company_id': company_id.id,
+                           'name': position.name,
                            }
                 new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
 
@@ -495,17 +497,17 @@ class account_installer(osv.osv_memory):
 
                 for tax in position.tax_ids:
                     vals_tax = {
-                                'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
-                                'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                                'position_id' : new_fp,
+                                'tax_src_id': tax_template_ref[tax.tax_src_id.id],
+                                'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                                'position_id': new_fp,
                                 }
                     obj_tax_fp.create(cr, uid, vals_tax)
 
                 for acc in position.account_ids:
                     vals_acc = {
-                                'account_src_id' : acc_template_ref[acc.account_src_id.id],
-                                'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
-                                'position_id' : new_fp,
+                                'account_src_id': acc_template_ref[acc.account_src_id.id],
+                                'account_dest_id': acc_template_ref[acc.account_dest_id.id],
+                                'position_id': new_fp,
                                 }
                     obj_ac_fp.create(cr, uid, vals_acc)
 
@@ -646,7 +648,7 @@ class account_installer(osv.osv_memory):
                         obj_acc.write(cr, uid, default_account_ids, {'tax_ids':[(6,0,[purchase_tax])]})
                     tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
                     default_tax.append(('supplier_taxes_id',purchase_tax))
-                if len(tax_val):
+                if tax_val:
                     product_ids = obj_product.search(cr, uid, [])
                     for product in obj_product.browse(cr, uid, product_ids):
                         obj_product.write(cr, uid, product.id, tax_val)
diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py
index 8050b62753f..01cefdd03c8 100644
--- a/addons/account/project/report/analytic_balance.py
+++ b/addons/account/project/report/analytic_balance.py
@@ -100,14 +100,14 @@ class account_analytic_balance(report_sxw.rml_parse):
             ids = self.acc_data_dict[account_id]
 
         query_params = (tuple(ids), date1, date2)
-        if option == "credit" :
+        if option == "credit":
             self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
                     WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
-        elif option == "debit" :
+        elif option == "debit":
             self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
                     WHERE account_id IN %s\
                         AND date>=%s AND date<=%s AND amount>0",query_params)
-        elif option == "quantity" :
+        elif option == "quantity":
             self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
                 WHERE account_id IN %s\
                     AND date>=%s AND date<=%s",query_params)
@@ -120,7 +120,7 @@ class account_analytic_balance(report_sxw.rml_parse):
 
     def _sum_all(self, accounts, date1, date2, option):
         ids = map(lambda x: x['id'], accounts)
-        if not len(ids):
+        if not ids:
             return 0.0
 
         if not self.acc_sum_list:
@@ -129,15 +129,15 @@ class account_analytic_balance(report_sxw.rml_parse):
             self.acc_sum_list = ids2
         else:
             ids2 = self.acc_sum_list
-            
+
         query_params = (tuple(ids2), date1, date2)
-        if option == "debit" :
+        if option == "debit":
             self.cr.execute("SELECT COALESCE(sum(amount),0.0) FROM account_analytic_line \
                     WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0",query_params)
-        elif option == "credit" :
+        elif option == "credit":
             self.cr.execute("SELECT COALESCE(-sum(amount),0.0) FROM account_analytic_line \
                     WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0",query_params)
-        elif option == "quantity" :
+        elif option == "quantity":
             self.cr.execute("SELECT COALESCE(sum(unit_amount),0.0) FROM account_analytic_line \
                     WHERE account_id IN %s AND date>=%s AND date<=%s",query_params)
         return self.cr.fetchone()[0] or 0.0
diff --git a/addons/account/project/wizard/account_analytic_chart.py b/addons/account/project/wizard/account_analytic_chart.py
index 89155810fc0..22ec9d8a957 100644
--- a/addons/account/project/wizard/account_analytic_chart.py
+++ b/addons/account/project/wizard/account_analytic_chart.py
@@ -40,9 +40,9 @@ class account_analytic_chart(osv.osv_memory):
         result = act_obj.read(cr, uid, [id], context=context)[0]
         data = self.read(cr, uid, ids, [])[0]
         if data['from_date']:
-            result_context.update({'from_date' : data['from_date']})
+            result_context.update({'from_date': data['from_date']})
         if data['to_date']:
-            result_context.update({'to_date' : data['to_date']})
+            result_context.update({'to_date': data['to_date']})
         result['context'] = str(result_context)
         return result
 
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 876d23901f4..e04527f16a8 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -38,12 +38,12 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         self.result_temp = []
         self.localcontext.update({
             'time': time,
-            'get_lines' : self.get_lines,
-            'get_lines_another' : self.get_lines_another,
+            'get_lines': self.get_lines,
+            'get_lines_another': self.get_lines_another,
             'get_company': self._get_company,
             'get_currency': self._get_currency,
-            'sum_dr' : self.sum_dr,
-            'sum_cr' : self.sum_cr,
+            'sum_dr': self.sum_dr,
+            'sum_cr': self.sum_cr,
             'get_data':self.get_data,
             'get_pl_balance':self.get_pl_balance,
             'get_fiscalyear': self._get_fiscalyear,
@@ -92,7 +92,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         ctx = self.context.copy()
         ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
 
-        if data['form']['filter'] == 'filter_period' :
+        if data['form']['filter'] == 'filter_period':
             ctx['periods'] = data['form'].get('periods', False)
         elif data['form']['filter'] == 'filter_date':
             ctx['date_from'] = data['form'].get('date_from', False)
@@ -110,8 +110,8 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
         else:
             self.res_bl['type'] = 'Net Loss'
         pl_dict  = {
-            'code' : False,
-            'name' : self.res_bl['type'],
+            'code': False,
+            'name': self.res_bl['type'],
             'level': False,
             'balance':self.res_bl['balance'],
         }
@@ -120,9 +120,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
             for account in accounts:
                 if (account.user_type.report_type) and (account.user_type.report_type == typ):
                     account_dict = {
-                        'id'   : account.id,
-                        'code' : account.code,
-                        'name' : account.name,
+                        'id': account.id,
+                        'code': account.code,
+                        'name': account.name,
                         'level': account.level,
                         'balance':account.balance,
                     }
@@ -131,7 +131,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += account.balance
                     if data['form']['display_account'] == 'bal_movement':
-                        if account.credit > 0 or account.debit > 0 or account.balance > 0 :
+                        if account.credit > 0 or account.debit > 0 or account.balance > 0:
                             accounts_temp.append(account_dict)
                     elif data['form']['display_account'] == 'bal_solde':
                         if account.balance != 0:
@@ -150,12 +150,12 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
             for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
                 if i < len(cal_list['liability']) and i < len(cal_list['asset']):
                     temp={
-                          'code' : cal_list['liability'][i]['code'],
-                          'name' : cal_list['liability'][i]['name'],
+                          'code': cal_list['liability'][i]['code'],
+                          'name': cal_list['liability'][i]['name'],
                           'level': cal_list['liability'][i]['level'],
                           'balance':cal_list['liability'][i]['balance'],
-                          'code1' : cal_list['asset'][i]['code'],
-                          'name1' : cal_list['asset'][i]['name'],
+                          'code1': cal_list['asset'][i]['code'],
+                          'name1': cal_list['asset'][i]['name'],
                           'level1': cal_list['asset'][i]['level'],
                           'balance1':cal_list['asset'][i]['balance'],
                           }
@@ -163,24 +163,24 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
                 else:
                     if i < len(cal_list['asset']):
                         temp={
-                              'code' : '',
-                              'name' : '',
+                              'code': '',
+                              'name': '',
                               'level': False,
                               'balance':False,
-                              'code1' : cal_list['asset'][i]['code'],
-                              'name1' : cal_list['asset'][i]['name'],
+                              'code1': cal_list['asset'][i]['code'],
+                              'name1': cal_list['asset'][i]['name'],
                               'level1': cal_list['asset'][i]['level'],
                               'balance1':cal_list['asset'][i]['balance'],
                           }
                         self.result_temp.append(temp)
                     if  i < len(cal_list['liability']):
                         temp={
-                              'code' : cal_list['liability'][i]['code'],
-                              'name' : cal_list['liability'][i]['name'],
+                              'code': cal_list['liability'][i]['code'],
+                              'name': cal_list['liability'][i]['name'],
                               'level': cal_list['liability'][i]['level'],
                               'balance':cal_list['liability'][i]['balance'],
-                              'code1' : '',
-                              'name1' : '',
+                              'code1': '',
+                              'name1': '',
                               'level1': False,
                               'balance1':False,
                           }
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 5df50566b0d..0038eb1278f 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -38,7 +38,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 #            'sum_debit': self._sum_debit,
 #            'sum_credit': self._sum_credit,
             'get_currency': self._get_currency,
-            'comma_me' : self.comma_me,
+            'comma_me': self.comma_me,
             'get_start_period': self.get_start_period,
             'get_end_period': self.get_end_period,
             'get_account': self._get_account,
@@ -103,7 +103,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "AND " + self.query +" " \
                     "AND l.account_id IN %s " \
                     " " + PARTNER_REQUEST + " " \
-                    "AND account.active " ,
+                    "AND account.active ",
                 (tuple(move_state), tuple(self.account_ids),))
 
         res = self.cr.dictfetchall()
@@ -115,9 +115,9 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
         return super(third_party_ledger, self).set_context(objects, data, new_ids, report_type)
 
     def comma_me(self, amount):
-        if type(amount) is float :
+        if type(amount) is float:
             amount = str('%.2f'%amount)
-        else :
+        else:
             amount = str(amount)
         if (amount == '0'):
              return ' '
@@ -186,7 +186,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 
         result_tmp = 0.0
         result_init = 0.0
-        if self.reconcil :
+        if self.reconcil:
             RECONCILE_TAG = " "
         else:
             RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -217,7 +217,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "AND m.state IN %s "
                     "AND account_id IN %s" \
                     " " + RECONCILE_TAG + " " \
-                    "AND " + self.query + " " ,
+                    "AND " + self.query + " ",
                 (partner.id, tuple(move_state), tuple(self.account_ids),))
 
         contemp = self.cr.fetchone()
@@ -235,7 +235,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
 
         result_tmp = 0.0
         result_init = 0.0
-        if self.reconcil :
+        if self.reconcil:
             RECONCILE_TAG = " "
         else:
             RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -266,7 +266,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
                     "AND m.state IN %s "
                     "AND account_id IN %s" \
                     " " + RECONCILE_TAG + " " \
-                    "AND " + self.query + " " ,
+                    "AND " + self.query + " ",
                 (partner.id, tuple(move_state), tuple(self.account_ids),))
 
         contemp = self.cr.fetchone()
@@ -401,7 +401,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
          return False
 
     def _display_currency(self, data):
-         if self.amount_currency :
+         if self.amount_currency:
              return True
          return False
 
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 84a7a4f8dbf..792b88053a1 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -36,13 +36,13 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
         self.result_temp = []
         self.localcontext.update( {
             'time': time,
-            'get_lines' : self.get_lines,
-            'get_lines_another' : self.get_lines_another,
+            'get_lines': self.get_lines,
+            'get_lines_another': self.get_lines_another,
             'get_currency': self._get_currency,
             'get_data': self.get_data,
-            'sum_dr' : self.sum_dr,
-            'sum_cr' : self.sum_cr,
-            'final_result' : self.final_result,
+            'sum_dr': self.sum_dr,
+            'sum_cr': self.sum_cr,
+            'final_result': self.final_result,
             'get_fiscalyear': self._get_fiscalyear,
             'get_account': self._get_account,
             'get_start_period': self.get_start_period,
@@ -86,7 +86,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
         ctx = self.context.copy()
         ctx['fiscalyear'] = data['form'].get('fiscalyear_id', False)
 
-        if data['form']['filter'] == 'filter_period' :
+        if data['form']['filter'] == 'filter_period':
             ctx['periods'] =  data['form'].get('periods', False)
         elif data['form']['filter'] == 'filter_date':
             ctx['date_from'] = data['form'].get('date_from', False)
@@ -106,7 +106,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
                     if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += abs(account.debit - account.credit)
                     if data['form']['display_account'] == 'bal_movement':
-                        if account.credit > 0 or account.debit > 0 or account.balance > 0 :
+                        if account.credit > 0 or account.debit > 0 or account.balance > 0:
                             accounts_temp.append(account)
                     elif data['form']['display_account'] == 'bal_solde':
                         if  account.balance != 0:
@@ -126,12 +126,12 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
             for i in range(0,max(len(cal_list['expense']),len(cal_list['income']))):
                 if i < len(cal_list['expense']) and i < len(cal_list['income']):
                     temp={
-                          'code' : cal_list['expense'][i].code,
-                          'name' : cal_list['expense'][i].name,
+                          'code': cal_list['expense'][i].code,
+                          'name': cal_list['expense'][i].name,
                           'level': cal_list['expense'][i].level,
                           'balance':cal_list['expense'][i].balance,
-                          'code1' : cal_list['income'][i].code,
-                          'name1' : cal_list['income'][i].name,
+                          'code1': cal_list['income'][i].code,
+                          'name1': cal_list['income'][i].name,
                           'level1': cal_list['income'][i].level,
                           'balance1':cal_list['income'][i].balance,
                           }
@@ -139,24 +139,24 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
                 else:
                     if i < len(cal_list['income']):
                         temp={
-                              'code' : '',
-                              'name' : '',
+                              'code': '',
+                              'name': '',
                               'level': False,
                               'balance':False,
-                              'code1' : cal_list['income'][i].code,
-                              'name1' : cal_list['income'][i].name,
+                              'code1': cal_list['income'][i].code,
+                              'name1': cal_list['income'][i].name,
                               'level1': cal_list['income'][i].level,
                               'balance1':cal_list['income'][i].balance,
                               }
                         self.result_temp.append(temp)
                     if  i < len(cal_list['expense']):
                         temp={
-                              'code' : cal_list['expense'][i].code,
-                              'name' : cal_list['expense'][i].name,
+                              'code': cal_list['expense'][i].code,
+                              'name': cal_list['expense'][i].name,
                               'level': cal_list['expense'][i].level,
                               'balance':cal_list['expense'][i].balance,
-                              'code1' : '',
-                              'name1' : '',
+                              'code1': '',
+                              'name1': '',
                               'level1': False,
                               'balance1':False,
                               }
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index ff90235c5c6..d9bcabf0ce4 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -36,7 +36,7 @@ class tax_report(rml_parse.rml_parse):
 			'get_general': self._get_general,
 			'get_company': self._get_company,
 			'get_currency': self._get_currency,
-			'get_lines' : self._get_lines,
+			'get_lines': self._get_lines,
 		})
 
 
@@ -45,12 +45,12 @@ class tax_report(rml_parse.rml_parse):
 
 		if period_list:
 			res = self._add_codes(based_on, res, period_list, context=context)
-		else :
+		else:
 			self.cr.execute ("select id from account_fiscalyear")
 			fy = self.cr.fetchall()
 			self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
 			periods = self.cr.fetchall()
-			for p in periods :
+			for p in periods:
 				period_list.append(p[0])
 			res = self._add_codes(based_on, res, period_list, context=context)
 
@@ -58,20 +58,20 @@ class tax_report(rml_parse.rml_parse):
 		top_result = []
 		while i < len(res):
 
-			res_dict = { 'code' : res[i][1].code,
-				'name' : res[i][1].name,
-				'debit' : 0,
-				'credit' : 0,
-				'tax_amount' : res[i][1].sum_period,
-				'type' : 1,
-				'level' : res[i][0],
-				'pos' : 0
+			res_dict = { 'code': res[i][1].code,
+				'name': res[i][1].name,
+				'debit': 0,
+				'credit': 0,
+				'tax_amount': res[i][1].sum_period,
+				'type': 1,
+				'level': res[i][0],
+				'pos': 0
 			}
 
 			top_result.append(res_dict)
 			res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
 			ind_general = 0
-			while ind_general < len(res_general) :
+			while ind_general < len(res_general):
 				res_general[ind_general]['type'] = 2
 				res_general[ind_general]['pos'] = 0
 				res_general[ind_general]['level'] = res_dict['level']
@@ -84,7 +84,7 @@ class tax_report(rml_parse.rml_parse):
 	def _get_period(self, period_id, context={}):
 		return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
 
-	def _get_general(self, tax_code_id, period_list ,company_id, based_on, context={}):
+	def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
 		res=[]
 		obj_account = self.pool.get('account.account')
 		periods_ids = tuple(period_list)
@@ -112,7 +112,7 @@ class tax_report(rml_parse.rml_parse):
 					GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
 						company_id, periods_ids, 'paid',))
 
-		else :
+		else:
 			self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
 						SUM(line.debit) AS debit, \
 						SUM(line.credit) AS credit, \
@@ -191,14 +191,14 @@ class tax_report(rml_parse.rml_parse):
 
 				while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
 					tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
-					res_tot = { 'code' : accounts[bcl_rup_ind]['code'],
-						'name' : '',
-						'debit' : 0,
-						'credit' : 0,
-						'tax_amount' : accounts[bcl_rup_ind]['tax_amount'],
-						'type' : accounts[bcl_rup_ind]['type'],
-						'level' : 0,
-						'pos' : 0
+					res_tot = { 'code': accounts[bcl_rup_ind]['code'],
+						'name': '',
+						'debit': 0,
+						'credit': 0,
+						'tax_amount': accounts[bcl_rup_ind]['tax_amount'],
+						'type': accounts[bcl_rup_ind]['type'],
+						'level': 0,
+						'pos': 0
 					}
 
 					if res_tot['type'] == 1:
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 8422ece3fcb..c03176a0536 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -43,7 +43,7 @@ class account_move_journal(osv.osv_memory):
         """
 
         journal_id = False
-        
+
         journal_pool = self.pool.get('account.journal')
         if context.get('journal_type', False):
             jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
@@ -52,7 +52,7 @@ class account_move_journal(osv.osv_memory):
             journal_id = jids[0]
 
         return journal_id
-        
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
         Returns views and fields for current model where view will depend on {view_type}.
@@ -62,7 +62,7 @@ class account_move_journal(osv.osv_memory):
         @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
         @param context: context arguments, like lang, time zone
         @param toolbar: contains a list of reports, wizards, and links related to current model
-        
+
         @return: Returns a dict that contains definition for fields, views, and toolbars
         """
 
@@ -115,47 +115,47 @@ class account_move_journal(osv.osv_memory):
         @param ids: account move journal’s ID or list of IDs
         @return: dictionary of Open action move line window on given period and  Journal/Payment Mode
         """
-        
+
         period_pool = self.pool.get('account.journal.period')
         data_pool = self.pool.get('ir.model.data')
         journal_pool = self.pool.get('account.journal')
-        
+
         if context is None:
             context = {}
-        
+
         journal_id = self._get_journal(cr, uid, context)
         period_id = self._get_period(cr, uid, context)
 
         name = _("Journal Items")
         if journal_id:
             ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
-            
-            if not len(ids):
+
+            if not ids:
                 journal = journal_pool.browse(cr, uid, journal_id)
                 period = self.pool.get('account.period').browse(cr, uid, period_id)
-                
+
                 name = journal.name
                 state = period.state
-                
+
                 if state == 'done':
                     raise osv.except_osv(_('UserError'), _('This period is already closed !'))
-                
+
                 company = period.company_id.id
                 res = {
-                    'name': name, 
-                    'period_id': period_id, 
-                    'journal_id': journal_id, 
+                    'name': name,
+                    'period_id': period_id,
+                    'journal_id': journal_id,
                     'company_id': company
                 }
                 period_pool.create(cr, uid, res,context=context)
-            
+
             ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)],context=context)
             period = period_pool.browse(cr, uid, ids[0], context=context)
             name = (period.journal_id.code or '') + ':' + (period.period_id.code or '')
-        
+
         result = data_pool._get_id(cr, uid, 'account', 'view_account_move_line_filter')
         res_id = data_pool.browse(cr, uid, result, context=context).res_id
-        
+
         return {
             'name': name,
             'view_type': 'form',
@@ -166,7 +166,7 @@ class account_move_journal(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'search_view_id': res_id
         }
-        
+
 account_move_journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index f421f3735fa..f13214cb6da 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -40,7 +40,7 @@ class account_aged_trial_balance(osv.osv_memory):
     }
     _defaults = {
         'period_length': 30,
-        'date_from' : time.strftime('%Y-%m-%d'),
+        'date_from': time.strftime('%Y-%m-%d'),
         'direction_selection': 'past',
     }
 
@@ -84,7 +84,7 @@ class account_aged_trial_balance(osv.osv_memory):
             for i in range(5):
                 stop = start + relativedelta(days=period_length)
                 res[str(5-(i+1))] = {
-                    'name' : (i!=4 and str((i) * period_length)+'-' + str((i+1) * period_length) or ('+'+str(4 * period_length))),
+                    'name': (i!=4 and str((i) * period_length)+'-' + str((i+1) * period_length) or ('+'+str(4 * period_length))),
                     'start': start.strftime('%Y-%m-%d'),
                     'stop': (i!=4 and stop.strftime('%Y-%m-%d') or False),
                 }

From 9138707ef78a23ee0ddd78f9387db7bf8ab898d8 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 18:18:15 +0530
Subject: [PATCH 476/632] [MOD] hr_payroll : Improvements in access rights

bzr revid: vir@tinyerp.com-20101008124815-k6ti98b1a12pb74n
---
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_payroll/hr_payroll_data.xml         |  2 +-
 addons/hr_payroll/hr_payroll_view.xml         |  6 +--
 addons/hr_payroll/security/hr_security.xml    |  6 +--
 .../hr_payroll/security/ir.model.access.csv   | 54 ++++++-------------
 5 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 44f01057085..fc327c6580d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_system" sequence="50"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
         <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
 
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index 4198696a5c8..bc9ff965f45 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -18,7 +18,7 @@
         <record id="MA" model="hr.allounce.deduction.categoty">
             <field name="code">MA</field>
             <field name="type">allowance</field>
-            <field name="name">Meducal Allowance</field>
+            <field name="name">Medical Allowance</field>
             <field name="sequence" eval="15"/>
         </record>
 
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a25c2fdebf6..542b1131d16 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
         <!-- Root Menus -->
-        <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" groups="base.group_system,group_hr_payroll" sequence="9"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_system"/>
+        <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="9"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
         <!-- Passport Views    -->
@@ -274,7 +274,7 @@
                 </form>
             </field>
         </record>
-        <menuitem action="hr_contract.action_hr_contract" id="hr_menu_contract" parent="payroll_configure" name="Contracts" sequence="4"/>
+        <!--menuitem action="hr_contract.action_hr_contract" id="hr_menu_contract" parent="payroll_configure" name="Contracts" sequence="4"/-->
         <!-- End Contract View-->
 
         <!-- Salary structure -->
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index 23e57fecba8..339fb1961b9 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -2,9 +2,9 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_hr_payroll" model="res.groups">
-        <field name="name">Human Resources / Payroll</field>
-    </record>
+<!--    <record id="group_hr_payroll" model="res.groups">-->
+<!--        <field name="name">Human Resources / Payroll</field>-->
+<!--    </record>-->
 
 </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 073cd6954c8..bafa1564e23 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,44 +1,20 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category_payroll","hr.payroll.employee.category","hr.model_hr_employee_category","group_hr_payroll",1,0,0,0
-"access_hr_employee_payroll","hr.payroll.employee","hr.model_hr_employee","group_hr_payroll",1,0,0,0
-"aceess_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","group_hr_payroll",1,1,1,1
-"access_hr_passport","hr.passport","model_hr_passport","group_hr_payroll",1,1,1,1
-"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","group_hr_payroll",1,1,1,1
-"access_hr_contract","hr.contract","model_hr_contract","group_hr_payroll",1,0,0,0
-"access_hr_payroll_register","hr.payroll.register","model_hr_payroll_register","group_hr_payroll",1,1,1,1
-"access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","group_hr_payroll",1,1,1,1
-"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","group_hr_payroll",1,1,1,1
-"access_hr_contibution_register","hr.contibution.register","model_hr_contibution_register","group_hr_payroll",1,1,1,1
-"access_hr_contibution_register_line","hr.contibution.register.line","model_hr_contibution_register_line","group_hr_payroll",1,1,1,1
-"access_hr_allounce_deduction_category","hr.allounce.deduction.category","model_hr_allounce_deduction_categoty","group_hr_payroll",1,1,1,1
-"access_company_contribution","company.contribution","model_company_contribution","group_hr_payroll",1,1,1,1
-"access_company_contribution_line","company.contribution.line","model_company_contribution_line","group_hr_payroll",1,1,1,1
-"access_hr_holidays_status","hr.holidays.status","hr_holidays.model_hr_holidays_status","group_hr_payroll",1,0,0,0
-"access_hr_payslip","hr.payslip","model_hr_payslip","group_hr_payroll",1,1,1,1
-"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","group_hr_payroll",1,1,1,1
-"access_hr_payslip_line_line","hr.payslip.line.line","model_hr_payslip_line_line","group_hr_payroll",1,1,1,1
-"access_hr_payslip_contract","hr.payslip.contract","model_hr_payslip","base.group_hr_contract",1,0,0,0
-"access_hr_payroll_structure_system","hr.payroll.structure.system","model_hr_payroll_structure","base.group_system",1,1,1,1
-"access_company_contribution","company.contribution","model_company_contribution","base.group_system",1,1,1,1
-"access_hr_passport_sys","hr.passport","model_hr_passport","base.group_system",1,1,1,1
-"access_res_partner_payroll","res.partner.payroll","base.model_res_partner","group_hr_payroll",1,1,1,1
-"access_hr_contibution_register_system","hr.contibution.register.system","model_hr_contibution_register","base.group_system",1,1,1,1
-"access_hr_contibution_register_line_system","hr.contibution.register.line.system","model_hr_contibution_register_line","base.group_system",1,1,1,1
-"access_hr_allounce_deduction_category_system","hr.allounce.deduction.category.system","model_hr_allounce_deduction_categoty","base.group_system",1,1,1,1
+"access_hr_passport","hr.passport","model_hr_passport","base.group_hr_user",1,1,1,1
+"access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_hr_user",1,1,1,1
+"access_hr_payroll_register","hr.payroll.register","model_hr_payroll_register","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
+"access_hr_contibution_register","hr.contibution.register","model_hr_contibution_register","base.group_hr_user",1,1,1,1
+"access_hr_contibution_register_line","hr.contibution.register.line","model_hr_contibution_register_line","base.group_hr_user",1,1,1,1
+"access_hr_allounce_deduction_category","hr.allounce.deduction.category","model_hr_allounce_deduction_categoty","base.group_hr_user",1,1,1,1
+"access_company_contribution","company.contribution","model_company_contribution","base.group_hr_user",1,1,1,1
+"access_company_contribution_line","company.contribution.line","model_company_contribution_line","base.group_hr_user",1,1,1,1
+"access_hr_payslip","hr.payslip","model_hr_payslip","base.group_hr_user",1,1,1,1
+"access_hr_payslip_line","hr.payslip.line","model_hr_payslip_line","base.group_hr_user",1,1,1,1
+"access_hr_payslip_line_line","hr.payslip.line.line","model_hr_payslip_line_line","base.group_hr_user",1,1,1,1
+"access_res_partner_payroll","res.partner.payroll","base.model_res_partner","base.group_hr_user",1,1,1,1
 "access_hr_payslip_manager","hr.payslip.manager","model_hr_payslip","base.group_hr_manager",1,1,1,1
 "access_hr_payslip_line_manager","hr.payslip.line.manager","model_hr_payslip_line","base.group_hr_manager",1,1,1,1
 "access_hr_payroll_structure_manager","hr.payroll.structure.manager","model_hr_payroll_structure","base.group_hr_manager",1,1,1,1
-"access_hr_allounce_deduction_category_manager","hr.allounce.deduction.category.manager","model_hr_allounce_deduction_categoty","base.group_hr_manager",1,1,1,1
 "access_hr_passport_manager","hr.passport.manager","model_hr_passport","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_employee","hr.payslip.employee","model_hr_payslip","base.group_user",1,0,0,0
-"access_hr_payroll_register_system","hr.payroll.register.system","model_hr_payroll_register","base.group_system",1,0,0,0
-"access_hr_payroll_advice_system","hr.payroll.advice.system","model_hr_payroll_advice","base.group_system",1,0,0,0
-"access_hr_payslip_line_system","hr.payslip.line.system","model_hr_payslip_line","base.group_system",1,1,1,1
-"access_hr_payroll_structure_contract","hr.payroll.structure.contract","model_hr_payroll_structure","base.group_hr_contract",1,1,1,1
-"access_hr_payslip_line_user","hr.payslip.line.user","model_hr_payslip_line","base.group_hr_user",1,1,1,0
-"access_hr_allounce_deduction_category_hr_user","hr.allounce.deduction.category.hr.user","model_hr_allounce_deduction_categoty","base.group_hr_user",1,1,1,0
-"access_hr_payroll_structure_hr_user","hr.payroll.structure.hr.user","model_hr_payroll_structure","base.group_hr_user",1,1,1,0
-"access_hr_payslip_line_line_hr_user","hr.payslip.line.line.hr.user","model_hr_payslip_line_line","base.group_hr_user",1,1,1,0
-"access_hr_payslip_line_line_hr_manager","hr.payslip.line.line.hr.manager","model_hr_payslip_line_line","base.group_hr_manager",1,1,1,1
-"access_hr_payslip_line_line_system","hr.payslip.line.line.system","model_hr_payslip_line_line","base.group_system",1,0,0,0
-"access_hr_payroll_advice_line_system","hr.payroll.advice.line.system","model_hr_payroll_advice_line","base.group_system",1,0,0,0
+"access_hr_contract_wage_type","hr.contract.wage.type user","hr_contract.model_hr_contract_wage_type","base.group_hr_user",1,1,1,1

From f0c306b2b8294c25e4d1785d693f058553c77750 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 8 Oct 2010 18:29:00 +0530
Subject: [PATCH 477/632] [MOD/IMP] hr_timesheet : Usability Improvements in
 Timesheet Sheet yml Report

bzr revid: dbr@tinyerp.com-20101008125900-lpjetu39xmpbynpu
---
 addons/hr_timesheet/test/hr_timesheet_report.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 2f19f75618f..b1cd445a35d 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -5,7 +5,7 @@
     import netsvc, tools, os, time
     month = time.gmtime()[1]
     year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : uid }}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_id' : ref('hr.employee1') }}
     (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
@@ -17,7 +17,7 @@
     import netsvc, tools, os, time
     month = time.gmtime()[1]
     year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [uid] }}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_ids' : [ref('hr.employee1')] }}
     (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)

From 30efb09f7a2e7e4695a1ccc25962c75315bcd7b2 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 8 Oct 2010 18:48:45 +0530
Subject: [PATCH 478/632] [IMP]: improve the usability

bzr revid: mga@tinyerp.com-20101008131845-alqqlb6d97y3s3d5
---
 addons/hr_payroll/hr_payroll.py       | 13 ++++++++++++-
 addons/hr_payroll/hr_payroll_view.xml | 13 +++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 058d5a092ff..70192dba702 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1110,7 +1110,7 @@ class hr_payslip(osv.osv):
                 func = func_pool.read(cr, uid, function, ['line_ids'], context=context)
                 lines = slip_line_pool.browse(cr, uid, func['line_ids'], context=context)
 
-            lines += slip.employee_id.line_ids
+            #lines += slip.employee_id.line_ids
 
             ad = []
             lns = {}
@@ -1224,6 +1224,17 @@ class hr_payslip(osv.osv):
                 'contract_id':contract.id,
                 'company_id':slip.employee_id.company_id.id
             })
+            
+            for line in slip.employee_id.line_ids:
+                vals = {
+                    'amount':line.amount,
+                    'slip_id':slip.id,
+                    'employee_id':False,
+                    'function_id':False,
+                    'base':base
+                }
+                slip_line_pool.copy(cr, uid, line.id, vals, {})
+            
             self.write(cr, uid, [slip.id], update, context=context)
 
         for slip in self.browse(cr, uid, ids, context=context):
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 542b1131d16..cf45b77fbe6 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -87,7 +87,6 @@
         <!-- End Passport Views -->
 
         <!-- Employee View -->
-        
         <record id="view_employee_bank_form" model="ir.ui.view">
             <field name="name">res.partner.bank.form</field>
             <field name="model">res.partner.bank</field>
@@ -157,7 +156,6 @@
                                             <field name="advantages_gross"/>
                                             <field name="advantages" nolabel="1" colspan="2"/>
                                         </group>
-                                        
                                     </page>
                                     <page string="Work Permit">
                                         <group col="2" colspan="2">
@@ -192,7 +190,7 @@
                         <field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
                             <tree string="Salary Structure" editable="bottom">
                                 <field name="category_id" on_change="onchange_category(category_id)"/>
-                                <field name="sequence"/>
+                                <field name="sequence" groups="base.group_extended"/>
                                 <field name="name"/>
                                 <field name="code"/>
                                 <field name="type"/>
@@ -205,7 +203,6 @@
             </data>
             </field>
         </record>
-
         <record id="view_employee_passport_form" model="ir.ui.view">
             <field name="name">hr.employee.passport.form</field>
             <field name="model">hr.employee</field>
@@ -357,7 +354,7 @@
             <field name="arch" type="xml">
                 <tree string="Salary Structure" editable="bottom">
                     <field name="category_id" on_change="onchange_category(category_id)"/>
-                    <field name="sequence"/>
+                    <field name="sequence" groups="base.group_extended"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="type"/>
@@ -385,7 +382,7 @@
                         <field name="type"/>
                         <field name="amount_type"/>
                         <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
-                        <field name="sequence"/>
+                        <field name="sequence" groups="base.group_extended"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Company contribution"/>
@@ -396,7 +393,7 @@
                             <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
                                 <tree string="Function Arguments" editable="bottom">
                                     <field name="name"/>
-                                    <field name="sequence"/>
+                                    <field name="sequence" groups="base.group_extended"/>
                                     <field name="from_val"/>
                                     <field name="to_val"/>
                                     <field name="amount_type"/>
@@ -449,7 +446,7 @@
                             <field name="line_ids" colspan="4" nolabel="1">
                                 <tree string="Salary Structure" editable="bottom">
                                     <field name="category_id" on_change="onchange_category(category_id)"/>
-                                    <field name="sequence"/>
+                                    <field name="sequence" groups="base.group_extended"/>
                                     <field name="name"/>
                                     <field name="code"/>
                                     <field name="type"/>

From 795e755b42a8786e5bbe5f318b05d9943cd98a4c Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Fri, 8 Oct 2010 18:50:28 +0530
Subject: [PATCH 479/632] [FIX] : base : import module as zip file

bzr revid: jas@tinyerp.com-20101008132028-qzrac0xv1nu7z4ow
---
 bin/addons/__init__.py           | 18 ++++++++++++++----
 bin/addons/base/module/module.py |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 08cc60c19bd..7db007b732f 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -270,7 +270,17 @@ def get_module_resource(module, *args):
     @return: absolute path to the resource
     """
     a = get_module_path(module)
-    return a and opj(a, *args) or False
+    if zipfile.is_zipfile( a +'.zip') :
+        zip = zipfile.ZipFile( a + ".zip")
+        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
+    else:
+        files = tools.osutil.listdir(a, True)
+    for ar in args:
+        if ar not in files:
+            return False
+    res = a and opj(a, *args) or False
+    return res
+
 
 
 def get_modules():
@@ -297,9 +307,10 @@ def load_information_from_description_file(module):
     """
     :param module: The name of the module (sale, purchase, ...)
     """
+
     for filename in ['__openerp__.py', '__terp__.py']:
         description_file = get_module_resource(module, filename)
-        if os.path.isfile(description_file):
+        if description_file :
             return eval(tools.file_open(description_file).read())
 
     #TODO: refactor the logger in this file to follow the logging guidelines
@@ -332,9 +343,8 @@ def upgrade_graph(graph, cr, module_list, force=None):
     for module in module_list:
         mod_path = get_module_path(module)
         terp_file = get_module_resource(module, '__openerp__.py')
-        if not terp_file or not os.path.isfile(terp_file):
+        if not terp_file:
             terp_file = get_module_resource(module, '__terp__.py')
-
         if not mod_path or not terp_file:
             logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: not found, skipped' % (module))
             continue
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index b446f39f5b5..74cd018399c 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -247,7 +247,7 @@ class module(osv.osv):
                 else:
                     od = self.browse(cr, uid, ids2)[0]
                     mdemo = od.demo or mdemo
-            
+
             terp = self.get_module_info(module.name)
             try:
                 self._check_external_dependencies(terp)

From a141d983d974a57cec799f172fd11badd791dbda Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 8 Oct 2010 18:52:47 +0530
Subject: [PATCH 480/632] [MOD] hr_* : applied changes from usability branch

bzr revid: vir@tinyerp.com-20101008132247-3m1ff2ngm3im61pn
---
 addons/hr/hr.py                               | 36 +++++++++++++++----
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         | 21 +++++------
 addons/hr/security/ir.model.access.csv        | 19 +++-------
 addons/hr_attendance/hr_attendance.py         |  2 +-
 addons/hr_attendance/hr_attendance_demo.xml   |  4 +--
 addons/hr_attendance/hr_attendance_view.xml   | 10 +++---
 addons/hr_attendance/security/hr_security.xml |  4 ---
 .../security/ir.model.access.csv              | 15 ++------
 .../wizard/hr_attendance_sign_in_out_view.xml |  2 +-
 addons/hr_contract/hr_contract_view.xml       | 20 ++++++-----
 .../security/hr_contract_security.xml         |  4 ---
 .../hr_contract/security/ir.model.access.csv  | 23 +++---------
 addons/hr_evaluation/hr_evaluation.py         | 12 +++----
 addons/hr_evaluation/hr_evaluation_demo.xml   |  4 +--
 addons/hr_evaluation/hr_evaluation_view.xml   |  5 +--
 .../report/hr_evaluation_report_view.xml      | 10 +++---
 .../security/ir.model.access.csv              | 17 ++-------
 .../board_hr_expense_manager_view.xml         |  6 ++--
 addons/hr_expense/hr_expense.py               |  7 ++++
 addons/hr_expense/hr_expense_demo.xml         |  4 +--
 addons/hr_expense/hr_expense_view.xml         | 12 ++++---
 .../report/hr_expense_report_view.xml         | 12 +++----
 .../hr_expense/security/ir.model.access.csv   | 32 ++++++++---------
 addons/hr_holidays/board_hr_holidays_view.xml |  2 +-
 addons/hr_holidays/hr_holidays.py             |  2 +-
 addons/hr_holidays/hr_holidays_demo.xml       |  4 +--
 addons/hr_holidays/hr_holidays_view.xml       |  9 ++---
 .../hr_holidays/report/available_holidays.py  |  6 ++++
 .../report/available_holidays_view.xml        | 26 ++++++++------
 .../report/holidays_summary_report.py         |  1 -
 .../hr_holidays/report/hr_holidays_report.py  |  6 ++--
 .../report/hr_holidays_report_view.xml        | 14 ++++----
 .../hr_holidays/security/ir.model.access.csv  | 18 +++-------
 .../wizard/hr_holidays_summary_department.py  |  2 +-
 .../hr_holidays_summary_department_view.xml   | 17 +++++----
 addons/hr_recruitment/hr_recruitment.py       | 19 +++++++---
 addons/hr_recruitment/hr_recruitment_menu.xml |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 .../report/hr_recruitment_report_view.xml     | 21 +++++------
 .../security/ir.model.access.csv              |  9 +++--
 addons/hr_timesheet/report/user_timesheet.py  |  4 +--
 addons/hr_timesheet/report/users_timesheet.py | 10 +++---
 .../hr_timesheet/security/ir.model.access.csv | 20 ++++-------
 .../hr_timesheet/test/hr_timesheet_report.yml |  6 ++--
 .../hr_timesheet/test/test_hr_timesheet.yml   |  1 -
 .../wizard/hr_timesheet_print_employee.py     | 15 +++++---
 .../hr_timesheet_print_employee_view.xml      |  5 ++-
 .../wizard/hr_timesheet_print_users.py        |  4 +--
 .../wizard/hr_timesheet_print_users_view.xml  |  8 ++---
 .../security/ir.model.access.csv              | 26 ++++++--------
 .../hr_timesheet_analytic_profit_view.xml     | 10 +++---
 .../hr_timesheet_sheet_view.xml               | 16 ++++-----
 .../report/timesheet_report.py                | 19 +++++-----
 .../report/timesheet_report_view.xml          |  8 ++---
 .../security/ir.model.access.csv              | 12 +++----
 56 files changed, 297 insertions(+), 310 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index af9b0db7afc..0419445c82d 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -26,10 +26,28 @@ import tools
 from tools.translate import _
 
 class hr_employee_category(osv.osv):
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
+        res = self.name_get(cr, uid, ids, context)
+        return dict(res)
+
     _name = "hr.employee.category"
     _description = "Employee Category"
     _columns = {
         'name': fields.char("Category", size=64, required=True),
+        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
     }
@@ -117,7 +135,7 @@ class hr_employee(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
-        'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
+        'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
@@ -135,21 +153,25 @@ class hr_employee(osv.osv):
         company_id = self.pool.get('res.company').browse(cr,uid,company)
         for address in company_id.partner_id.address:
             return {'value': {'address_id': address.id}}
-        return {'value':{}}
+        return {'value':{'address_id':False}}
 
     def onchange_department(self, cr, uid, ids, department_id, context=None):
-        manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id.id
-        return {'value': {'parent_id':manager or False}}
+        if not department_id:
+            return {'value':{'parent_id': False}}
+        manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id
+        return {'value': {'parent_id':manager and manager.id or False}}
 
     def onchange_user(self, cr, uid, ids, user_id, context=None):
+        if not user_id:
+            return {'value':{'work_email': False}}
         mail = self.pool.get('res.users').browse(cr,uid,user_id)
-        return {'value': {'work_email':mail.user_email}}          
-        
+        return {'value': {'work_email':mail.user_email}}
+
     def _get_photo(self, cr, uid, context=None):
         return open(os.path.join(
             tools.config['addons_path'], 'hr/image', 'photo.png'),
                     'rb') .read().encode('base64')
-               
+
     _defaults = {
         'active': 1,
         'photo': _get_photo,
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index c80c0cd91d4..b64f7ca0413 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -67,7 +67,7 @@
             <field name="help">Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" />
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index fc327c6580d..e171f2dfba7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -3,10 +3,10 @@
     <data>
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
-        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
-        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" sequence="50"/>
+        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_system" name="Employees" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -100,7 +100,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <filter icon="terp-personal+" domain="[('active','=',True)]" string="Active" groups="base.group_extended"/>
+                    <filter icon="terp-personal+" domain="[('active','=',True)]" name="active" string="Active" groups="base.group_extended"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection">
@@ -146,12 +146,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="context">{"search_default_department_id": department_id,"search_default_active":eval('True')}</field>
             <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
-            <field name="help">The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.</field>
+            <field name="help">The employee directory contains all data related to your employees : from their photo up to their hourly estimated costs for the timesheets.Employees are managed by departments and can be linked to users to manage their access rights.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <!--
         =======================
@@ -259,8 +260,7 @@
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Employees Categories">
-                    <field name="name"/>
-                    <field name="parent_id"/>
+                    <field name="complete_name"/>
                 </tree>
             </field>
         </record>
@@ -384,6 +384,7 @@
                     <newline />
                     <group expand="0" string="Group By...">
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
@@ -396,11 +397,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_job_filter"/>
-            <field name="context">{'search_default_Current':1}</field>
+            <field name="context">{"search_default_Current":1,"search_default_department_id": department_id}</field>
             <field name="help">Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.</field>
         </record>
 
-        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager,base.group_system"/>
+        <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
         <menuitem parent="base.menu_crm_case_job_req_main" id="menu_hr_job" action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index a9fb4fdaae3..ab8eb568264 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,20 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0
+"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
+"access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
 "access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1
-"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,1,1,1
-"access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1
-"access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1
-"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0
-"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,1,1,1
-"access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1
-"access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
-"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,1,1,1
+"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
-"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1
-"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,0,0,0
-"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","model_hr_employee","base.group_user",1,0,0,0
-"access_hr_employee_category_employee","hr.employee.category.employee","model_hr_employee_category","base.group_user",1,0,0,0
-"access_hr_department_employee","hr.department.employee","model_hr_department","base.group_user",1,0,0,0
+"access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 6afd783323c..969637fcd0d 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -150,7 +150,7 @@ class hr_employee(osv.osv):
             res = {'action': type, 'employee_id': emp['id']}
             if dt:
                 res['name'] = dt
-            id = obj_attendance.create(cr, uid, res, context=context)
+        id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
             return id
diff --git a/addons/hr_attendance/hr_attendance_demo.xml b/addons/hr_attendance/hr_attendance_demo.xml
index 8f238fb61a5..d2967167ec8 100644
--- a/addons/hr_attendance/hr_attendance_demo.xml
+++ b/addons/hr_attendance/hr_attendance_demo.xml
@@ -125,13 +125,13 @@
             <field name="name">Employee Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 9339bf72939..44d09bec6cd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -81,7 +81,7 @@
 
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" groups="base.group_hr_user" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="3"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -89,8 +89,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Define attendance reason">
-                    <field colspan="4" name="name"  />
-                    <field name="action_type" />
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="action_type" select="1"/>
                 </form>
             </field>
         </record>
@@ -101,7 +101,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Attendance reasons">
-                    <field name="name"/>
+                    <field name="name" />
                     <field name="action_type"/>
                 </tree>
             </field>
@@ -116,7 +116,7 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Time Tracking" />
+        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances" />
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
index 15c4ec2693c..39f923a895b 100644
--- a/addons/hr_attendance/security/hr_security.xml
+++ b/addons/hr_attendance/security/hr_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.group_hr_attendance" model="res.groups">
-            <field name="name">Human Resources / Attendances User</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index e5ff0997db2..919aea0d57f 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,13 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_action_reason_attendance","hr.action.reason.attendance","model_hr_action_reason","base.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1
-"access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1
-"access_hr_attendance_attendance","hr.attendance.attendance","model_hr_attendance","base.group_hr_attendance",1,1,1,1
-"access_hr_employee_attendance","hr.employee.attendance","hr.model_hr_employee","base.group_hr_attendance",1,0,0,0
-"access_resource_resource_attendance","resource.resource.attendance","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1
-"access_hr_job_attendance","hr.job.attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0
-"access_hr_department_attendance","hr.department attendance","hr.model_hr_department","base.group_hr_attendance",1,0,0,0
-"access_hr_action_reason_system","hr.action.reason.system","model_hr_action_reason","base.group_system",1,1,1,1
-"access_hr_attendance_system","hr.attendance.system","model_hr_attendance","base.group_system",1,0,0,0
-"access_hr_attendance_employee","hr.attendance.employee","model_hr_attendance","base.group_user",1,0,0,0
+"access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
+"access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
+"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,0,0,0
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index cf86710ac93..dbabd9463f1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -47,7 +47,7 @@
         </record>
 
         <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
-            parent="menu_hr_attendance" sequence="4" groups="base.group_hr_manager,base.group_hr_user,base.group_hr_attendance"/>
+            parent="menu_hr_attendance" sequence="4"/>
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index c8f84ce55cc..bfcd9ff8b76 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -57,7 +57,7 @@
             <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_system"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_hr_manager"/>
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56" sequence="7"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
@@ -146,6 +146,9 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
+                   <filter string="Current" icon="terp-check" name="current"  domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]"                       context="{'group_by':'date_end'}" help="Contracts in progress"/> 
+                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]"                          context="{'group_by':'date_end'}" help="Contracts whose end date already passed"/>   
+                   <separator orientation="vertical"/>                  
                    <field name="name"/>
                    <field name="employee_id"/>
                    <field name="working_hours"/>
@@ -154,11 +157,9 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Working Schedule" icon="terp-personal+" domain="[]" context="{'group_by':'working_hours'}"/>
-                    <filter string="Current" icon="terp-stock_symbol-selection" 
-                            domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]" 
-                            context="{'group_by':'date_end'}"/>                    
+                   <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                   <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    </group>
                </search>
             </field>
@@ -213,7 +214,7 @@
                     <field name="employee_id"/>
                     <field name="type_id"/>
                     <field name="job_id"/>
-                    <field name="department_id"/>
+                    <!--field name="department_id"/-->
                     <field name="working_hours"/>                    
                     <field name="date_start"/>
                     <field name="date_end"/>
@@ -224,11 +225,12 @@
         </record>
 
         <record id="action_hr_contract" model="ir.actions.act_window">
-            <field name="name">Contract</field>
+            <field name="name">Contracts</field>
             <field name="res_model">hr.contract</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 
@@ -276,7 +278,7 @@
         </record>
 
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_system,base.group_hr_manager,base.group_hr_contract"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager,base.group_hr_user"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window 
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index b891099e447..39f923a895b 100644
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
@@ -2,9 +2,5 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="base.group_hr_contract" model="res.groups">
-            <field name="name">Human Resources / Contract</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 9ed14b14755..36456284856 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,20 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_contract_wage_type_period_manager","hr.contract.wage.type.period.manager","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_manager","hr.contract.wage.type.manager","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1
-"access_hr_contract_wage_type_contract","hr.contract.wage.type.contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period.contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1
-"access_hr_contract_contract","hr.contract.contract","model_hr_contract","base.group_hr_contract",1,1,1,1
-"access_hr_employee_contract_contract","hr.employee.contract.contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1
-"access_hr_resource_contract","hr.employee.resource.contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1
-"access_hr_resource_calendar_contract","hr.employee.resource.calendar.contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1
-"access_hr_job_contract","hr.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1
-"access_hr_contract_type_contract","hr.contract.type.contract","model_hr_contract_type","base.group_hr_contract",1,1,1,1
-"access_hr_contract_wage_type_system","hr.contract.wage.type.system","model_hr_contract_wage_type","base.group_system",1,1,1,1
-"access_hr_contract_wage_type_period_system","hr.contract.wage.type.period.system","model_hr_contract_wage_type_period","base.group_system",1,1,1,1
-"access_hr_contract_type_system","hr.contract.type.system","model_hr_contract_type","base.group_system",1,1,1,1
-"access_hr_contract_system","hr.contract.system","model_hr_contract","base.group_system",1,1,1,1
-"access_hr_employee_category_contract","hr.employee.category.contract","hr.model_hr_employee_category","base.group_hr_contract",1,1,1,1
-"access_hr_department_contract","hr.department.contract","hr.model_hr_department","base.group_hr_contract",1,1,1,1
-"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
-"access_hr_contract_employee","hr.contract.employee","model_hr_contract","base.group_user",1,0,0,0
+"access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
+"access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
+"access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
+"access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
+"access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 263b34322b9..960849bdfd4 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -33,7 +33,7 @@ class hr_evaluation_plan(osv.osv):
         'name': fields.char("Evaluation Plan", size=64, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
-        'month_first': fields.integer('First Evaluation After'),
+        'month_first': fields.integer('Next Evaluation After'),
         'month_next': fields.integer('After the Date of Start'),
         'active': fields.boolean('Active')
     }
@@ -115,12 +115,11 @@ class hr_employee(osv.osv):
         return True
 
     def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
-        evaluation_date = evaluation_date or False
-        evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
-        obj_evaluation = self.pool.get('hr_evaluation.evaluation')
         if context is None:
             context = {}
         if evaluation_plan_id:
+            evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
+            obj_evaluation = self.pool.get('hr_evaluation.evaluation')
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
             if not evaluation_date:
@@ -192,11 +191,11 @@ class hr_evaluation(osv.osv):
         return res
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
-        employee_obj=self.pool.get('hr.employee')
         if context is None:
             context = {}
-        evaluation_plan_id=''
+        evaluation_plan_id=False
         if employee_id:
+            employee_obj=self.pool.get('hr.employee')
             for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
                 if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
                     evaluation_plan_id=employee.evaluation_plan_id.id
@@ -259,6 +258,7 @@ class hr_evaluation(osv.osv):
     def button_done(self,cr, uid, ids, context=None):
         if context is None:
             context = {}
+        self.write(cr, uid, ids,{'progress': 1 * 100}, context=context)
         self.write(cr, uid, ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 0a03ec0e0b6..f8513bf63ea 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1616,13 +1616,13 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="name">Employee Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_evaluation_manager" model="ir.rule">
             <field name="name">Manager Evaluation</field>
             <field model="ir.model" name="model_id" ref="model_hr_evaluation_evaluation"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 		 </data>
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5dcc7b6f346..e4ccb11ce4e 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
         </record>
 
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_system"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
@@ -237,7 +237,7 @@
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/> 
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Overpassed Deadline"
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id" />
@@ -246,6 +246,7 @@
                     <newline/>
                     <group expand='0' string='Group by...'>
                     <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                    <separator orientation="vertical"/>
                     <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
                     <filter string='State' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
                     <separator orientation="vertical"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index a8aaeb2ec93..59dade23d6f 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -18,11 +18,11 @@
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="rating" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Requests"/>
                 <field name="progress_bar" widget="progressbar"/>
                 <field name="delay_date"/>
                 <field name="overpass_delay"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -75,13 +75,13 @@
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Plan" icon="terp-stock_align_left_24" context="{'group_by':'plan_id'}"/>
-                    <filter string="Appreciation" icon="terp-rating-rated" context="{'group_by':'rating'}"/>
+                    <filter string="Appreciation" icon="terp-face-plain" context="{'group_by':'rating'}"/>
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create Date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Group by month of create Date"/>
-                    <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Group by year of create Date"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'create_date'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-month" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 7c57d67d1cd..fba2a5f2202 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,21 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation.manager","model_hr_evaluation_evaluation","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_manager","hr_evaluation.plan.manager","model_hr_evaluation_plan","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0
-"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase.manager","model_hr_evaluation_plan_phase","base.group_hr_manager",1,1,1,1
+"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
 "access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_manager","hr.evaluation.interview.manager","model_hr_evaluation_interview","base.group_hr_manager",1,1,1,1
 "access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
-"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_plan","base.group_system",1,1,1,1
-"access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1
-"access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0
-"access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0
-"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
-"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,0,0,0
-"access_hr_evaluation_user","hr_evaluation.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_employee","hr_evaluation.employee","model_hr_evaluation_plan","base.group_user",1,0,0,0
 "access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
 "access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
@@ -28,7 +16,6 @@
 "access_survey_tbl_column_heading_hr_manager","survey.tbl.column.heading","survey.model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
 "access_survey_response_answer_hr_manager","survey.response.answer","survey.model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_request_hr_manager","survey.request","survey.model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
 "access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
 "access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
 "access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
index 9063ac32458..d86c7614d7f 100644
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ b/addons/hr_expense/board_hr_expense_manager_view.xml
@@ -9,14 +9,14 @@
             <field name="domain">[('state','in',('confirm', 'accepted'))]</field>
             <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
         </record>
-        
+
         <record id="board_hr_manager_expense_form" model="ir.ui.view">
             <field name="name">board.hr.manager.expense.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_manager_form"/>              
+			<field name="inherit_id" ref="hr.board_hr_manager_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
+      		<xpath expr="/form/hpaned/child1" position="inside">
 				 <action colspan="4" height="220" name="%(action_employee_expense)d" string="All Employee Expenses" />
 			</xpath>
             </field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 4003cded168..e9e64f76c4e 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -97,6 +97,13 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+
+    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
+        if not employee_id:
+            return {'value':{'department_id': False}}
+        dept = self.pool.get('hr.employee').browse(cr, uid, employee_id).department_id
+        return {'value': {'department_id':dept and dept.id or False}}
+
     def expense_confirm(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'confirm',
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index c3fa9e90c67..cb9e28b5543 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -108,13 +108,13 @@
             <field name="name">Employee Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
         </record>
         <record id="property_rule_expense_manager" model="ir.rule">
             <field name="name">Manager Expense</field>
             <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-            <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 	</data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 41f87a991c3..7ffdb349826 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,7 +67,7 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet">
                     <group colspan="4" col="6">
-                        <field name="employee_id"/>
+                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="name" select="1"/>
                         <field name="ref" groups="base.group_extended"/>
                         <field name="date" select="1"/>
@@ -136,18 +136,22 @@
                       <separator orientation="vertical"/>
                       <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
                         help="Confirmed Expense"/>
-                      <filter icon="terp-check" domain="[('state','=','accepted')]" string="To Pay"
+                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
+                      <separator orientation="vertical"/>
                       <filter icon="terp-go-month" string="This Month" name="this"
                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
+                      <field name="employee_id" select='1'/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
                       <field name="user_id"  string="User" invisible="True">
                       <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
-                      <field name="department_id" widget="selection" groups="base.group_extended"/>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
+                   <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
+               </field>
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
@@ -165,7 +169,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_user_id":uid,'search_default_this':1}</field>
+            <field name="context">{"search_default_user_id":uid,"search_default_department_id": department_id,"search_default_this":1}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
             <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 9549e6df576..3de4776b29f 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -65,8 +65,8 @@
                   <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
-                    <filter string="Accepted" icon="terp-camera_test" domain="[('state','=','accepted')]"
-                      help = "Accepted Expenses"/>
+                    <filter string="Approved" icon="terp-camera_test" domain="[('state','=','accepted')]"
+                      help = "Approved Expenses"/>
                     <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','=','invoiced')]"
                       help = "Invoiced Expenses"/>
@@ -82,7 +82,7 @@
                 <separator orientation="vertical"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <newline/>
-                <field name="date"/>
+                <field name="date" string="Creation Date"/>
                 <field name="date_confirm"/>
                 <field name="date_valid"/>
             </group>
@@ -99,9 +99,9 @@
                 <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 <separator orientation="vertical"/>
-                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Create Date"/>
-                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Create Date"/>
-                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Create Date"/>
+                <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
             </group>
             </search>
         </field>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index f0208425ba8..525b55bf681 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,18 +1,18 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
-"access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1
-"access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0
-"access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0
-"access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0
-"access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1
-"access_hr_expense_expense_manager","hr.expense.expense.manager","model_hr_expense_expense","base.group_hr_manager",1,1,1,1
-"access_hr_expense_expense_system","hr.expense.expense.system","model_hr_expense_expense","base.group_system",1,0,0,0
-"access_hr_expense_line_manager","hr.expense.line.manager","model_hr_expense_line","base.group_hr_manager",1,1,1,1
-"access_product_product_hr_expense_manager","product.product.hr.expense.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
-"access_product_template_hr_expense_manager","product.template.hr.expense.manager","product.model_product_template","base.group_hr_manager",1,1,1,1
-"access_product_uom_hr_expense_manager","product.uom.hr.expense.manager","product.model_product_uom","base.group_hr_manager",1,1,1,1
-"access_product_price_type_manager","product.price.type.manager","product.model_product_price_type","base.group_hr_manager",1,1,1,1
-"access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,0,0,0
-"access_hr_employee_employee","hr.employee.employee","hr.model_hr_employee","base.group_user",1,0,0,0
-"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,0,0,0
+"access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1
+"access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1
+"access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1
+"access_product_uom_hr_expense_user","product.uom.hr.expense.user","product.model_product_uom","base.group_hr_user",1,1,1,1
+"access_product_price_type_user","product.price.type.user","product.model_product_price_type","base.group_hr_user",1,1,1,1
+"access_account_journal_user","account.journal.user","account.model_account_journal","base.group_hr_user",1,1,1,1
+"access_account_invoice_user","account.invoice.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
+"access_account_invoice_line_user","account.invoice.line.user","account.model_account_invoice_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_journal_user","account.ianalytic.journal.user","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
+"access_account_invoice_tax_user","account.invoice.tax.user","account.model_account_invoice_tax","base.group_hr_user",1,1,1,1
+"access_account_period_user","account.period.user","account.model_account_period","base.group_hr_user",1,1,1,1
+"access_account_fiscalyear_user","account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
+"access_account_move_user","account.move.user","account.model_account_move","base.group_hr_user",1,1,1,1
+"access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 8659e3de51d..86786ad1baf 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
     
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 025325a5ae1..356d697f2c1 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -141,7 +141,7 @@ class hr_holidays(osv.osv):
         return False
 
     _columns = {
-        'name': fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Description', required=True, size=64),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
             If the admin accepts it, the state is \'Approved\'. If it is refused, the state is \'Refused\'.'),
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index f513b8892c5..e59bd5a0353 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -52,13 +52,13 @@
         <field name="name">Employee Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_user')])]"/>
     </record>
     <record id="property_rule_holidays_manager" model="ir.rule">
         <field name="name">Manager Holidays</field>
         <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">['|',('employee_id.user_id','=',user.id),('employee_id.parent_id.user_id','=',user.id )]</field>
-        <field name="groups" eval="[(6,0,[ref('base.group_hr_user'),ref('base.group_hr_manager')])]"/>
+        <field name="groups" eval="[(6,0,[ref('base.group_hr_manager')])]"/>
         </record>
 
   </data>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 12d347cd876..6ee69af1bca 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -66,7 +66,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="8" colspan="4">
-                    <field name="name" />
+                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
@@ -269,6 +269,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
+            <field name="context">{"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
@@ -302,7 +303,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_user_id':uid,'type':'add'}</field>
+            <field name="context">{'search_default_user_id':uid,'type':'add',"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -330,7 +331,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'allocation_type':'company', 'report':True}</field>
+            <field name="context">{'allocation_type':'company', 'report':True,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
@@ -379,7 +380,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_system"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_hr_manager"/>
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 8ab371c67d7..8d91e0d02e4 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -40,6 +40,12 @@ class available_holidays_report(osv.osv):
         'remaining_leave': fields.float('Remaining Leaves', readonly=True),
         'department_id': fields.many2one('hr.department', 'Department', readonly=True),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
+        'state': fields.selection([('draft', 'Draft'),
+                                   ('confirm', 'Waiting Validation'),
+                                   ('refuse', 'Refused'),
+                                   ('validate', 'Validated'),
+                                   ('cancel', 'Cancelled')]
+                                   ,'State', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'available_holidays_report')
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 372d9158599..b4cb2a99b7a 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -11,6 +11,7 @@
             <field name="arch" type="xml">
                <tree string="Available Holidays">
                     <field name="employee_id" invisible="1"/>
+					<field name="user_id" invisible="1"/>
                     <field name="category_id" invisible="1"/>
                     <field name="holiday_status_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -18,6 +19,7 @@
                     <field name="month" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="date" invisible="1"/>
+                    <field name="state" invisible="1"/>
                     <field name="max_leave" sum="Allocated Leaves"/>
                     <field name="taken_leaves" sum="Taken Leaves"/>
                     <field name="remaining_leave" sum="Remaining Leaves"/>
@@ -48,13 +50,11 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
-		            	<filter icon="terp-go-year" string="This Year"
-			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-			                    help="Leaves in this year"/>
-		                <filter icon="terp-go-month" string="This Month" name="month"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Leaves in this month"/>
-			            <filter icon="terp-go-week" string="    7 Days    " separator="1"
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Leaves during last 7 days"/>
+						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
+						<filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Available Leaves of current month"/>
+						<filter icon="terp-go-month" string="    Month-1    " separator="1" domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Available Leaves of last month"/>
+						<separator orientation="vertical"/>
+						<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"/>
 		                <separator orientation="vertical"/>
                     <field name="employee_id"/>
 		            </group>
@@ -65,13 +65,19 @@
 	                </group>
 	                <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                        <filter icon="terp-personal" string="Employee"
+						<filter icon="terp-personal" string="Employee"
                           name="user" context="{'group_by':'employee_id'}"
                           help="Leaves by employee"/>
-                        <separator orientation="vertical"/>
+						<filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+		                <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+                       <separator orientation="vertical"/>
+                    	<filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
+                            help="Leaves by category"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
                         <separator orientation="vertical"/>
+                    	<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                   		<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a14970b31e5..92dedd1a14d 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -100,7 +100,6 @@ class report_custom(report_rml):
         today=datetime.datetime.today()
 
         first_date=data['form']['date_from']
-
         som = strToDate(first_date)
         eom = som+datetime.timedelta(59)
         day_diff=eom-som
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 9a259f1fe15..5d2dc27c0de 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -64,9 +64,9 @@ class hr_holidays_report(osv.osv):
                      s.employee_id,
                      s.category_id,
                      s.user_id as user_id,
-                     to_char(s.create_date, 'YYYY') as year,
-                     to_char(s.create_date, 'MM') as month,
-                     to_char(s.create_date, 'YYYY-MM-DD') as day,
+                     to_char(s.date_from, 'YYYY') as year,
+                     to_char(s.date_from, 'MM') as month,
+                     to_char(s.date_from, 'YYYY-MM-DD') as day,
                      s.holiday_status_id,
                      s.department_id,
                      s.state,
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 89cdb6014bb..b2fa98a7720 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -54,7 +54,7 @@
 	                <separator orientation="vertical"/>
 	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
 	                	help = "Draft and Confirmed leaves"/>
-	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
+	               	<filter string="Validated" name="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
                   <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
 					<separator orientation="vertical"/>
@@ -75,7 +75,7 @@
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
                             help="Leaves by empolyee"/>
-                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                      <filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
@@ -85,20 +85,20 @@
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by create date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of create date"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of create date"/>
+                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id="action_hr_holidays_report_all" model="ir.actions.act_window">
-        <field name="name">Leaves</field>
+        <field name="name">Leaves Analysis</field>
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_department':1, 'group_by':[], 'group_by_no_leaf':1} </field>
+        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 238d526bf5e..20da4832fe2 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,15 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0
-"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,0
-"access_hr_holydays_status_manager","hr.holidays.status.manager","model_hr_holidays_status","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_manager","hr.holidays.manager","model_hr_holidays","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0
-"access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holidays_remaining_leaves_manager","hr.hr.holidays.remaining.leaves.manager","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,1,1,1
-"access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,1,1,1
-"access_hr_holydays_status_system","hr.holidays.status.system","model_hr_holidays_status","base.group_system",1,1,1,1
-"access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
-"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
-"access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
+"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
+"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
+"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
+"access_hr_holidays_report_manager","hr.holidays.report.manager","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
-"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,0
+"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 9a99d9eff63..5ea75cb7e30 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -30,7 +30,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
     _columns = {
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
-        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Select Holiday Type', required=True)
+        'holiday_type': fields.selection([('Validated','Validated'),('Confirmed','Confirmed'),('both','Both Validated and Confirmed')], 'Leave Type', required=True)
     }
 
     _defaults = {
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 01d3f4372ce..cd7665be123 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,16 +9,15 @@
             <field name="arch" type="xml">
 			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
-				    <field name="date_from"/>
+				    <field name="date_from" />
 				    <newline/>
-				    <field name="holiday_type"/>
+				    <field name="holiday_type" colspan="4"/>
 				    <newline/>
-				    <field name="depts"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+				    <field name="depts" colspan="4"/>
+					<separator colspan="4"/>
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-print" name="print_report" string="Print" type="object"/>
 				</group>
 			</form>
             </field>
@@ -42,4 +41,4 @@
 	        icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index b9241477409..3dbcd946e87 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -181,15 +181,15 @@ class hr_applicant(crm.crm_case, osv.osv):
     }
 
     def onchange_job(self,cr, uid, ids, job, context=None):
-        job_obj = self.pool.get('hr.job')
         if context is None:
             context = {}
         result = {}
 
         if job:
+            job_obj = self.pool.get('hr.job')
             result['department_id'] = job_obj.browse(cr, uid, job, context=context).department_id.id
             return {'value': result}
-        return {'value': {'department_id': []}}
+        return {'value': {'department_id': False}}
 
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage
@@ -437,8 +437,9 @@ class hr_applicant(crm.crm_case, osv.osv):
             emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
             job_data = job_obj.browse(cr,uid, applicant.job_id.id)
             expected_emp = job_data['expected_employees'] - 1
-            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp,'state': 'old'})
-
+            if expected_emp == 0:
+                job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
         return res
 
     def case_reset(self, cr, uid, ids, *args):
@@ -449,8 +450,18 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
+        applicant = self.browse(cr, uid, ids)[0]
+        if applicant.job_id :
+            job_obj = self.pool.get('hr.job')
+            emp_obj = self.pool.get('hr.employee')
+            job_data = job_obj.browse(cr,uid, applicant.job_id.id)
+            expected_emp = job_data['expected_employees'] + 1
+            emp_id = emp_obj.search(cr,uid, [('job_id','=',applicant.job_id.id),('name','=',applicant.name)])
+            emp_obj.unlink(cr, uid, emp_id)
+            job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
         res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': False, 'date_closed':False})
+        
         return res
 
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 21f9074545a..7c158bb8795 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,7 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="view_id" ref="crm_case_tree_view_job"/>
-            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1}</field>
+            <field name="context">{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
         </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3da942873b6..edd3bd77599 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -114,7 +114,7 @@
                         <group col="2" colspan="2">
                             <separator colspan="2" string="Qualification"/>
                             <!-- <field name="type_id" domain="[('object_id.model', '=', 'hr.applicant')]"/>-->
-                            <field name="type_id"/>
+                            <field name="type_id" widget="selection"/>
                             <field name="priority" string="Appreciation"/>
                             <field name="reference"/>
                         </group>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index d1f06577fb2..d29ecabefb0 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -67,7 +67,7 @@
                     	icon="terp-document-new"
                     	domain="[('state','=','draft')]"
                     	help = "Draft recruitment"/>
-	                <filter string="Current"
+	                <filter string="In progress"
 	                	icon="terp-check"
 	                	domain="[('state', '=' ,'open')]"
 	                	help = "In progress recruitment"/>
@@ -91,36 +91,33 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="job_id" widget="selection"/>
-                    <field name="type_id" widget="selection"/>
+                    <!--field name="job_id"/-->
                     <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
-                    <field name="state"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date"/>
+                    <field name="date" string="Creation Date"/>
                     <field name="date_closed"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By ...">
                    <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                    <separator orientation="vertical"/>
                     <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <separator orientation="vertical"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
+            	   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
-            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}"/>
-            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
+            	   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+            	   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+            	   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
 
-                
+
                 </search>
         </field>
     </record>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 92dc912180d..5e343a40fa0 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -3,8 +3,7 @@
 "access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
 "access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
 "access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
-"access_hr_recruitment_stage_system","hr.recruitment.stage.system","model_hr_recruitment_stage","base.group_system",1,1,1,1
-"access_hr_applicant_manager","hr.applicant.manager","model_hr_applicant","base.group_hr_manager",1,1,1,1
-"access_hr_applicant_system","hr.applicant.system","model_hr_applicant","base.group_system",1,0,0,0
-"access_hr_recruitment_stage_manager","hr.recruitment.stage.manager","model_hr_recruitment_stage","base.group_hr_manager",1,1,1,1
-"access_hr_recruitment_degree_manager","hr.recruitment.degree.manager","model_hr_recruitment_degree","base.group_hr_manager",1,1,1,1
+"access_mailgate_message_user","mailgate.message.user","mail_gateway.model_mailgate_message","base.group_hr_user",1,1,1,1
+"access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
+"access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
+"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index dc048748f46..93c425af995 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -63,7 +63,7 @@ class report_custom(report_rml):
             "and product_uom_id = unit.id "\
             "and line.user_id=%s and line.date >= %s and line.date < %s "
             "order by line.date",
-            (data['form']['user_id'], som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
+            (uid, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
 
         # Sum attendence by account, then by day
         accounts = {}
@@ -97,7 +97,7 @@ class report_custom(report_rml):
             account_xml.append('</account>')
 
         # Computing the employee
-        cr.execute("select name from res_users where id=%s", (data['form']['user_id'],))
+        cr.execute("select name from res_users where id=%s", (str(uid)))
         emp = cr.fetchone()[0]
 
         # Computing the xml
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 35c86fd08b9..5a52e9ce9c8 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -59,7 +59,7 @@ def emp_create_xml(cr, id, som, eom):
     time_xml = ([xml % (day, amount) for day, amount in month.iteritems()])
 
     # Computing the employee
-    cr.execute("select name from res_users where id=%s", (id,))
+    cr.execute("select name from resource_resource where id=%s", (id,))
     emp = cr.fetchone()[0]
 
     # Computing the xml
@@ -91,9 +91,11 @@ class report_custom(report_rml):
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
 
         emp_xml=''
-        for id in data['form']['user_ids']:
-            emp_xml += emp_create_xml(cr, id, som, eom)
-
+        emp_obj = pooler.get_pool(cr.dbname).get('hr.employee')        
+        for id in data['form']['employee_ids']:
+            user = emp_obj.browse(cr, uid, id).user_id.id
+            if user:
+                emp_xml += emp_create_xml(cr, id, som, eom)
         # Computing the xml
         #Without this, report don't show non-ascii characters (TO CHECK)
         date_xml = '\n'.join(date_xml)
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 2b01017fb65..40ac84200ef 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,16 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
-"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,0
-"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,0,0,0
-"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,0,0,0
-"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,0,0,0
-"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
-"access_hr_analytic_timesheet_manager","hr.analytic.timesheet.manager","model_hr_analytic_timesheet","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","model_hr_analytic_timesheet","base.group_system",1,0,0,0
-"access_hr_account_analytic_line_manager","account.account.analytic.line.manager","account.model_account_analytic_line","base.group_hr_manager",1,1,1,1
-"access_account_analytic_journal_manager","account.account.analytic.journal.manager","account.model_account_analytic_journal","base.group_hr_manager",1,1,1,1
-"access_product_product_manager","product.product.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
-"access_product_template_hr_timesheet_manager","product.template.hr.timesheet.manager","product.model_product_template","base.group_hr_manager",1,1,1,1
-"access_product_uom_hr_timesheet_manager","product.uom.hr.timesheet.manager","product.model_product_uom","base.group_hr_manager",1,1,1,1
-"access_hr_analytic_timesheet_employee","hr.analytic.timesheet.employee","model_hr_analytic_timesheet","base.group_user",1,1,1,0
-"access_account_analytic_line_user","account.account.analytic.line.user","account.model_account_analytic_line","base.group_user",1,0,0,0
+"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
+"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
+"access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,1,1,1
+"access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
+"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1
+"access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 2f19f75618f..b1cd445a35d 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -5,7 +5,7 @@
     import netsvc, tools, os, time
     month = time.gmtime()[1]
     year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_id' : uid }}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_id' : ref('hr.employee1') }}
     (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
@@ -17,7 +17,7 @@
     import netsvc, tools, os, time
     month = time.gmtime()[1]
     year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'user_ids' : [uid] }}
+    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_ids' : [ref('hr.employee1')] }}
     (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
\ No newline at end of file
+       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index d962c627cdd..18d94edbed8 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -21,7 +21,6 @@
     context_lang: en_US
     groups_id:
       - base.group_hr_user
-      - base.group_hr_attendance
       - base.group_user
       - base.group_extended
       - base.group_hr_manager
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 4bcdb614e2f..2983166ad56 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -21,6 +21,7 @@
 import datetime
 
 from osv import osv, fields
+from tools.translate import _
 
 class analytical_timesheet_employee(osv.osv_memory):
     _name = 'hr.analytical.timesheet.employee'
@@ -29,18 +30,24 @@ class analytical_timesheet_employee(osv.osv_memory):
         'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
-        'user_id': fields.many2one('res.users', 'User', required=True)
+        'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
+    
                 }
 
     def _get_user(self, cr, uid, context=None):
+
+        emp_obj = self.pool.get('hr.employee')
         if context is None:
             context = {}
-        return uid
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if not emp_id:
+            raise osv.except_osv(_("Warning"), _("No employee defined for this user"))
+        return emp_id and emp_id[0] or False
 
     _defaults = {
          'month': datetime.date.today().month,
          'year': datetime.date.today().year,
-         'user_id': _get_user
+         'employee_id': _get_user
              }
 
     def print_report(self, cr, uid, ids, context=None):
@@ -59,4 +66,4 @@ class analytical_timesheet_employee(osv.osv_memory):
             }
 analytical_timesheet_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 3b110b52f1d..63e493cfab7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,12 +8,11 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Employee Timesheet">
+				<form string="Monthly Employee Timesheet">
 					<group colspan="4">
-					<separator string="This wizard will print monthly timesheet of employee" colspan="4"/>
 						<field name="month"/>
 						<field name="year"/>
-						<field name="user_id" colspan="3"/>
+						<field name="employee_id" colspan="3"/>
 					</group>
 					<separator colspan="4"/>
                     <group colspan="4" col="6">
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 27533710f35..b0a0c3c0f05 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -30,7 +30,7 @@ class analytical_timesheet_employees(osv.osv_memory):
         'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
-        'user_ids': fields.many2many('res.users', 'timesheet_users_rel', 'timesheet_id', 'user_id', 'Users', required=True)
+        'employee_ids': fields.many2many('hr.employee', 'timesheet_employee_rel', 'timesheet_id', 'employee_id', 'employees', required=True)
                 }
 
     _defaults = {
@@ -55,4 +55,4 @@ class analytical_timesheet_employees(osv.osv_memory):
 
 analytical_timesheet_employees()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index d71946abfd9..95b7bd3b93e 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,16 +8,16 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Employees Timesheet">
+				<form string="Monthly Employees Timesheet">
 					<group height="260" width="460">
 						<group colspan="4">
-							<separator string="This wizard will print monthly timesheet of employees" colspan="4"/>
 							<field name="month"/>
 							<field name="year"/>
-							<field name="user_ids" colspan="4"/>
+                            <separator string="Employees" colspan="4"/>
+							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>
-						<group colspan="4" col="6">
+						<group colspan="4">
 							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
 							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
 						</group>
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index 2dd928fc924..c647fec62cf 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -1,20 +1,16 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,0,0,0
+"access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1
 "access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0
 "access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0
-"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,0,0,0
-"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,0,0,0
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,0,0,0
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,0,0,0
-"access_report_analytic_account_close_system","report.analytic.account.close system","model_report_analytic_account_close","base.group_system",1,1,1,1
-"access_report_account_analytic_line_to_invoice_system","report.account.analytic.line.to.invoice system","model_report_account_analytic_line_to_invoice","base.group_system",1,1,1,1
-"access_report_timesheet_line","report.timesheet.line","model_report_timesheet_line","base.group_hr_manager",1,0,0,0
-"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,0
-"access_account_fiscalyear_hr_user","account.fiscalyear.hr.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,0
-"access_account_invoice_hr_manager","account.invoice.hr.manager","account.model_account_invoice","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_invoice_factor_hr_manager","hr_timesheet_invoice.factor.hr.manager","model_hr_timesheet_invoice_factor","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
+"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
+"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,1,1,1
+"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,1,1,1
+"access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
+"access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
+"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
 "access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1
-"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_user",1,1,1,0
+"access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 87648a61642..7bdae9bee1d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Timesheet Profit">
-					<group height="340" width="480">
+					<group height="400" width="480">
 						<group col="4" colspan="6">
 							<field name="date_from"/>
 							<field name="date_to"/>
-							<field name="journal_ids" colspan="4"/>
-							<field name="employee_ids" colspan="4"/>
+                            <separator string="Journals" colspan="4"/>
+							<field name="journal_ids" colspan="4" nolabel="1"/>
+                            <separator string="Employees" colspan="4"/>
+							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>
 						<group col="2" colspan="4">
@@ -39,4 +41,4 @@
         	parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 8c59cd6e9d3..c31dfd1ab0f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -67,19 +67,19 @@
                                 <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
 
-                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance">
+                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1">
                                 <tree string="Attendances" editable="bottom">
                                     <field name="name"/>
                                     <field name="action"/>
                                     <field invisible="1" name="employee_id"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="1" groups="base.group_hr_attendance">
+                            <group col="1" colspan="1">
                                 <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                             </group>
-                            <field name="state_attendance" groups="base.group_hr_attendance"/>
-                            <field name="total_attendance_day" widget="float_time" groups="base.group_hr_attendance"/>
+                            <field name="state_attendance"/>
+                            <field name="total_attendance_day" widget="float_time"/>
                             <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet">
                                     <field invisible="1" name="date"/>
@@ -115,9 +115,9 @@
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
+                                    <field name="total_attendance" widget="float_time"/>
                                     <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
+                                    <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
                             <group colspan="4" col="6">
@@ -303,9 +303,9 @@
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="department_id"/>
-                    <field name="total_attendance" groups="base.group_hr_attendance"/>
+                    <field name="total_attendance"/>
                     <field name="total_timesheet"/>
-                    <field name="total_difference" groups="base.group_hr_attendance"/>
+                    <field name="total_difference"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index a8c0440a053..6688c747983 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -35,7 +35,7 @@ class timesheet_report(osv.osv):
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product'),
         'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
-        'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee',readonly=True),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'nbr': fields.integer('#Nbr',readonly=True),
@@ -60,8 +60,8 @@ class timesheet_report(osv.osv):
         tools.drop_view_if_exists(cr, 'timesheet_report')
         cr.execute("""
             create or replace view timesheet_report as (
-                    select
-                        min(aal.id) as id,
+                    select 
+			min(aal.id) as id,
                         htss.date_current,
                         htss.name,
                         htss.date_from,
@@ -91,14 +91,14 @@ class timesheet_report(osv.osv):
                             AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
                         aal.to_invoice,
                         aal.general_account_id,
-                        htss.user_id,
+                        htss.employee_id as employee_id,
                         htss.company_id,
                         htss.department_id,
                         htss.state
-                    from account_analytic_line as aal
-                    left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
-                    left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
-                    group by
+		from hr_timesheet_sheet_sheet as htss
+		left join hr_analytic_timesheet as hat ON (hat.create_uid=htss.create_uid)
+		left join account_analytic_line as aal ON (hat.line_id=aal.id)
+		group by
                         to_char(htss.date_current,'YYYY'),
                         to_char(htss.date_current,'MM'),
                         to_char(htss.date_current, 'YYYY-MM-DD'),
@@ -116,7 +116,8 @@ class timesheet_report(osv.osv):
                         htss.state,
                         htss.id,
                         htss.department_id,
-                        htss.user_id
+                        htss.employee_id
+  
             )
         """)
 timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 4b48d8e6b44..34397ba1c7d 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -7,7 +7,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet" type="bar">
-                    <field name="user_id" />
+                    <field name="employee_id" />
                     <field name="quantity" operator = "+"/>
                     <field name="state" group = "True"/>
                 </graph>
@@ -21,7 +21,7 @@
                 <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
                     <field name="date_current" invisible="1"/>
                     <field name="name" invisible="1"/>
-                    <field name="user_id" invisible="1"/>
+                    <field name="employee_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>
                     <field name="date_to" invisible="1"/>
                     <field name="state" invisible="1"/>
@@ -90,7 +90,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
-                        <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Employee" name="Employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -117,7 +117,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_Employee_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 116396612e8..c11a3ce7099 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,13 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_system_user","hr_timesheet_sheet.sheet.system.user","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_manager","hr_timesheet_sheet.sheet.manager","model_hr_timesheet_sheet_sheet","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system","hr_timesheet_sheet.sheet.system","model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_employee","hr_timesheet_sheet.sheet.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
-"access_hr_timesheet_sheet_sheet_day_manager","hr_timesheet_sheet.sheet.day.manager","model_hr_timesheet_sheet_sheet_day","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_account_manager","hr_timesheet_sheet.sheet.account.manager","model_hr_timesheet_sheet_sheet_account","base.group_hr_manager",1,1,1,1
-"access_hr_timesheet_sheet_sheet_day_employee","hr_timesheet_sheet.sheet.day.employee","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
-"access_hr_timesheet_sheet_sheet_account_employee","hr_timesheet_sheet.sheet.account.employee","model_hr_timesheet_sheet_sheet_account","base.group_user",1,0,0,0
+"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
+"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0

From 28af5e2dab8c2c81c0aebc2c8d454bf4ca8a55ef Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 8 Oct 2010 19:08:25 +0530
Subject: [PATCH 481/632] [FIX] project_timsheet : added missing employee_id
 ref to sheet in yml

bzr revid: jvo@tinyerp.com-20101008133825-gnr16ihx9dhk6pcj
---
 .../test/worktask_entry_to_timesheetline_entry.yml               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 42e780642bf..d0477c545ff 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -54,6 +54,7 @@
     name: Sheet for hr manager
     state: new
     user_id: res_users_hrmanager0
+    employee_id : 'hr_employee_hrmanager0'
 
 - 
   Create a project 'Timesheet Management'

From 377d126628ba692661a10b9a42c3a64229335695 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 8 Oct 2010 19:23:53 +0530
Subject: [PATCH 482/632] [IMP] hr_payroll: improved the reports.

bzr revid: vra@tinyerp.com-20101008135353-cbe6jt2pzdy9ch7m
---
 addons/hr_payroll/report/payroll_register.rml | 58 ++++-------
 addons/hr_payroll/report/payslip.rml          | 40 ++++----
 .../report/report_emp_salary_structure.rml    | 14 +--
 .../report/report_employees_detail.py         | 40 +++-----
 .../report/report_employees_detail.rml        | 99 +++++++++----------
 .../report/report_payroll_advice.rml          |  6 +-
 .../report/report_payroll_register.py         | 24 +++--
 addons/hr_payroll/report/report_payslip.py    |  6 +-
 .../hr_payroll/report/report_year_report.rml  | 14 +--
 .../hr_payroll/report/report_year_salary.py   | 26 +----
 .../wizard/hr_payroll_employees_detail.py     | 25 +++--
 .../wizard/hr_payroll_employees_detail.xml    |  9 +-
 .../wizard/hr_payroll_year_salary.py          | 24 +++--
 .../wizard/hr_payroll_year_salary.xml         | 12 +--
 14 files changed, 180 insertions(+), 217 deletions(-)

diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index d7df0ada7cc..e28353ecea9 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Salary Payment Register" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -13,14 +13,6 @@
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -65,7 +57,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="space" fontName="Helvetica" fontSize="6.0" leading="8"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -101,26 +93,12 @@
     </para>
     <blockTable colWidths="72.0,295.0,47.0,68.0" style="Table3">
       <tr>
-        <td>
-          <para style="terp_tblheader_general">Expanse To</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[o.journal_id.name]]</para>
-        </td>
         <td>
           <para style="terp_tblheader_general">Number</para>
         </td>
         <td>
           <para style="terp_default_8">[[o.number]]</para>
         </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_tblheader_general">Payment From</para>
-        </td>
-        <td>
-          <para style="terp_default_8">[[o.bank_journal_id.name]]</para>
-        </td>
         <td>
           <para style="terp_tblheader_general">Date</para>
         </td>
@@ -145,26 +123,26 @@
             <para style="terp_tblheader_details">Employee Name</para>
           </td>
           <td>
-            <para style="terp_tbleheader_details_right">Basic SAL <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+            <para style="terp_tbleheader_details_right">Basic</para>
           </td>
           <td>
-            <para style="terp_tbleheader_details_right">Others <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+            <para style="terp_tbleheader_details_right">Others </para>
           </td>
           <td>
-            <para style="terp_tbleheader_details_right">Allowances <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+            <para style="terp_tbleheader_details_right">Allowances </para>
           </td>
           <td>
-            <para style="terp_tbleheader_details_right">Gross SAL <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+            <para style="terp_tbleheader_details_right">Gross Sal.</para>
           </td>
           <td>
-            <para style="terp_tbleheader_details_right">Deduction <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+            <para style="terp_tbleheader_details_right">Deduction </para>
           </td>
           <td>
-            <para style="terp_tbleheader_details_right">Net SAL <font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+            <para style="terp_tbleheader_details_right">Net Sal.</para>
           </td>
         </tr>
       </blockTable>
-      <para style="space">
+      <para style="P1">
         <font color="white"> </font>
       </para>
     </section>
@@ -198,7 +176,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="space">
+      <para style="P1">
         <font color="white"> </font>
       </para>
     </section>
@@ -210,25 +188,25 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_details">Total SAL<font face="Helvetica" size="7.0">([[ company.currency_id.code]])</font></para>
+          <para style="terp_tblheader_details">Total Salary</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_basic())]][[ company.currency_id.symbol]] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_basic(o))]][[ company.currency_id.symbol]] </para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_other())]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_other(o))]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_allow())]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_allow(o))]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_grows())]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_grows(o))]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct())]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o))]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_net())]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_net(o))]] [[ company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
@@ -265,4 +243,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index 58b2fd81275..cdbbe6bd5f4 100755
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Pay slip" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -333,7 +333,7 @@
           <para style="terp_default_Bold_9">Identification No</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.employee_id.otherid or '' ]]</para>
+          <para style="terp_default_9">[[ o.employee_id.passport_id and o.employee_id.passport_id.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -349,7 +349,7 @@
           <para style="terp_default_Bold_9">Designation </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.employee_id.contract_ids and o.employee_id.contract_ids[0].job_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.employee_id.contract_id and o.employee_id.contract_id.job_id.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -392,7 +392,7 @@
           <para style="terp_default_Bold_9">Basic Salary</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ formatLang(o.basic_before_leaves) ]] [[ o.company_id.currency_id.symbol ]] </para>
+          <para style="terp_default_9">[[ formatLang(o.basic_before_leaves) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Leaved Deduction</para>
@@ -404,7 +404,7 @@
           <para style="terp_default_Bold_9">Basic Salary – Leaves</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_default_9">[[ formatLang(o.basic) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -433,7 +433,7 @@
             <para style="terp_default_9">[[ ld.code ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(ld.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(ld.total) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
           </td>
         </tr>
       </blockTable>
@@ -463,15 +463,15 @@
                 <para style="terp_default_9">Basic Salary</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(o.basic) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
               </td>
             </tr>
             <tr>
               <td>
-                <para style="terp_default_9">[[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code or removeParentNode('tr') ]]</para>
+                <para style="terp_default_9">[[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(a.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(a.total) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
               </td>
             </tr>
           </blockTable>
@@ -488,7 +488,7 @@
                   <para style="terp_default_9">[[ b.code ]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_Right_9">[[ formatLang(b.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
+                  <para style="terp_default_Right_9">[[ formatLang(b.total) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
                 </td>
               </tr>
             </blockTable>
@@ -505,16 +505,16 @@
     <blockTable colWidths="181.0,88.0,177.0,93.0" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Total Earnings<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details">Total Earnings<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.code or '' ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] [[ o.company_id.currency_id.symbol ]] </para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] [[ o.company_id and o.company_id.currency_id.symbol ]] </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Total Deductions<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details">Total Deductions<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.code or '' ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -539,13 +539,13 @@
       <blockTable colWidths="269.0,134.0,135.0" style="Table22">
         <tr>
           <td>
-            <para style="terp_default_9">[[ ol.type in ['advance','loan','otherpay','otherdeduct','installment'] and ol.code or '' ]]</para>
+            <para style="terp_default_9">[[ ol.code or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['otherdeduct','installment'] and o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -558,10 +558,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Net Amount<font face="Helvetica" size="7.0">([[ o.company_id.currency_id.code ]])</font></para>
+          <para style="terp_tblheader_Details">Net Amount<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.code or '' ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -609,4 +609,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index aba8fcf1906..5f81a0942ae 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -394,19 +394,19 @@
             <para style="terp_tblheader_Details">Basic</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.basic ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.basic) ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Allowances</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.advantages_gross ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.advantages_gross) ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Gross Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.gross ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.gross) ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -416,13 +416,13 @@
             <para style="terp_tblheader_Details">Deductions</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.advantages_net ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.advantages_net) ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Net Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ employee.net ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_9">[[ formatLang(employee.net) ]] [[ employee.company_id and employee.company_id.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -473,7 +473,7 @@
                 <para style="terp_default_9">[[ line.name ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ line.amount_type =='per' and (line.amount*100) or line.amount]] [[ get_line_amount_symbol(line.amount_type) ]]</para>
+                <para style="terp_default_Right_9">[[ line.amount_type =='per' and formatLang(line.amount*100) or formatLang(line.amount)]] [[ get_line_amount_symbol(line.amount_type) ]]</para>
               </td>
               <td>
                 <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
@@ -536,7 +536,7 @@
               <para style="terp_default_9">[[ line1.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ line1.amount_type =='per' and (line1.amount*100) or line1.amount ]] [[ get_line_amount_symbol(line1.amount_type) ]]</para>
+              <para style="terp_default_Right_9">[[ line1.amount_type =='per' and formatLang(line1.amount*100) or formatLang(line1.amount) ]] [[ get_line_amount_symbol(line1.amount_type) ]]</para>
             </td>
             <td>
               <para style="terp_default_9">[[ get_line_amount_type(line1.amount_type) ]]</para>
diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index d36df160ad2..f3ecb56aa0b 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -16,7 +16,6 @@ class employees_salary_report(rml_parse.rml_parse):
             'get_employee_detail' : self.get_employee_detail,
             'cal_monthly_amt':self.cal_monthly_amt,
             'get_periods'  : self.get_periods,
-            'get_fiscalyear' : self.get_fiscalyear,
             'get_total' : self.get_total,
             'get_allow':self.get_allow,
             'get_deduct':self.get_deduct,
@@ -29,22 +28,16 @@ class employees_salary_report(rml_parse.rml_parse):
         self.deduct_list = []
         self.other_list = []
         self.month_total_list =[]
-        self.curr_fiscal_year_name=''
-        self.period_ids = []
         self.total=0.00
 
     def get_periods(self,form):
         self.mnths =[]
-        fiscalyear = pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-        curr_fiscalyear_id = form['fiscalyear_id']
-        curr_fiscalyear = fiscalyear.read(self.cr,self.uid,[form['fiscalyear_id']],['date_start','date_stop'])[0]
-
 #       Get start year-month-date and end year-month-date
-        fy = int(curr_fiscalyear['date_start'][0:4])
-        ly = int(curr_fiscalyear['date_stop'][0:4])
+        fy = int(form['date_from'][0:4])
+        ly = int(form['date_to'][0:4])
 
-        fm = int(curr_fiscalyear['date_start'][5:7])
-        lm = int(curr_fiscalyear['date_stop'][5:7])
+        fm = int(form['date_from'][5:7])
+        lm = int(form['date_to'][5:7])
         no_months = (ly-fy)*12+lm-fm + 1
         cm = fm
         cy = fy
@@ -61,21 +54,12 @@ class employees_salary_report(rml_parse.rml_parse):
             cm = cm +1
         return [mnth_name]
 
-    def get_fiscalyear(self,fiscalyear_id):
-        fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-        return fiscalyear_obj.read(self.cr,self.uid,[fiscalyear_id],['name'])[0]['name']
-
     def get_employee(self,form):
         result = []
         periods = []
         emp = pooler.get_pool(self.cr.dbname).get('hr.employee')
         emp_ids = form['employee_ids']
         result = emp.browse(self.cr,self.uid, emp_ids)
-        fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear_id'])
-        period_ids_l = fiscalyear_obj.period_ids
-        for period in period_ids_l:
-            periods.append(period.id)
-        self.period_ids = ','.join(map(str, periods))
         return result
 
     def get_employee_detail(self,obj):
@@ -89,12 +73,12 @@ class employees_salary_report(rml_parse.rml_parse):
         self.total = 0.00
         payment_category = self.pool.get('hr.allounce.deduction.categoty')
         payslip = self.pool.get('hr.payslip')
-        allowance_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','allow')])
-        deduction_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','deduct')])
-        other_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','other')])
+        allowance_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','allowance')])
+        deduction_cat_ids = payment_category.search( self.cr, self.uid, [('type','=','deduction')])
+        other_cat_ids = payment_category.search( self.cr, self.uid, [('type','in',('advance','loan','installment','otherpay','otherdeduct'))])
         #for Basic Salary
         res = []
-        res = self.cal_monthly_amt(obj.id,None)
+        res = self.cal_monthly_amt(obj.id,False)
         self.total += res[len(res)-1]
         basic_flag = False
         for i in range(1,len(res)):
@@ -152,7 +136,7 @@ class employees_salary_report(rml_parse.rml_parse):
         for mnth in self.mnths:
             if len(mnth) != 7:
                 mnth = '0' + str(mnth)
-            query = "select id from hr_payslip where employee_id = "+str(emp_id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' and period_id in "+"("+ self.period_ids +")" +""
+            query = "select id from hr_payslip where employee_id = "+str(emp_id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
             self.cr.execute(query)
             payslip_id = self.cr.dictfetchone()
             if payslip_id:
@@ -166,7 +150,7 @@ class employees_salary_report(rml_parse.rml_parse):
                     append_index = 0
                     for line in payslip_obj.line_ids:
                         if line.category_id.id == category:
-                            if category_name['type'] == 'allow':
+                            if category_name['type'] == 'allowance':
                                 if res:
                                     self.month_total_list[cnt] = self.month_total_list[cnt] + line.total
                                     result[append_index] += line.total
@@ -178,7 +162,7 @@ class employees_salary_report(rml_parse.rml_parse):
                                     res[mnth] = line.total
                                     append_index = len(result) - 1
                                     result.append(line.total)
-                            if category_name['type'] == 'deduct':
+                            if category_name['type'] == 'deduction':
                                 if res:
                                     self.month_total_list[cnt] = self.month_total_list[cnt] - line.total
                                     result[append_index] += line.total
@@ -190,7 +174,7 @@ class employees_salary_report(rml_parse.rml_parse):
                                     res[mnth] = line.total
                                     append_index = len(result) - 1
                                     result.append(line.total)
-                            if category_name['type'] == 'other':
+                            if category_name['type'] in ('advance','loan','installment','otherpay','otherdeduct'):
                                 if res:
                                     result[append_index] += line.total
                                     tot += line.total
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 1988d932ce2..e1bd6c3b3c8 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Employees Salary Details" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
     </pageTemplate>
@@ -246,15 +246,12 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] [[ get_employee_detail(o) ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
     <blockTable colWidths="1063.0" style="Table12">
       <tr>
         <td>
           <para style="P2">Employees Salary Details </para>
-          <para style="terp_default_Centre_9">For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]</para>
+          <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -292,7 +289,7 @@
           <para style="terp_default_9">[[ o.name ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Other Id</para>
+          <para style="terp_tblheader_Details">Other No.</para>
         </td>
         <td>
           <para style="terp_default_9">[[ o.otherid or '' ]]</para>
@@ -331,8 +328,8 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
+      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Title</para>
@@ -394,49 +391,49 @@
         </blockTable>
         <section>
           <para style="terp_default_9">[[ repeatIn(get_allow(),'e1') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e1[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -453,49 +450,49 @@
         </blockTable>
         <section>
           <para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e2[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -512,49 +509,49 @@
         </blockTable>
         <section>
           <para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
-          <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
+          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e3[0] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]]</para>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index ff793469284..8fe18772c2f 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -151,7 +151,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_Bold_9">[[ o.bank or 'Bank' ]]</para>
+          <para style="terp_default_Bold_9">[[ o.bank_id and o.bank_id.name or 'Bank' ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">
@@ -199,10 +199,10 @@
           <para style="terp_tblheader_Details">Name of the Employee</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Amount</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">By Sal([[ company.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">By Salary</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Bank Account</para>
diff --git a/addons/hr_payroll/report/report_payroll_register.py b/addons/hr_payroll/report/report_payroll_register.py
index b146e2900af..e991ede4903 100644
--- a/addons/hr_payroll/report/report_payroll_register.py
+++ b/addons/hr_payroll/report/report_payroll_register.py
@@ -37,22 +37,34 @@ class report_payroll_register(report_sxw.rml_parse):
         self.deduct += line.deduction
         self.net += line.net
         
-    def get_basic(self):
+    def get_basic(self,obj):
+        for line in obj.line_ids:
+            self.basic += line.basic
         return self.basic
     
-    def get_other(self):
+    def get_other(self,obj):
+        for line in obj.line_ids:
+            self.other += line.other_pay
         return self.other
         
-    def get_allow(self):
+    def get_allow(self,obj):
+        for line in obj.line_ids:
+            self.allow += line.allounce
         return self.allow
         
-    def get_grows(self):
+    def get_grows(self,obj):
+        for line in obj.line_ids:
+            self.grows += line.grows
         return self.grows
     
-    def get_deduct(self):
+    def get_deduct(self,obj):
+        for line in obj.line_ids:
+            self.deduct += line.deduction
         return self.deduct
         
-    def get_net(self):
+    def get_net(self,obj):
+        for line in obj.line_ids:
+            self.net += line.net
         return self.net
         
     def get_month(self, indate):
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index e818e0f3727..7de5dfee0d9 100755
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -49,7 +49,7 @@ class payslip_report(report_sxw.rml_parse):
           res = []
           ids = []
           for id in range(len(obj)):
-              if obj[id].category_id.type == 'other' and obj[id].type != 'leaves':
+              if obj[id].category_id.type in ('advance','loan','otherpay','otherdeduct','installment'):
                  ids.append(obj[id].id)
           payslip_line = self.pool.get('hr.payslip.line')
           if len(ids):
@@ -71,7 +71,7 @@ class payslip_report(report_sxw.rml_parse):
           res = []
           ids = []
           for id in range(len(obj)):
-              if obj[id].category_id.type == 'allow' and obj[id].type != 'leaves':
+              if obj[id].category_id.type == 'allowance' and obj[id].type != 'leaves':
                  ids.append(obj[id].id)
           payslip_line = self.pool.get('hr.payslip.line')
           if len(ids):
@@ -82,7 +82,7 @@ class payslip_report(report_sxw.rml_parse):
           res = []
           ids = []
           for id in range(len(obj)):
-              if obj[id].category_id.type == 'deduct' and obj[id].type != 'leaves':
+              if obj[id].category_id.type == 'deduction' and obj[id].type != 'leaves':
                  ids.append(obj[id].id)
           payslip_line = self.pool.get('hr.payslip.line')
           if len(ids):
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 4c32436955a..052af6f4701 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Yearly Salary Details" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
     </pageTemplate>
@@ -128,13 +128,13 @@
       <font color="white"> </font>
     </para>
     <para style="terp_header_Centre">Yearly Salary Details </para>
-    <para style="terp_default_Centre_9">For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]</para>
+    <para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
     <para style="terp_default_space">
       <font color="white"> </font>
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Name</para>
@@ -176,7 +176,7 @@
             <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">Total([[company.currency_id.code]])</para>
+            <para style="terp_tblheader_Details_Right">Total</para>
           </td>
         </tr>
       </blockTable>
@@ -185,7 +185,7 @@
       </para>
       <section>
         <para style="terp_default_9">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
-        <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
+        <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
           <tr>
             <td>
               <para style="terp_default_9">[[ e[0] ]]</para>
@@ -244,10 +244,10 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(get_months_tol(),'t') ]]</para>
-      <blockTable colWidths="100.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+      <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_tblheader_Details">Total([[company.currency_id.code]])</para>
+            <para style="terp_tblheader_Details">Total</para>
           </td>
           <td>
             <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]] [[company.currency_id.symbol]]</para>
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index a85d7328973..b23effbeccb 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -15,26 +15,20 @@ class year_salary_report(rml_parse.rml_parse):
             'get_employee' : self.get_employee,
             'get_periods'  : self.get_periods,
             'get_months_tol' : self.get_months_tol,
-            'get_fiscalyear' : self.get_fiscalyear,
             'get_total' : self.get_total,
         })
 
         self.mnths =[]
         self.mnths_tol = []
-        self.curr_fiscal_year_name=''
         self.total=0.0
 
     def get_periods(self,form):
-        fiscalyear = pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-        curr_fiscalyear_id = form['fiscalyear_id']
-        curr_fiscalyear = fiscalyear.read(self.cr,self.uid,[form['fiscalyear_id']],['date_start','date_stop'])[0]
-
 #       Get start year-month-date and end year-month-date
-        fy = int(curr_fiscalyear['date_start'][0:4])
-        ly = int(curr_fiscalyear['date_stop'][0:4])
+        fy = int(form['date_from'][0:4])
+        ly = int(form['date_to'][0:4])
 
-        fm = int(curr_fiscalyear['date_start'][5:7])
-        lm = int(curr_fiscalyear['date_stop'][5:7])
+        fm = int(form['date_from'][5:7])
+        lm = int(form['date_to'][5:7])
         no_months = (ly-fy)*12+lm-fm + 1
         cm = fm
         cy = fy
@@ -51,11 +45,6 @@ class year_salary_report(rml_parse.rml_parse):
             cm = cm +1
         return [mnth_name]
 
-    def get_fiscalyear(self,fiscalyear_id):
-        fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
-        return fiscalyear_obj.read(self.cr,self.uid,[fiscalyear_id],['name'])[0]['name']
-
-
     def get_employee(self,form):
         ls1=[]
         ls = []
@@ -64,11 +53,6 @@ class year_salary_report(rml_parse.rml_parse):
         emp = pooler.get_pool(self.cr.dbname).get('hr.employee')
         emp_ids = form['employee_ids']
         empll  = emp.browse(self.cr,self.uid, emp_ids)
-        fiscalyear_obj = pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, form['fiscalyear_id'])
-        period_ids_l = fiscalyear_obj.period_ids
-        for period in period_ids_l:
-            periods.append(period.id)
-        periods_ids = ','.join(map(str, periods))
         cnt = 1
         for emp_id in empll:
             ls1.append(emp_id.name)
@@ -76,7 +60,7 @@ class year_salary_report(rml_parse.rml_parse):
             for mnth in self.mnths:
                 if len(mnth) != 7:
                     mnth = '0' + str(mnth)
-                query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' and period_id in "+"("+ periods_ids +")" +""
+                query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
                 self.cr.execute(query)
                 sal = self.cr.fetchall()
                 try:
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
index c2d0e3c4116..3cd204d76b3 100755
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
@@ -29,18 +29,23 @@ class hr_payroll_employees_detail(osv.osv_memory):
    _name ='hr.payroll.employees.detail'
    _columns = {
         'employee_ids': fields.many2many('hr.employee', 'payroll_emp_rel','payroll_id','emp_id', 'Employees',required=True),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)
+        'date_from': fields.date('Start Date', required=True),
+        'date_to': fields.date('End Date', required=True),
+        #'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)
        }
-   def _get_fiscalyear(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        fiscal_ids = self.pool.get('account.fiscalyear').search(cr,uid,[], context=context)
-        if fiscal_ids:
-            return fiscal_ids[0]
-        return False
+#   def _get_fiscalyear(self, cr, uid, ids, context=None):
+#        if context is None:
+#            context = {}
+#        fiscal_ids = self.pool.get('account.fiscalyear').search(cr,uid,[], context=context)
+#        if fiscal_ids:
+#            return fiscal_ids[0]
+#        return False
 
    _defaults = {
-        'fiscalyear_id':_get_fiscalyear,
+#        'fiscalyear_id':_get_fiscalyear,
+        'date_from':time.strftime('%Y-01-01'),
+        'date_to':time.strftime('%Y-%m-%d'),
+
     }
 
    def print_report(self, cr, uid, ids, context=None):
@@ -56,7 +61,7 @@ class hr_payroll_employees_detail(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
 
-        res = self.read(cr, uid, ids, ['employee_ids', 'fiscalyear_id'], context=context)
+        res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         return {
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
index a6c539ddae8..e65278e1b94 100644
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.xml
@@ -7,12 +7,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Year Salary">
-                 <group col="4" colspan="4"  width="600">
-			    	<group col="2" colspan="1">
-				    	<field name="fiscalyear_id"  align="1.0" />
+                 <group col="4" colspan="4">
+			    	<group colspan="4">
+                        <field name="date_from" colspan="2"/>
+                        <field name="date_to" colspan="2"/>
 				    	<newline/>
 				    	<separator string="Employees" colspan="4"/>
-				    	<field name="employee_ids"  nolabel="1" colspan="2" />
+				    	<field name="employee_ids"  nolabel="1" colspan="4" />
 			    	</group>
 			    	<newline/>
 			    	<group col="2" colspan="1">
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
index a7091540894..5522e797d87 100755
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
@@ -28,20 +28,24 @@ class hr_payroll_year_salary(osv.osv_memory):
    _name = "hr.payroll.year.salary"
    _columns = {
         'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel','payroll_year_id','emp_id', 'Employees',required=True),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)  ,
+        'date_from': fields.date('Start Date', required=True),
+        'date_to': fields.date('End Date', required=True),
+        #'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True)  ,
         'salary_on': fields.selection([('current_month','Current Month Date'),('next_month','Next Month Date')],'Salary On'),
        }
 
-   def _get_fiscalyear(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        fiscal_ids=self.pool.get('account.fiscalyear').search(cr, uid, [], context=context)
-        if fiscal_ids:
-            return fiscal_ids[0]
-        return False
+#   def _get_fiscalyear(self, cr, uid, ids, context=None):
+#        if context is None:
+#            context = {}
+#        fiscal_ids=self.pool.get('account.fiscalyear').search(cr, uid, [], context=context)
+#        if fiscal_ids:
+#            return fiscal_ids[0]
+#        return False
 
    _defaults = {
-        'fiscalyear_id':_get_fiscalyear,
+       # 'fiscalyear_id':_get_fiscalyear,
+        'date_from':time.strftime('%Y-01-01'),
+        'date_to':time.strftime('%Y-%m-%d'),
         'salary_on': 'current_month'
     }
 
@@ -58,7 +62,7 @@ class hr_payroll_year_salary(osv.osv_memory):
             context = {}
         datas = {'ids': context.get('active_ids', [])}
 
-        res = self.read(cr, uid, ids, ['employee_ids', 'fiscalyear_id','salary_on'], context=context)
+        res = self.read(cr, uid, ids, ['employee_ids',  'date_from', 'date_to', 'salary_on'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         return {
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.xml b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
index 0360f8fc9b2..9d0252ca075 100644
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.xml
@@ -7,16 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			   <form string="Year Salary">
-			   <group col="4" colspan="4"  width="600">
-			   <group col="3" colspan="1">
-				    <field name="fiscalyear_id" select="1" colspan="2"/>
+			   <group col="4" colspan="4" >
+			   <group colspan="4">
+	                <field name="date_from" colspan="2"/>
+	                <field name="date_to" colspan="2"/>
 				    <newline/>
 				    <separator string="Employees" colspan="4"/>
-				    <field name="employee_ids"  nolabel="1" colspan="2"/>
+				    <field name="employee_ids"  nolabel="1" colspan="4"/>
 					<newline/>
-			    	<separator string="Salary Deposit Date Option?" colspan="2"/>
-			    	<newline/>
-			    	<field name="salary_on"/>
 				</group>
 			    <newline/>
 			    <group>

From 2171202b324551e15050663ef61a2fddb4707357 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 8 Oct 2010 16:03:49 +0200
Subject: [PATCH 483/632] [IMP] translations: support generic "report"
 translation type + export from *.mako files + multiple types for
 _get_source() + lint cleanup

bzr revid: odo@openerp.com-20101008140349-9hclfqwjmndkrtn4
---
 bin/addons/base/ir/ir_translation.py | 18 +++++----
 bin/tools/translate.py               | 57 ++++++++++++++--------------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index 631e42eb39b..6f8a4affbe9 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -25,7 +25,8 @@ import tools
 TRANSLATION_TYPE = [
     ('field', 'Field'),
     ('model', 'Object'),
-    ('rml', 'RML'),
+    ('rml', 'RML  (deprecated - use Report)'), # Pending deprecation - to be replaced by report!
+    ('report', 'Report/Template'),
     ('selection', 'Selection'),
     ('view', 'View'),
     ('wizard_button', 'Wizard Button'),
@@ -131,14 +132,14 @@ class ir_translation(osv.osv):
         return len(ids)
 
     @tools.cache(skiparg=3)
-    def _get_source(self, cr, uid, name, tt, lang, source=None):
+    def _get_source(self, cr, uid, name, types, lang, source=None):
         """
         Returns the translation for the given combination of name, type, language
         and source. All values passed to this method should be unicode (not byte strings),
         especially ``source``.
 
         :param name: identification of the term to translate, such as field name
-        :param type: type of term to translate (see ``type`` field on ir.translation)
+        :param types: single string defining type of term to translate (see ``type`` field on ir.translation), or sequence of allowed types (strings)
         :param lang: language code of the desired translation
         :param source: optional source term to translate (should be unicode)
         :rtype: unicode
@@ -147,24 +148,25 @@ class ir_translation(osv.osv):
         """
         # FIXME: should assert that `source` is unicode and fix all callers to always pass unicode
         # so we can remove the string encoding/decoding.
-
         if not lang:
             return u''
+        if isinstance(types, basestring):
+            types = (types,)
         if source:
             cr.execute('select value ' \
                     'from ir_translation ' \
                     'where lang=%s ' \
-                        'and type=%s ' \
+                        'and type in %s ' \
                         'and name=%s ' \
                         'and src=%s',
-                    (lang or '', tt, tools.ustr(name), source))
+                    (lang or '', types, tools.ustr(name), source))
         else:
             cr.execute('select value ' \
                     'from ir_translation ' \
                     'where lang=%s ' \
-                        'and type=%s ' \
+                        'and type in %s ' \
                         'and name=%s',
-                    (lang or '', tt, tools.ustr(name)))
+                    (lang or '', types, tools.ustr(name)))
         res = cr.fetchone()
         trad = res and res[0] or u''
         if source and not trad:
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 64f742924f3..b9ce95cdaaa 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -23,6 +23,7 @@ import codecs
 import csv
 import fnmatch
 import inspect
+import itertools
 import locale
 import os
 import re
@@ -34,8 +35,7 @@ import logging
 from datetime import datetime
 from lxml import etree
 
-import osv, tools, pooler
-import ir
+import tools, pooler
 import netsvc
 from tools.misc import UpdateableStr
 
@@ -472,7 +472,6 @@ def trans_generate(lang, modules, dbname=None):
 
     query = 'SELECT name, model, res_id, module'    \
             '  FROM ir_model_data'
-    query_param = None
     if 'all_installed' in modules:
         query += ' WHERE module IN ( SELECT name FROM ir_module_module WHERE state = \'installed\') '
     query_param = None
@@ -589,7 +588,7 @@ def trans_generate(lang, modules, dbname=None):
                         push_translation(module, 'model', name, 0, encode(obj_value[field_name]))
 
             if hasattr(field_def, 'selection') and isinstance(field_def.selection, (list, tuple)):
-                for key, val in field_def.selection:
+                for dummy, val in field_def.selection:
                     push_translation(module, 'selection', name, 0, encode(val))
 
         elif model=='ir.actions.report.xml':
@@ -598,19 +597,18 @@ def trans_generate(lang, modules, dbname=None):
             if obj.report_rml:
                 fname = obj.report_rml
                 parse_func = trans_parse_rml
-                report_type = "rml"
+                report_type = "report"
             elif obj.report_xsl:
                 fname = obj.report_xsl
                 parse_func = trans_parse_xsl
                 report_type = "xsl"
-            try:
-                xmlstr = tools.file_open(fname).read()
-                d = etree.XML(xmlstr)
-                for t in parse_func(d):
-                    push_translation(module, report_type, name, 0, t)
-            except IOError, etree.XMLSyntaxError:
-                if fname:
-                    logger.notifyChannel("i18n", netsvc.LOG_ERROR, "couldn't export translation for report %s %s %s" % (name, report_type, fname))
+            if fname and obj.report_type in ('pdf', 'xsl'):
+                try:
+                    d = etree.parse(tools.file_open(fname))
+                    for t in parse_func(d):
+                        push_translation(module, report_type, name, 0, t)
+                except (IOError, etree.XMLSyntaxError):
+                    logging.getLogger("i18n").exception("couldn't export translation for report %s %s %s", name, report_type, fname)
 
         for constraint in pool.get(model)._constraints:
             msg = constraint[1]
@@ -666,22 +664,25 @@ def trans_generate(lang, modules, dbname=None):
     else :
         path_list = [root_path,tools.config['addons_path']]
 
-    for path in path_list:
-        for root, dirs, files in tools.osutil.walksymlinks(path):
-            for fname in fnmatch.filter(files, '*.py'):
-                fabsolutepath = join(root, fname)
-                frelativepath = fabsolutepath[len(path):]
-                module = get_module_from_path(frelativepath)
-                is_mod_installed = module in installed_modules
-                if (('all' in modules) or (module in modules)) and is_mod_installed:
-                    code_string = tools.file_open(fabsolutepath, subdir='').read()
-                    iter = re.finditer('[^a-zA-Z0-9_]_\([\s]*["\'](.+?)["\'][\s]*\)',
-                        code_string, re.S)
+    def export_code_terms_from_file(fname, path, root, terms_type):
+        fabsolutepath = join(root, fname)
+        frelativepath = fabsolutepath[len(path):]
+        module = get_module_from_path(frelativepath)
+        is_mod_installed = module in installed_modules
+        if (('all' in modules) or (module in modules)) and is_mod_installed:
+            code_string = tools.file_open(fabsolutepath, subdir='').read()
+            iter = re.finditer('[^a-zA-Z0-9_]_\([\s]*["\'](.+?)["\'][\s]*\)', code_string, re.S)
+            if module in installed_modules:
+                frelativepath = str("addons" + frelativepath)
+            for i in iter:
+                push_translation(module, terms_type, frelativepath, 0, encode(i.group(1)))
 
-                    if module in installed_modules :
-                        frelativepath =str("addons"+frelativepath)
-                    for i in iter:
-                        push_translation(module, 'code', frelativepath, 0, encode(i.group(1)))
+    for path in path_list:
+        for root, dummy, files in tools.osutil.walksymlinks(path):
+            for fname in itertools.chain(fnmatch.filter(files, '*.py')):
+                export_code_terms_from_file(fname, path, root, 'code')
+            for fname in itertools.chain(fnmatch.filter(files, '*.mako')):
+                export_code_terms_from_file(fname, path, root, 'report')
 
 
     out = [["module","type","name","res_id","src","value"]] # header

From 48f0a8554eef524fa8a22860fe0e8299cf2d1587 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 8 Oct 2010 19:41:43 +0530
Subject: [PATCH 484/632] [IMP]: improve the usability for the payslip line

bzr revid: mga@tinyerp.com-20101008141143-k2l0txnqr3y7j44g
---
 addons/hr_payroll/hr_payroll_view.xml | 113 +++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index cf45b77fbe6..0b06790407d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -152,8 +152,8 @@
                                         <group col="2" colspan="2">
                                             <separator colspan="2" string="Advantages"/>
                                             <field name="struct_id" select="1"/>
-                                            <field name="advantages_net"/>
                                             <field name="advantages_gross"/>
+                                            <field name="advantages_net"/>
                                             <field name="advantages" nolabel="1" colspan="2"/>
                                         </group>
                                     </page>
@@ -197,6 +197,42 @@
                                 <field name="amount_type"/>
                                 <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
                             </tree>
+                            <form string="Payslip Line">
+                                <group col="6" colspan="4">
+                                    <field name="name" colspan="4" select="1"/>
+                                    <field name="code" select="1"/>
+                                </group>
+                                <group col="2" colspan="2">
+                                    <separator colspan="4" string="Calculations"/>
+                                    <field name="category_id" on_change="onchange_category(category_id)"/>
+                                    <field name="type"/>
+                                    <field name="amount_type"/>
+                                    <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                                    <field name="sequence" groups="base.group_extended"/>
+                                </group>
+                                <group col="2" colspan="2">
+                                    <separator colspan="4" string="Company contribution"/>
+                                    <field name="company_contrib"/>
+                                </group>
+                                <notebook colspan="4">
+                                    <page string="Function">
+                                        <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
+                                            <tree string="Function Arguments" editable="bottom">
+                                                <field name="name"/>
+                                                <field name="sequence" groups="base.group_extended"/>
+                                                <field name="from_val"/>
+                                                <field name="to_val"/>
+                                                <field name="amount_type"/>
+                                                <field name="value"/>
+                                            </tree>
+                                        </field>
+                                    </page>
+                                    <page string="Description">
+                                        <separator colspan="4" string="Description"/>
+                                        <field name="note" colspan="4" nolabel="1"/>
+                                    </page>
+                                </notebook>
+                            </form>
                         </field>
                     </page>
                 </xpath>
@@ -302,7 +338,44 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Salary Structure">
-                            <field name="line_ids" nolabel="1" colspan="4"/>
+                            <field name="line_ids" nolabel="1" colspan="4">
+                                <form string="Payslip Line">
+                                    <group col="6" colspan="4">
+                                        <field name="name" colspan="4" select="1"/>
+                                        <field name="code" select="1"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Calculations"/>
+                                        <field name="category_id" on_change="onchange_category(category_id)"/>
+                                        <field name="type"/>
+                                        <field name="amount_type"/>
+                                        <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Company contribution"/>
+                                        <field name="company_contrib"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Function">
+                                            <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
+                                                <tree string="Function Arguments" editable="bottom">
+                                                    <field name="name"/>
+                                                    <field name="sequence" groups="base.group_extended"/>
+                                                    <field name="from_val"/>
+                                                    <field name="to_val"/>
+                                                    <field name="amount_type"/>
+                                                    <field name="value"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Description">
+                                            <separator colspan="4" string="Description"/>
+                                            <field name="note" colspan="4" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -454,6 +527,42 @@
                                     <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
                                     <field name="total"/>
                                 </tree>
+                                <form string="Payslip Line">
+                                    <group col="6" colspan="4">
+                                        <field name="name" colspan="4" select="1"/>
+                                        <field name="code" select="1"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Calculations"/>
+                                        <field name="category_id" on_change="onchange_category(category_id)"/>
+                                        <field name="type"/>
+                                        <field name="amount_type"/>
+                                        <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Company contribution"/>
+                                        <field name="company_contrib"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Function">
+                                            <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
+                                                <tree string="Function Arguments" editable="bottom">
+                                                    <field name="name"/>
+                                                    <field name="sequence" groups="base.group_extended"/>
+                                                    <field name="from_val"/>
+                                                    <field name="to_val"/>
+                                                    <field name="amount_type"/>
+                                                    <field name="value"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Description">
+                                            <separator colspan="4" string="Description"/>
+                                            <field name="note" colspan="4" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
                             </field>
                             <group col="6" colspan="4">
                                 <separator string="Computation Overview" colspan="6"/>

From f92f272130c06d87cdde64bbe1d4c1f9f99cfb33 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 8 Oct 2010 16:23:01 +0200
Subject: [PATCH 485/632] [IMP] reports: support generic report_file field
 instead of report_xml ; add "file" attribute for <report> ;  pending better
 refactoring after v6.0

bzr revid: odo@openerp.com-20101008142301-0os4ajp8xb9kt3cy
---
 bin/addons/base/ir/ir.xml        |  4 ++--
 bin/addons/base/ir/ir_actions.py |  8 ++++++--
 bin/import_xml.rng               |  3 ++-
 bin/report/report_sxw.py         | 22 +++++++---------------
 bin/tools/convert.py             |  2 +-
 bin/tools/yaml_import.py         |  2 +-
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 8d35e469bd8..5821e3cafdb 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -433,15 +433,14 @@
 
                         <field name="report_name" select="1"/>
                         <field name="report_type"/>
+                        <field name="report_file"/>
                     </group>
 
                     <notebook colspan="4">
                         <page string="Other Configuration">
                             <group col="2" colspan="2">
                                 <separator string="RML Report" colspan="2"/>
-                                <field name="report_rml"/>
                                 <field name="header"/>
-                                <field name="auto"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="XML Report" colspan="2"/>
@@ -456,6 +455,7 @@
                             <group col="2" colspan="2">
                                 <separator string="Miscellaneous" colspan="2"/>
                                 <field name="multi"/>
+                                <field name="auto"/>
                             </group>
                         </page>
                         <page string="Security">
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 297aebaf5dc..195241afb21 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -114,9 +114,13 @@ class report_xml(osv.osv):
 
         'report_xsl': fields.char('XSL path', size=256),
         'report_xml': fields.char('XML path', size=256, help=''),
-        'report_rml': fields.char('RML path', size=256, help="The .rml path of the file or NULL if the content is in report_rml_content"),
-        'report_sxw': fields.function(_report_sxw, method=True, type='char', string='SXW path'),
 
+        # Pending deprecation... to be replaced by report_file as this object will become the default report object (not so specific to RML anymore)
+        'report_rml': fields.char('Main report file path', size=256, help="The path to the main report file (depending on Report Type) or NULL if the content is in another data field"),
+        # temporary related field as report_rml is pending deprecation - this field will replace report_rml after v6.0
+        'report_file': fields.related('report_rml', type="char", size=256, required=False, readonly=False, string='Report file', help="The path to the main report file (depending on Report Type) or NULL if the content is in another field", store=True),
+
+        'report_sxw': fields.function(_report_sxw, method=True, type='char', string='SXW path'),
         'report_sxw_content_data': fields.binary('SXW content'),
         'report_rml_content_data': fields.binary('RML content'),
         'report_sxw_content': fields.function(_report_content, fnct_inv=_report_content_inv, method=True, type='binary', string='SXW content',),
diff --git a/bin/import_xml.rng b/bin/import_xml.rng
index 2ddc2336cc0..7b5a889a110 100644
--- a/bin/import_xml.rng
+++ b/bin/import_xml.rng
@@ -104,7 +104,8 @@
             <rng:optional><rng:attribute name="multi"/></rng:optional>
             <rng:optional><rng:attribute name="menu"/></rng:optional>
             <rng:optional><rng:attribute name="keyword"/></rng:optional>
-            <rng:optional><rng:attribute name="rml"/></rng:optional>
+            <rng:optional><rng:attribute name="rml"/></rng:optional><!-- pending deprecation after v6.0 -->
+            <rng:optional><rng:attribute name="file"/></rng:optional>
             <rng:optional><rng:attribute name="sxw"/></rng:optional>
             <rng:optional><rng:attribute name="xml"/></rng:optional>
             <rng:optional><rng:attribute name="xsl"/></rng:optional>
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 3cd448eac58..7707ef2fff0 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -19,24 +19,18 @@
 #
 ##############################################################################
 from lxml import etree
-import traceback, sys
 import StringIO
 import cStringIO
 import base64
-import copy
-import locale
 from datetime import datetime
 import os
 import re
 import time
 from interface import report_rml
 import preprocess
-import ir
-import netsvc
-import osv
+import logging
 import pooler
 import tools
-import warnings
 import zipfile
 import common
 from osv.fields import float as float_class, function as function_class
@@ -319,7 +313,7 @@ class rml_parse(object):
                 if not self._transl_regex.match(piece_list[pn]):
                     source_string = piece_list[pn].replace('\n', ' ').strip()
                     if len(source_string):
-                        translated_string = transl_obj._get_source(self.cr, self.uid, self.name, 'rml', lang, source_string)
+                        translated_string = transl_obj._get_source(self.cr, self.uid, self.name, ('report', 'rml'), lang, source_string)
                         if translated_string:
                             piece_list[pn] = piece_list[pn].replace(source_string, translated_string)
             text = ''.join(piece_list)
@@ -434,8 +428,8 @@ class report_sxw(report_rml, preprocess.report):
                 result = self.create_single_pdf(cr, uid, [obj.id], data, report_xml, context)
                 if not result:
                     return False
-                try:
-                    if aname:
+                if aname:
+                    try:
                         name = aname+'.'+result[1]
                         pool.get('ir.attachment').create(cr, uid, {
                             'name': aname,
@@ -445,11 +439,9 @@ class report_sxw(report_rml, preprocess.report):
                             'res_id': obj.id,
                             }, context=context
                         )
-                        cr.commit()
-                except Exception,e:
-                     import traceback, sys
-                     tb_s = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-                     netsvc.Logger().notifyChannel('report', netsvc.LOG_ERROR,str(e))
+                    except Exception:
+                        #TODO: should probably raise a proper osv_except instead, shouldn't we? see LP bug #325632
+                        logging.getLogger('report').error('Could not create saved report attachment', exc_info=True)
                 results.append(result)
             if results:
                 if results[0][1]=='pdf':
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index a8749514958..ec3869f322f 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -300,7 +300,7 @@ form: module.record_id""" % (xml_id,)
         for dest,f in (('name','string'),('model','model'),('report_name','name')):
             res[dest] = rec.get(f,'').encode('utf8')
             assert res[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if rec.get(field):
                 res[dest] = rec.get(field).encode('utf8')
         if rec.get('auto'):
diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 814779b3f36..7f271767a04 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -675,7 +675,7 @@ class YamlInterpreter(object):
         for dest, f in (('name','string'), ('model','model'), ('report_name','name')):
             values[dest] = getattr(node, f)
             assert values[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if getattr(node, field):
                 values[dest] = getattr(node, field)
         if node.auto:

From 900be54ed61a2efd4ff87d9a1e27813dacec7acb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 16:40:49 +0200
Subject: [PATCH 486/632] [IMP] misc useability improvements

bzr revid: fp@tinyerp.com-20101008144049-2deun7vlgd6ek1be
---
 addons/account/__openerp__.py                 |   8 +-
 addons/account/account_invoice_view.xml       |   3 +-
 addons/account/account_menuitem.xml           |   2 +-
 addons/base_setup/todo.py                     |   4 +-
 addons/crm/crm.py                             |  82 ------
 addons/crm/crm_lead.py                        |   6 +-
 addons/crm/crm_lead_view.xml                  |  25 +-
 addons/crm/crm_opportunity_view.xml           |  10 +-
 addons/crm/crm_view.xml                       | 252 ------------------
 addons/crm/security/ir.model.access.csv       |   4 -
 addons/crm/wizard/crm_lead_to_opportunity.py  |  13 +-
 .../wizard/crm_lead_to_opportunity_view.xml   |   4 +-
 addons/sale/sale.py                           |   3 +-
 addons/sale/sale_view.xml                     |   7 +-
 addons/sale_crm/sale_crm_view.xml             |  82 +++---
 addons/sale_crm/test/sale_crm.yml             |  10 +-
 addons/sale_crm/wizard/crm_make_sale.py       |  70 +----
 addons/sale_crm/wizard/crm_make_sale_view.xml |  48 +---
 18 files changed, 82 insertions(+), 551 deletions(-)

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 271cc92e41c..7229f1d3364 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -49,6 +49,10 @@ module named account_voucher.
         'security/ir.model.access.csv',
         'account_menuitem.xml',
         'account_wizard.xml',
+        'report/account_invoice_report_view.xml',
+        'report/account_entries_report_view.xml',
+        'report/account_report_view.xml',
+        'report/account_analytic_entries_report_view.xml',
         'wizard/account_move_bank_reconcile_view.xml',
         'wizard/account_use_model_view.xml',
         'account_installer.xml',
@@ -106,10 +110,6 @@ module named account_voucher.
         'process/supplier_invoice_process.xml',
         'sequence_view.xml',
         'company_view.xml',
-        'report/account_invoice_report_view.xml',
-        'report/account_entries_report_view.xml',
-        'report/account_report_view.xml',
-        'report/account_analytic_entries_report_view.xml',
         'board_account_view.xml',
         "wizard/account_report_profit_loss_view.xml",
         "wizard/account_report_balance_sheet_view.xml"
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1db17ed16cf..bb9f15d1f88 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -308,9 +308,10 @@
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
 
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-camera_test"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
+                                    <button name="%(account_invoices)d" type='action' string='Print' states='open' icon="gtk-print"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index fc4d350ea36..fac1a1eec4d 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -25,7 +25,7 @@
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="group_account_manager"/>
-        <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4"
         groups="group_account_user,group_account_manager"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/>
 
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 5f293257a91..7be56f9eabe 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -86,7 +86,7 @@ class base_setup_company(osv.osv_memory):
         'street2':fields.char('Street 2', size=128),
         'zip':fields.char('Zip Code', size=24),
         'city':fields.char('City', size=128),
-        'state_id':fields.selection(_get_all_states, 'State'),
+        'state_id':fields.selection(_get_all_states, 'Fed. State'),
         'country_id':fields.selection(_get_all_countries, 'Country'),
         'email':fields.char('E-mail', size=64),
         'phone':fields.char('Phone', size=64),
@@ -105,7 +105,7 @@ We suggest you to put bank information here:
 IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
         'logo':fields.binary('Logo'),
         'account_no':fields.char('Account No', size=64),
-        'website': fields.char('Web', size=64),
+        'website': fields.char('Company Website', size=64, help="Exemple: http://openerp.com"),
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 76ac424f1e0..71415038a58 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -670,85 +670,3 @@ class res_partner(osv.osv):
     }
 res_partner()
 
-
-class crm_case_section_custom(osv.osv):
-    _name = "crm.case.section.custom"
-    _description = 'Custom CRM Case Teams' 
-    _columns = {
-        'name': fields.char('Case Team',size=64, required=True, translate=True),
-        'code': fields.char('Team Code',size=8),
-        'active': fields.boolean('Active'),
-        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
-        'sequence': fields.integer('Sequence'),
-        'user_id': fields.many2one('res.users', 'Responsible User'),
-        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this section"),
-        'parent_id': fields.many2one('crm.case.section.custom', 'Parent Team'), 
-        'note': fields.text('Notes'),
-    }
-
-    _defaults = {
-        'active': 1,
-        'allow_unlink': 1,
-    }
-
-    _sql_constraints = [
-        ('code_uniq', 'unique (code)', 'The code of the team must be unique !')
-    ]
-
-    def _check_recursion(self, cr, uid, ids):
-        level = 100
-        while len(ids):
-            cr.execute('SELECT DISTINCT parent_id FROM crm_case_section_custom '\
-                       'WHERE id IN %s',
-                       (tuple(ids),))
-            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
-            if not level:
-                return False
-            level -= 1
-        return True
-    _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive sections.', ['parent_id'])
-    ]
-
-crm_case_section_custom()
-
-
-class crm_case_custom(osv.osv, crm_case):
-    _name = 'crm.case.custom'
-    _inherit = 'mailgate.thread'
-    _description = "Custom CRM Case"
-
-    _columns = {
-            'id': fields.integer('ID', readonly=True),
-            'name': fields.char('Name',size=64,required=True),
-            'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
-            'active': fields.boolean('Active'),
-            'description': fields.text('Description'),
-            'section_id': fields.many2one('crm.case.section.custom', 'Team', required=True, select=True),
-            'probability': fields.float('Probability (%)'),
-            'email_from': fields.char('Partner Email', size=128),
-            'email_cc': fields.char('CC', size=252),
-            'partner_id': fields.many2one('res.partner', 'Partner'),
-            'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
-            'date': fields.datetime('Date'),
-            'create_date': fields.datetime('Created' ,readonly=True),
-            'date_deadline': fields.datetime('Deadline'),
-            'date_closed': fields.datetime('Closed', readonly=True),
-            'user_id': fields.many2one('res.users', 'Responsible'),
-            'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
-            'ref' : fields.reference('Reference', selection=_links_get, size=128),
-            'date_action_last': fields.datetime('Last Action', readonly=1),
-            'date_action_next': fields.datetime('Next Action', readonly=1),
-        }
-
-    _defaults = {
-        'active': 1,
-        'state': 'draft',
-        'priority': AVAILABLE_PRIORITIES[2][0],
-        'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-    }
-
-crm_case_custom()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 263339c7121..23b1af57b28 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -102,7 +102,7 @@ class crm_lead(crm_case, osv.osv):
         # Overridden from res.partner.address:
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', 
             select=True, help="Optional linked partner, usually after conversion of the lead"),
-        
+
         # From crm.case
         'id': fields.integer('ID'),
         'name': fields.char('Name', size=64),
@@ -125,7 +125,7 @@ class crm_lead(crm_case, osv.osv):
         'channel_id': fields.many2one('res.partner.canal', 'Channel'),
 
         'contact_name': fields.char('Contact Name', size=64), 
-        'partner_name': fields.char("Partner Name", size=64),
+        'partner_name': fields.char("Customer Name", size=64),
         'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
         'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([
@@ -315,10 +315,8 @@ class crm_lead(crm_case, osv.osv):
             vals.update(res)
 
         res = self.create(cr, uid, vals, context)
-        
         message = _('A Lead created') + " '" + subject + "' " + _("from Mailgate.")
         self.log(cr, uid, res, message)
-        
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
             data_attach = {
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c1e37445c6c..3d996b990e7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -49,18 +49,17 @@
                     <button
                          name="convert_opportunity"
                          string="Convert to Opportunity"
-                         help="Convert to Opportunity"
-                         icon="gtk-index"
+                         help="Convert to Opportunity" icon="gtk-go-forward"
                          type="object"/>
                     <newline />
                     <field name="section_id" widget="selection" />
                     <field name="user_id" />
                     <field name="stage_id" readonly="1"/>
                     <group col="2" colspan="1">
-                        <button name="stage_previous" string="Previous"
+                        <button name="stage_previous" string=""
                             states="open,pending,draft" type="object"
                             icon="gtk-go-back" />
-                        <button name="stage_next" string="Next"
+                        <button name="stage_next" string=""
                             states="open,pending,draft" type="object"
                             icon="gtk-go-forward" />
                     </group>
@@ -75,7 +74,7 @@
                         <separator string="Contact" colspan="4" col="4"/>
                         <field name="contact_name" colspan="4"/>
                         <newline/>
-                        <field domain="[('domain', '=', 'contact')]" name="title"/>
+                        <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
                         <field name="function" />
                         <field name="street" colspan="4"/>
                         <field name="street2" colspan="4"/>
@@ -95,7 +94,7 @@
                         <field name="mobile"/>
                         <newline/>
                         <separator string="Links" colspan="4" col="3"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
                         <button
                             name="%(action_crm_lead2partner)d"
                             icon="gtk-index" type="action"
@@ -107,20 +106,20 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state"/>
+                        <button name="case_cancel" string="Cancel"
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_open" string="Open"
                             states="draft,pending" type="object"
                             icon="gtk-go-forward" />
                         <button name="case_mark_lost" string="Close"
-                            states="open,draft,pending" type="object"
+                            states="open,pending" type="object"
                             icon="gtk-close" />
                         <button name="case_pending" string="Pending"
-                            states="draft,open" type="object"
+                            states="open" type="object"
                             icon="gtk-media-pause" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
                         <button name="case_escalate" string="Escalate"
-                            states="open,draft,pending" type="object"
+                            states="open,pending" type="object"
                             groups="base.group_extended"
                             icon="gtk-go-up" />
                         <button name="case_reset"
@@ -251,7 +250,7 @@
                     icon="gtk-close" />
                 <button string="Convert to Opportunity"
                     name="convert_opportunity"
-                    states="draft,open,pending" icon="gtk-index"
+                    states="draft,open,pending" icon="gtk-go-forward"
                     type="object" />
                 <button name="case_escalate" string="Escalate"
                     states="open,draft,pending" type="object"
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 66b6f04553b..8f70560f367 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -46,7 +46,7 @@
                                 <separator colspan="4" string="Contacts"/>
                                 <group colspan="2">
                                     <field name="partner_id" select="1"
-                                        on_change="onchange_partner_id(partner_id, email_from)"
+                                        on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
                                         colspan="2" />
                                     <button name="%(action_crm_lead2partner)d"
                                         icon="gtk-index" type="action"
@@ -101,9 +101,9 @@
                         <page string="Lead">
                             <group colspan="2" col="4">
                                 <separator string="Contact" colspan="4" col="4"/>
-                                <field name="partner_name" string="Partner Name" colspan="4"/>
+                                <field name="partner_name" string="Customer Name" colspan="4"/>
                                 <newline/>
-                                <field domain="[('domain', '=', 'contact')]" name="title"/>
+                                <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
                                 <field name="function" />
                                 <field name="street" colspan="4"/>
                                 <field name="street2" colspan="4"/>
@@ -216,7 +216,7 @@
                         <field name="date_deadline" invisible="1"/>
                         <field name="create_date"/>
                         <field name="name" string="Opportunity"/>
-                        <field name="partner_id"/>
+                        <field name="partner_id" string="Customer"/>
                         <field name="country_id" invisible="context.get('invisible_country', True)" />
                         <field name="date_action"/>
                         <field name="title_action" />
@@ -284,7 +284,7 @@
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
-                        <field name="partner_id"/>
+                        <field name="partner_id" string="Customer"/>
                         <field name="user_id">
                             <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index daafc19a621..8e8179ed32c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -402,257 +402,5 @@
         </record>
 
 
-        <!-- Custom Case Sections -->
-        <record id="crm_case_section_custom_view_form" model="ir.ui.view">
-            <field name="name">crm.case.section.custom.form</field>
-            <field name="model">crm.case.section.custom</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Custom Case Section">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="2"/>
-                        <field name="parent_id" select="2" widget="selection"/>
-                        <field name="code" select="1"/>
-                        <newline/>
-                        <field name="user_id" select="2"/>
-                        <field name="active" select="2"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Information">
-                            <group col="2" colspan="1">
-                                <separator string="Mailgateway" colspan="2"/>
-                                <field name="reply_to" select="2"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <separator string="Configuration" colspan="2"/>
-                                <field name="allow_unlink" select="2"/>
-                            </group>
-                        </page>
-                        <page string="Notes">
-                            <field name="note" select="1" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        <record id="crm_case_section_custom_view_tree" model="ir.ui.view">
-            <field name="name">crm.case.section.custom.tree</field>
-            <field name="model">crm.case.section.custom</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Custom Case Teams">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="user_id" select="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Custom crm case-->
-
-        <record id="crm_case_custom_tree_view" model="ir.ui.view">
-            <field name="name">Custom Cases - Tree</field>
-            <field name="model">crm.case.custom</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="red:date_deadline&lt;current_date and state=='open'" string="Custom Cases">
-                    <field name="id"/>
-                    <field name="date"/>
-                    <field name="date_deadline"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="priority"/>
-                    <field name="state"/>
-                    <field name="create_date" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="crm_case_custom_form_view" model="ir.ui.view">
-            <field name="name">Custom Cases - Form</field>
-            <field name="model">crm.case.custom</field>
-            <field name="type">form</field>
-            <field name="priority" eval="1"/>
-            <field name="arch" type="xml">
-                <form string="Custom Cases">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="user_id" select="1"/>
-                        <field name="priority"/>
-                        <field name="date" select="1"/>
-                        <field name="date_deadline" select="2"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group col="4" colspan="4">
-                                <separator string="Communication" colspan="4"/>
-                                <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
-                                <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
-                                <newline/>
-                                <field name="email_from" select="2"/>
-                            </group>
-
-                            <separator string="Notes" colspan="4"/>
-                            <field colspan="4" name="description" nolabel="1" select="2"/>
-
-                            <separator colspan="4"/>
-                            <group col="8" colspan="4">
-                                <field name="state"/>
-                                <button name="case_open" string="Open"
-                                    states="draft,pending" type="object"
-                                    icon="gtk-go-forward" />
-                                <button name="case_close" string="Close"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-close" />
-                                <button name="case_pending" string="Pending"
-                                    states="draft,open" type="object"
-                                    icon="gtk-media-pause" />
-                                <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
-                                <button name="case_reset"
-                                    string="Reset to Draft" states="done,cancel"
-                                    type="object" icon="gtk-convert" />
-                            </group>
-                        </page>
-                        <page string="Extra Info">
-                            <separator colspan="4" string="Dates"/>
-                            <field name="create_date"/>
-                            <field name="date_closed"/>
-                            <field name="date_action_last"/>
-                            <field name="date_action_next"/>
-                            <separator colspan="4" string="Others"/>
-                            <field name="id" select="1"/>
-                            <field name="active" select="2"/>
-                            <separator colspan="4" string="References"/>
-                            <field colspan="4" name="ref"/>
-                        </page>
-                        <page string="Emails" groups="base.group_extended">
-                           <group colspan="4">
-                               <field colspan="4" name="email_cc" widget="char" size="512"/>
-                           </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-		                        <tree string="History">
-		                            <field name="display_text" string="History Information"/>
-		                            <field name="history" invisible="1"/>
-		                            <button
-		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(crm.action_crm_send_mail)d"
-		                                context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
-		                                icon="terp-mail-replied" type="action" />
-		                        </tree>
-		                        <form string="History">
-		                            <group col="4" colspan="4">
-		                                <field name="email_from"/>
-		                                <field name="date"/>
-		                                <field name="email_to" widget="char" size="512"/>
-		                                <field name="email_cc" widget="char" size="512"/>
-		                                <field name="name" colspan="4" widget="char" size="512"/>
-		                                <field name="history" invisible="1"/>
-		                            </group>
-		                            <notebook colspan="4">
-		                                <page string="Details">
-		                                    <group attrs="{'invisible': [('history', '!=', True)]}">
-		                                        <field name="description" colspan="4" nolabel="1" height="250"/>
-		                                        <button colspan="4"
-		                                            string="Reply"
-		                                            name="%(crm.action_crm_send_mail)d"
-		                                            context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
-		                                            icon="terp-mail-replied" type="action" />
-		                                    </group>
-		                                    <group attrs="{'invisible': [('history', '=', True)]}">
-                                                <field name="display_text" colspan="4" nolabel="1" height="250"/>
-                                            </group>
-		                                </page>
-		                                <page string="Attachments">
-		                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-		                                </page>
-		                            </notebook>
-		                        </form>
-		                    </field>
-		                    <button string="Add Internal Note"
-                                name="%(crm.action_crm_add_note)d"
-                                context="{'model': 'crm.lead' }"
-                                icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.case.custom'}"
-                                icon="terp-mail-message-new" type="action" />
-                         </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="crm_case_custom_calendar_view">
-            <field name="name">Custom Cases - Calendar</field>
-            <field name="model">crm.case.custom</field>
-            <field name="type">calendar</field>
-            <field name="priority" eval="2"/>
-            <field name="arch" type="xml">
-                <calendar string="Cases"
-                    date_start="date" color="user_id">
-                    <field name="name" />
-                    <field name="partner_id" />
-                </calendar>
-            </field>
-        </record>
-
-      <!-- Custom Cases Search View -->
-
-    <record id="crm_case_custom_search_view" model="ir.ui.view">
-        <field name="name">Custom Cases - Search</field>
-        <field name="model">crm.case.custom</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Cases">
-                <filter icon="terp-check"
-                    string="Current"
-                    default="1" name="current"
-                    domain="[('state','in',('draft','open'))]"/>
-                <filter icon="terp-camera_test"
-                    string="Open"
-                    domain="[('state','=','open')]"/>
-                <filter icon="terp-gtk-media-pause"
-                    string="Pending"
-                    domain="[('state','=','pending')]"/>
-
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-today" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                    help="Todays' Cases" />
-                <filter icon="terp-go-week" string="7 Days"
-                    help="Cases creating during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                />
-                <separator orientation="vertical"/>
-                <field name="name"/>
-                <field name="user_id">
-                    <filter icon="terp-personal-"
-                        domain="[('user_id','=', False)]"
-                        help="Unassigned Cases" />
-                </field>
-                <newline/>
-                <group  expand="0" string="Extended options..." groups="base.group_extended">
-                      <field name="create_date" string="Creation Date"/>
-                      <field name="date_closed"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Creation" icon="terp-go-month"
-                        domain="[]" context="{'group_by':'create_date'}" />
-                </group>
-           </search>
-        </field>
-    </record>
     </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index e68fe873b6c..e67a15b3e31 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -38,10 +38,6 @@
 "access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
 "mail_gateway_mailgate_message","mail_gateway.mailgate.message","mail_gateway.model_mailgate_message","base.group_system",1,1,1,1
 "mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","base.group_sale_salesman",1,1,1,1
-"access_crm_case_section_custom_user","crm.case.section.custom.user","model_crm_case_section_custom","base.group_sale_salesman",1,0,0,0
-"access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","base.group_sale_manager",1,1,1,1
-"access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","base.group_sale_salesman",1,1,1,1
-"access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","base.group_sale_manager",1,1,1,1
 "mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
 "access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
 "access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 502dddcdcaa..d94169c2dd1 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -98,7 +98,6 @@ class crm_lead2opportunity(osv.osv_memory):
             'type': 'ir.actions.act_window', 
             'search_view_id': res['res_id']
         }
-        
         return value
 
     _columns = {
@@ -124,9 +123,6 @@ class crm_lead2opportunity(osv.osv_memory):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
 Leads Could not convert into Opportunity"))
-            if lead.state not in ('open', 'pending'):
-                raise osv.except_osv(_('Warning !'), _('Lead should be in \
-\'Open\' or \'Pending\' state before converting to Opportunity.'))
         return False
 
     def default_get(self, cr, uid, fields, context=None):
@@ -284,9 +280,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
 Leads Could not convert into Opportunity"))
-            if lead.state not in ('open', 'pending'):
-                raise osv.except_osv(_('Warning !'), _('Lead should be in \
-\'Open\' or \'Pending\' state before converting to Opportunity.'))
         return False
 
 crm_lead2opportunity_partner()
@@ -297,16 +290,12 @@ class crm_lead2opportunity_action(osv.osv_memory):
     '''
     _name = 'crm.lead2opportunity.action'
     _description = 'Convert/Merge Opportunity'
-    
     _columns = {
         'name': fields.selection([('convert', 'Convert to Opportunity'), ('merge', 'Merge with existing Opportunity')],'Select Action', required=True),
-        
     }
-
     _defaults = {
         'name': 'convert',
-        }
-
+    }
     def do_action(self, cr, uid, ids, context=None):
         """
         This function opens form according to selected Action
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index d41030789b6..55196f0688e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -11,7 +11,7 @@
               <form string="Convert To Opportunity">
                 <field name="name"/>
                 <group attrs="{'invisible':[('partner_id','=',False)]}" col="2" colspan="2">
-                	<field name="partner_id"/>
+                    <field name="partner_id"/>
                 </group>
                 <newline/>
                 <field name="planned_revenue"/>
@@ -20,7 +20,7 @@
                 <group col="4" colspan="4">
                     <label string="" colspan="2"/>
                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
+                    <button name="action_apply" string="Create Opportunity" type="object" icon="gtk-go-forward"/>
                 </group>
             </form>
           </field>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ad418a567bc..33db15d5ed0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -507,6 +507,7 @@ class sale_order(osv.osv):
                     if order.order_policy == 'picking':
                         picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'})
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (order.id, res))
+
         return res
 
     def action_invoice_cancel(self, cr, uid, ids, context=None):
@@ -1175,7 +1176,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'picking_policy': fields.selection([
             ('direct', 'Direct Delivery'),
             ('one', 'All at Once')
-        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to synchronise invoices and delivery operations."),
+        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 62bdd41f2ca..b22f944d56f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -199,17 +199,17 @@
                             </group>
                             <group col="13" colspan="4">
                                 <field name="state"/>
-                                <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/>
+                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-document-new"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
+                                <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
                             </group>
                         </page>
                         <page string="Other Information">
@@ -549,7 +549,6 @@ to your configuration: from the sales order, from the pickings, etc.
                   <field name="step"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
-               
               </data>
             </field>
         </record>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 391d4141969..bac0051e0d1 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-	    <record model="ir.ui.view" id="crm_case_form_view_oppor">
-	        <field name="name">CRM - Opportunities - Quote Inherit</field>
-	        <field name="model">crm.lead</field>
-	        <field name="type">form</field>
-	        <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
-	        <field name="arch" type="xml">
-	            <field name="priority" position="after">
-	                <button string="Convert to Sale" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="crm_case_form_view_oppor">
+            <field name="name">CRM - Opportunities - Quote Inherit</field>
+            <field name="model">crm.lead</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
+            <field name="arch" type="xml">
+                <field name="priority" position="after">
+                    <button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_view_inherit123">
-	        <field name="name">sale.order.inherit</field>
-	        <field name="model">sale.order</field>
-	        <field name="type">form</field>
-	        <field name="inherit_id" ref="sale.view_order_form"/>
-	        <field name="arch" type="xml">
-	            <field name="user_id" position="after">
-	            <field name="section_id" widget="selection" groups="base.group_extended"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_view_inherit123">
+            <field name="name">sale.order.inherit</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <field name="user_id" position="after">
+                <field name="section_id" widget="selection" groups="base.group_extended"/>
+                </field>
+            </field>
+        </record>
 
-	    <record id="view_sales_order_filter_inherit" model="ir.ui.view">
-	        <field name="name">sale.order.list.select</field>
-	        <field name="model">sale.order</field>
-	        <field name="type">search</field>
-	        <field name="inherit_id" ref="sale.view_sales_order_filter"/>
-	        <field name="arch" type="xml">
-	            <field name="date_order" position="after">
-	                <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sales Team" groups="base.group_extended">
-	                    <filter icon="terp-personal+"
-	                            domain="[('section_id.user_id','=',uid)]"
-	                            groups="base.group_extended"
-	                            help="My Sales Team(s)"/>
-	                </field>
-	            </field>
-	        </field>
-	    </record>
+        <record id="view_sales_order_filter_inherit" model="ir.ui.view">
+            <field name="name">sale.order.list.select</field>
+            <field name="model">sale.order</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+            <field name="arch" type="xml">
+                <field name="date_order" position="after">
+                    <field name="section_id" default="context.get('section_id', False)" widget="selection" string="Sales Team" groups="base.group_extended">
+                        <filter icon="terp-personal+"
+                                domain="[('section_id.user_id','=',uid)]"
+                                groups="base.group_extended"
+                                help="My Sales Team(s)"/>
+                    </field>
+                </field>
+            </field>
+        </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/sale_crm/test/sale_crm.yml b/addons/sale_crm/test/sale_crm.yml
index 86095929691..cc75b9e415c 100644
--- a/addons/sale_crm/test/sale_crm.yml
+++ b/addons/sale_crm/test/sale_crm.yml
@@ -23,14 +23,6 @@
 -
   !record {model: crm.make.sale, id: crm_make_sale_0}:
     partner_id: base.res_partner_4
-    sale_order_line:
-      - name: '[KEYA] Keyboard - AZERTY'
-        price_unit: 7.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 50.0
-        delay: 7.0
-        product_id: product.product_product_24
-        type: make_to_stock
     shop_id: sale.shop
 -
   Then I click on the 'Ok' button of wizard
@@ -47,4 +39,4 @@
 -
   !python {model: crm.lead}: |
     crm = self.browse(cr, uid, ref("crm_lead_opportunity0"))
-    assert (crm.ref),("sale order has not been created")
\ No newline at end of file
+    assert (crm.ref),("sale order has not been created")
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 089a2389703..933200d1883 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -76,7 +76,6 @@ class crm_make_sale(osv.osv_memory):
         case_obj = self.pool.get('crm.lead')
         sale_obj = self.pool.get('sale.order')
         partner_obj = self.pool.get('res.partner')
-        sale_line_obj = self.pool.get('sale.order.line')
 
         data = context and context.get('active_ids', []) or []
 
@@ -115,30 +114,10 @@ class crm_make_sale(osv.osv_memory):
                 if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
 
-                if make.analytic_account.id:
-                    vals['project_id'] = make.analytic_account.id
                 new_id = sale_obj.create(cr, uid, vals)
-                for line in make.sale_order_line:
-                    value = {
-                            'order_id': new_id, 
-                            'name': line.name, 
-                            'delay': line.delay, 
-                            'product_id': line.product_id and line.product_id.id or False, 
-                            'price_unit': line.price_unit, 
-                            'tax_id': line.tax_id and [(6, 0, map(lambda x: x.id, line.tax_id))] or False, 
-                            'type': line.type, 
-                            'product_uom_qty': line.product_uom_qty, 
-                            'product_uom': line.product_uom.id, 
-                            'product_uos_qty': line.product_uos_qty, 
-                            'product_uos': line.product_uos and line.product_uos.id or False, 
-                            'product_packaging': line.product_packaging and line.product_packaging.id or False, 
-                            'discount': line.discount, 
-                            'notes': line.notes
-                            }
-                    sale_line_obj.create(cr, uid, value, context=context)
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
-                message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Sales Quotation.")
+                message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Quotation.")
                 self.log(cr, uid, case.id, message)
 
             if make.close:
@@ -178,8 +157,6 @@ class crm_make_sale(osv.osv_memory):
     _columns = {
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True), 
         'partner_id': fields.many2one('res.partner', 'Customer', required=True), 
-        'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'), 
-        'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'), 
         'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'), 
     }
     _defaults = {
@@ -189,48 +166,3 @@ class crm_make_sale(osv.osv_memory):
     }
 
 crm_make_sale()
-
-class sale_order_make_line(osv.osv_memory):
-
-    def product_id_change(self, cr, uid, ids, product, qty=0, 
-            uom=False, qty_uos=0, uos=False, name='', partner_id=False, 
-            lang=False, update_tax=True, packaging=False, flag=False):
-        if not  partner_id:
-            raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
-        date_order = time.strftime('%Y-%m-%d')
-        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
-        pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
-        fiscal_position = part.property_account_position and part.property_account_position.id or False
-        return self.pool.get('sale.order.line').product_id_change(cr, uid, ids, pricelist, product, qty, uom, qty_uos, uos, name, partner_id, lang, update_tax, date_order, packaging, fiscal_position, flag)
-
-    _name = 'sale.order.make.line'
-    _description = 'Opportunity Sale Order Line'
-    _columns = {
-        'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True,), 
-        'name': fields.char('Description', size=256, required=True, select=True,), 
-        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"), 
-        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True), 
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')), 
-        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'), 
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True), 
-        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True,), 
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True,), 
-        'product_uos_qty': fields.float('Quantity (UoS)'), 
-        'product_uos': fields.many2one('product.uom', 'Product UoS'), 
-        'product_packaging': fields.many2one('product.packaging', 'Packaging'), 
-        'discount': fields.float('Discount (%)', digits=(16, 2)), 
-        'notes': fields.text('Notes'), 
-    }
-    _order = 'sequence, id'
-    _defaults = {
-        'discount': 0.0, 
-        'delay': 0.0, 
-        'product_uom_qty': 1, 
-        'product_uos_qty': 1, 
-        'type': 'make_to_stock', 
-        'product_packaging': False
-    }
-
-sale_order_make_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 54550a08bf1..a5561ac0e62 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -16,54 +16,12 @@
                             groups="base.group_extended"/>
                         <field name="close"/>
                     </group>
-                            <field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">
-                                <form string="Sale Order Lines">
-                                    <notebook>
-                                        <page string="Order Line">
-                                            <field colspan="4"
-                                                context="partner_id=parent.partner_id,shop=parent.shop_id"
-                                                name="product_id"
-                                                on_change="product_id_change(product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, product_packaging, False)"
-                                                />
-                                               <field name="product_uom_qty"/>
-                                               <field name="product_uom"/>
-                                            <group colspan="2" groups="product.group_uos">
-                                               <field name="product_uos_qty"/>
-                                               <field name="product_uos" nolabel="1"/></group>
-                                            <field
-                                                name="product_packaging"
-                                                domain="[('product_id','=',product_id)]"
-                                                groups="base.group_extended"/>
-                                            <field colspan="4" name="name"/>
-                                            <field name="price_unit"/>
-                                            <field name="discount"/>
-                                            <field name="type" groups="base.group_extended"/>
-                                            <field name="delay" groups="base.group_extended"/>
-                                            <newline/>
-                                            <separator colspan="5" string="Taxes"/>
-                                            <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                        </page>
-                                        <page string="Notes">
-                                            <field colspan="4" name="notes" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
-                                <tree string="Sales order lines">
-                                    <field colspan="4" name="name"/>
-                                    <field name="product_uom_qty" string="Qty"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="discount"/>
-                                    <field name="price_unit"/>
-                                </tree>
-                            </field>
-                            <newline/>
-
-
+                    <newline/>
                 <separator colspan="4"/>
                 <group col="4" colspan="4">
                     <label string="" colspan="2"/>
-                    <button special="cancel" string="_Close" icon="gtk-cancel"/>
-                    <button name="makeOrder" string="_Create" type="object" icon='gtk-ok'/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="makeOrder" string="_Create" type="object" icon='gtk-go-forward'/>
                 </group>
             </form>
           </field>

From bc220317972d04276aa1b72b7f8f9c95dc25480b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 16:42:33 +0200
Subject: [PATCH 487/632] imp

bzr revid: fp@tinyerp.com-20101008144233-uhv4bq5kny3q5q8r
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ced86942d5c..1e717a07a33 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -266,6 +266,7 @@
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"
                             string="Payment Method"/>
                         <field name="amount"
+                            string="Paid Amount"
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="4"/>

From 59c4544c97043763ace19e4db20ebc9760fd6505 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 17:08:49 +0200
Subject: [PATCH 488/632] fix

bzr revid: fp@tinyerp.com-20101008150849-bxtph2mqcpxgs3b7
---
 bin/addons/base/res/res_log.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py
index 8ce446883b5..8165d05acac 100644
--- a/bin/addons/base/res/res_log.py
+++ b/bin/addons/base/res/res_log.py
@@ -22,19 +22,22 @@
 from osv import fields, osv
 import tools
 import time
+
 class res_log(osv.osv_memory):
     _name = 'res.log'
     _columns = {
         'name': fields.char('Message', size=128, help='The logging message.', required=True),
         'user_id': fields.many2one('res.users','User', required=True),
         'res_model': fields.char('Object', size=128),
+        'context': fields.char('Context', size=250),
         'res_id': fields.integer('Object ID'),
         'secondary': fields.boolean('Secondary Log', help='Do not display this log if it belongs to the same object the user is working on'),
         'create_date': fields.datetime('Created Date', readonly=True),
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
-        'create_date': time.strftime('%Y-%m-%d %H:%M:%S')
+        'create_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'context': lambda *args: "{}"
     }
     _order='create_date desc'
 

From 175e637ed31aa2a998014cc366c015f53815a197 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 8 Oct 2010 18:01:55 +0200
Subject: [PATCH 489/632] [FIX] hr, hr_contract, hr_payroll: moved back the
 field bank_account on the hr.employee object into the HR module: even if it's
 used only in payroll it may be interssting to record that info before.
 besides, the view of hr_contract module was crashing

bzr revid: qdp-launchpad@tinyerp.com-20101008160155-nwpaxwqyltc6d663
---
 addons/hr/hr.py                 | 1 +
 addons/hr_payroll/hr_payroll.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 0419445c82d..655b9d9bfd1 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -135,6 +135,7 @@ class hr_employee(osv.osv):
         'address_id': fields.many2one('res.partner.address', 'Working Address'),
         'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
+        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
         'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
         'work_location': fields.char('Office Location', size=32),
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 70192dba702..bb5edbd8d18 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1470,7 +1470,6 @@ class hr_employee(osv.osv):
     
     _columns = {
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
-        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'otherid': fields.char('Other Id', size=64),

From dcf36cd08ae908af14aff7d8b7524a3ff6c6794e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 18:06:44 +0200
Subject: [PATCH 490/632] removed

bzr revid: fp@tinyerp.com-20101008160644-kfl5wuol619jcksz
---
 .../marketing_campaign_mailchimp/__init__.py  |  24 --
 .../__openerp__.py                            |  44 ----
 .../marketing_campaign_mailchimp.py           | 211 ------------------
 .../marketing_campaign_mailchimp_view.xml     |  84 -------
 .../security/ir.model.access.csv              |   4 -
 .../security/marketing_security.xml           |  10 -
 .../wizard/__init__.py                        |  24 --
 .../wizard/create_list.py                     |  61 -----
 .../wizard/create_list_view.xml               |  37 ---
 9 files changed, 499 deletions(-)
 delete mode 100644 addons/marketing_campaign_mailchimp/__init__.py
 delete mode 100644 addons/marketing_campaign_mailchimp/__openerp__.py
 delete mode 100644 addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
 delete mode 100644 addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
 delete mode 100644 addons/marketing_campaign_mailchimp/security/ir.model.access.csv
 delete mode 100644 addons/marketing_campaign_mailchimp/security/marketing_security.xml
 delete mode 100755 addons/marketing_campaign_mailchimp/wizard/__init__.py
 delete mode 100755 addons/marketing_campaign_mailchimp/wizard/create_list.py
 delete mode 100755 addons/marketing_campaign_mailchimp/wizard/create_list_view.xml

diff --git a/addons/marketing_campaign_mailchimp/__init__.py b/addons/marketing_campaign_mailchimp/__init__.py
deleted file mode 100644
index 808e5fc281f..00000000000
--- a/addons/marketing_campaign_mailchimp/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import marketing_campaign_mailchimp
-import wizard
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py
deleted file mode 100644
index b046b4ef782..00000000000
--- a/addons/marketing_campaign_mailchimp/__openerp__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    "name" : "",
-    "version" : "1.1",
-    "depends" : ['marketing_campaign'],
-    "author" : "OpenERP SA",
-    "category": 'Generic Modules/Marketing',
-    "description": """    
-    This module provides integration of the mailchimp.com marketing campaign and mailing-list service, connecting via Mailchimp's WebServices API.
-    You can define multiple Mailchimp accounts and then use them as you wish through a new type of activity, providing direct connection to your Mailchimp Lists.""",
-    'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        "security/ir.model.access.csv",
-        'marketing_campaign_mailchimp_view.xml',
-        'wizard/create_list_view.xml',
-    ],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
deleted file mode 100644
index 2b482867694..00000000000
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
+++ /dev/null
@@ -1,211 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import urllib
-import urllib2
-import simplejson as json
-import time
-
-from osv import fields, osv
-
-mailchimp_url = 'http://%s.api.mailchimp.com/1.2'
-
-class mailchimp_account(osv.osv):
-    _name = "mailchimp.account"
-
-    _columns = {
-        'name': fields.char('Account Name', size=64),
-        'username': fields.char('Username', size=64, required=True),
-        'password': fields.char('Password', size=64, required=True),
-        'apikey': fields.char('API Key', size=128),
-        'data_center': fields.selection([('us1', 'US1'), ('us2', 'US2'),
-                                        ('uk1', 'UK1')], 'Data Center'),
-        'state': fields.selection([('draft', 'Draft'), ('approved', 'Approved'),
-                       ('cancelled', 'Cancelled')], 'State', readonly=True)
-    }
-
-    _defaults = {
-        'state': lambda *a: 'draft'
-    }
-
-    def get_response(self, cr, uid, mailchimp_id, method, params={}):
-        mailchimp_account = self.browse(cr, uid, mailchimp_id)
-        params['output'] = 'json'
-        if method == 'login':
-                params['username'] = mailchimp_account.username
-                params['password'] = mailchimp_account.password
-        else :
-                params['apikey'] = mailchimp_account.apikey
-        url = mailchimp_url%mailchimp_account.data_center+ '/?method=%s'%method
-        params = urllib.urlencode(params, doseq=True)
-        response = urllib2.urlopen(url, params)
-        return  json.loads(response.read())
-
-    def button_approve(self, cr, uid, ids, context):
-        acc_obj = self.browse(cr, uid, ids)[0]
-        vals = {}
-        if not acc_obj.apikey:
-            method = 'login'
-        else:
-            method = 'ping'
-        response = self.get_response(cr, uid, acc_obj.id, method)
-        if 'error' not in response:
-            if method == 'login' :
-                vals['apikey'] = response
-            vals['state'] = 'approved'
-            self.write(cr, uid, ids, vals)
-        else :
-            raise osv.except_osv('Error!!!',
-                            "Can't approved accoutnt : %s"%response['error'])
-        return True
-
-    def button_cancel(self, cr, uid, ids, context):
-        self.write(cr, uid, ids, {'state': 'cancelled'})
-        return True
-
-    def add_partner_list(self, cr, uid, account_id, list_id,  partner_ids):
-        vals = {} # just dictionary with partner_id and updated in list or not
-        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
-            params = {
-                'id' : list_id,
-                'email_address' : partner.email,
-                'email_type':'text',
-                'merge_vars[FNAME]':partner.name ,
-                'merge_vars[date]' : time.strftime('%Y-%m-%d'),
-                'merge_vars[phone]' : partner.phone,
-                'merge_vars[website]' : partner.website,
-                'merge_vars[address][country]' : partner.country.code,
-                'merge_vars[address][city]' : partner.city,
-                'double_optin':False
-            }
-            vals[partner.id] = self.get_response(cr, uid, account_id,
-                                                         'listSubscribe', params)
-        return vals
-
-mailchimp_account()
-
-class mailchimp_list(osv.osv_memory):
-    _name = "mailchimp.list"
-    _description = "Mailchimp list"
-
-    _columns = {
-        'mailchimp_account_id': fields.many2one('mailchimp.account',
-                                             'Mailchimp Account', required=True),
-        'name': fields.char('Name', size=64)
-    }
-
-mailchimp_list()
-
-class marketing_campaign(osv.osv):
-    _inherit = "marketing.campaign"
-
-    _columns = {
-        'mailchimp_account_id': fields.many2one(
-                        'mailchimp.account', 'Account'),
-        'mailchimp_campaign': fields.char('campaign', size=64),
-    }
-marketing_campaign()
-
-
-class marketing_campaign_activity(osv.osv):
-    _inherit = "marketing.campaign.activity"
-
-    _columns = {
-        'mailchimp_account_id': fields.many2one(
-                        'mailchimp.account', 'Account'),
-        'mailchimp_list': fields.char('List', size=64),
-    }
-
-    def onchange_mailchimp(self, cr, uid, ids, mailchimp_account_id):
-        if mailchimp_account_id:
-            return {'value':{'mailchimp_list':''}}
-        return {'value':{}}
-
-    def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id,
-                                                                mailchimp_list):
-        if mailchimp_account_id and mailchimp_list:
-            lists = self.pool.get('mailchimp.account').get_response(cr,
-                                             uid, mailchimp_account_id, 'lists')
-            list_names = [l['name'] for l in lists]
-            if mailchimp_list not in list_names:
-                raise osv.except_osv('Error!!!',"Lists doesn't exists")
-        else :
-            return {}
-        return {'value':{}}
-
-    def _process_wi_mailchimp(self, cr, uid, activity, workitem, context=None):
-        mailchimp_account_id = activity.mailchimp_account_id.id
-        list_name = activity.mailchimp_list
-        mc_acc_obj = self.pool.get('mailchimp.account')
-        lists = mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'lists')
-        list_id = ''
-        for l in lists :
-            if l['name'] == list_name:
-                list_id = l['id']
-                break;
-        res_model = workitem.object_id.model
-        res_id = workitem.res_id
-        model_obj = self.pool.get(res_model).browse(cr, uid, res_id)
-        params ={}
-        if res_model == 'res.partner' :
-            params.update({
-                'email_address' : model_obj.email,
-                'merge_vars[FNAME]':model_obj.name and model_obj.name or '',
-                'merge_vars[website]' : model_obj.website,
-                'merge_vars[address][country]' : model_obj.country.code,
-            })
-        elif res_model == 'crm.lead' :
-            params.update({
-                'email_address' : model_obj.email_from,
-                'merge_vars[FNAME]':model_obj.partner_name and \
-                                    model_obj.partner_name or '',
-                'merge_vars[address][country]' : model_obj.country_id and \
-                                            model_obj.country_id.code or ''
-            })
-        if params['email_address'] :
-            user = mc_acc_obj.get_response(cr, uid, mailchimp_account_id,
-                                     'listMemberInfo', {
-                                        'id' : list_id,
-                                        'email_address': params['email_address']
-                                    })
-            # if there s no user with the specify email it will return error code
-            # and thus we add that user otherwise user is alredy subscribe and there
-            # is no need to subscribe user again
-            if 'error' in user:
-                params.update({
-                    'id' : list_id,
-                    'email_type':'text',
-                    'double_optin':False,
-                    'merge_vars[date]' : time.strftime('%Y-%m-%d'),
-                    'merge_vars[address][city]' : model_obj.city and model_obj.city or '',
-                    'merge_vars[phone]' : model_obj.phone and model_obj.phone or '',
-                })
-                mc_acc_obj.get_response(cr, uid, mailchimp_account_id, 'listSubscribe', params)
-                # TODO handle mailchimp error
-            return True
-        else :
-            return {'error_msg' : "Invalid Email Address"}
-
-    def __init__(self, *args):
-        super(marketing_campaign_activity, self).__init__(*args)
-        self._action_types.append(('mailchimp', 'Mailchimp'))
-
-marketing_campaign_activity()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
deleted file mode 100644
index a340c5c9d68..00000000000
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <!--
-    ================================================================
-    Marketing Activity Inherited View - mailchimp
-    ================================================================
-    -->
-
-    <record model="ir.ui.view" id="view_marketing_campaign_activity_form_inherit">
-        <field name="name">marketing.campaign.activity.form.inherit</field>
-        <field name="model">marketing.campaign.activity</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_activity_form"/>
-        <field name="arch" type="xml">
-            <xpath expr='//field[@name="type"]/following-sibling::group' position='inside'>
-                <group colspan="2" attrs="{'invisible':[('type','!=','mailchimp')]}">
-                    <field name="mailchimp_account_id" attrs="{'required':[('type','=','mailchimp')]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
-                    <field name="mailchimp_list" attrs="{'required':[('type','=','mailchimp')]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
-                </group>
-            </xpath>
-        </field>
-    </record>
-
-
-    <!--
-    ================================================================
-    Mailchimp Account
-    ================================================================
-    -->
-
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
-    <menuitem name="Mailchimp" id="menu_action_mailchimp" parent="base.menu_emails" />
-
-    <record model="ir.ui.view" id="view_mailchimp_account_tree">
-        <field name="name">mailchimp.account.tree</field>
-        <field name="model">mailchimp.account</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('approved');gray:state in ('cancelled')" string="Accounts">
-                <field name="name"/>
-                <field name="username" />
-                <field name="data_center"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_mailchimp_account_form">
-        <field name="name">mailchimp.account.form</field>
-        <field name="model">mailchimp.account</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Account">
-                <field name="name" select="1"/>
-                <newline/>
-                <field name="username" select="1"/>
-                <field name="password" select="1" password="True"/>
-                <field name="apikey" />
-                <field name="data_center" required="1"/>
-                <separator string="Status" colspan="4"/>
-                <group col="13" colspan="4">
-                    <field name="state" nolabel="1"/>
-                    <button name="button_approve" string="Approve" states="draft" type="object"/>
-                    <button name="button_cancel" string="Cancel" states="draft,approved" type="object"/>
-                </group>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_mailchimp_account">
-        <field name="name">Mailchimp Accounts</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">mailchimp.account</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_mailchimp_account_tree"/>
-    </record>
-
-    <menuitem id="menu_action_mailchimp_account" parent="menu_action_mailchimp" action="action_mailchimp_account" sequence="40"/>
-
-    </data>
-</openerp>
diff --git a/addons/marketing_campaign_mailchimp/security/ir.model.access.csv b/addons/marketing_campaign_mailchimp/security/ir.model.access.csv
deleted file mode 100644
index 893cd2e9e2c..00000000000
--- a/addons/marketing_campaign_mailchimp/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_mailchimp_account_user","mailchimp.account.user","marketing_campaign_mailchimp.model_mailchimp_account","base.res_groups_email_template_admin",1,1,1,1
-"access_mailchimp_account_system","mailchimp.account.user","marketing_campaign_mailchimp.model_mailchimp_account","base.res_groups_email_template_admin",1,0,0,0
-"access_mailchimp_account_user","mailchimp_account_user","model_mailchimp_account","base.res_groups_email_template_admin",1,1,1,1
diff --git a/addons/marketing_campaign_mailchimp/security/marketing_security.xml b/addons/marketing_campaign_mailchimp/security/marketing_security.xml
deleted file mode 100644
index 59cbf65a63d..00000000000
--- a/addons/marketing_campaign_mailchimp/security/marketing_security.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-    <record id="base.res_groups_email_template_admin" model="res.groups">
-        <field name="name">Marketing / User</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/marketing_campaign_mailchimp/wizard/__init__.py b/addons/marketing_campaign_mailchimp/wizard/__init__.py
deleted file mode 100755
index 713b0c1e773..00000000000
--- a/addons/marketing_campaign_mailchimp/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import create_list
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list.py b/addons/marketing_campaign_mailchimp/wizard/create_list.py
deleted file mode 100755
index 03a69a8ac89..00000000000
--- a/addons/marketing_campaign_mailchimp/wizard/create_list.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-import netsvc
-
-class create_list(osv.osv_memory):
-    _name = "create.list"
-    _description = "Create List of mailchimp"
-# crm.lead remain
-    _columns = {
-        'mailchimp_account_id': fields.many2one('mailchimp.account',
-                                             'Mailchimp Account', required=True),
-        'mailchimp_list_id': fields.many2one('mailchimp.list', 'List'),
-        'list_name': fields.char('Name',size = 64),
-        'partner_ids': fields.many2many('res.partner',
-                                        'create_list_partner_rel',
-                                        'cust_list_id', 'partner_id',
-                                        'Partner'),
-
-        }
-
-    def onchange_mailchimp_account_id(self, cr, uid, ids, mailchimp_account_id,
-                                                                action):
-        return {'value':{}}
-
-    def create_list(self, cr, uid, ids, context=None):
-        create_list_obj = self.browse(cr, uid, ids[0])
-        mailchimp_account_obj = self.pool.get('mailchimp.account')
-        account_id = create_list_obj.mailchimp_account_id
-        lists = mailchimp_account_obj.get_response(cr, uid, account_id.id, 'lists')
-        lists = dict([(l['name'],l['id']) for l in lists])
-        if create_list_obj.list_name not in lists.keys():
-            raise  osv.except_osv(_('UserError'),
-                _('There is no list define in account %s') % (account_id.name))
-        list_id = lists[create_list_obj.list_name]
-        mailchimp_account_obj.add_partner_list(cr, uid, account_id.id, list_id,
-                                                    create_list_obj.partner_ids)
-        return {}
-create_list()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml b/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
deleted file mode 100755
index 6d8f8fe9296..00000000000
--- a/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<openerp>
-      <data>
-        <record id="view_create_list" model="ir.ui.view">
-            <field name="name">create.list.form</field>
-            <field name="model">create.list</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Update List Manually">
-                 <separator string="Update List Manually" colspan="4"/>
-                <field name="mailchimp_account_id" on_change = "onchange_mailchimp_account_id(mailchimp_account_id,action)"/>
-                <field name="list_name" />
-                <newline/>
-                <separator string="Partner" colspan="4"/>
-                <field name="partner_ids" nolabel="1" colspan="4"/>
-                <group col="4" colspan="4">
-                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="create_list" string="Update" type="object" icon="gtk-ok"/>
-                </group>
-            </form>
-        </field>
-    </record>
-	<record id="action_create_list" model="ir.actions.act_window">
-        <field name="name">Manual Mailchimp List Update</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">create.list</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="view_create_list"/>
-        <field name="target">new</field>
-    </record>
-    
-    <menuitem id="menu_action_mailchimp_create_list"
-        name="Manual Mailchimp List Update"
-        parent="menu_action_mailchimp" action="action_create_list"
-        sequence="40" />
-
-      </data>
-</openerp>

From c50c0d8c4daa18e254d3bdc2c8afdd8f7b4bfd0e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 18:19:31 +0200
Subject: [PATCH 491/632] [IMP] sale useability

bzr revid: fp@tinyerp.com-20101008161931-4s088229ob3s5t93
---
 addons/sale/sale_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a30c05d5c2b..7d95126cbe5 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -86,8 +86,8 @@
                     <field name="user_id" />
                     <field name="picked_rate" widget="progressbar"/>
                     <field name="invoiced_rate" widget="progressbar"/>
-                    <field name="amount_untaxed" sum="Total Untaxed amount"/>
-                    <field name="amount_total" sum="Total amount"/>
+                    <field name="amount_untaxed" sum="Total Tax Excluded"/>
+                    <field name="amount_total" sum="Total Tax Included"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -363,7 +363,7 @@ to your configuration: from the sales order, from the pickings, etc.
                     <field name="product_uom_qty" string="Qty"/>
                     <field name="product_uom" string="UoM"/>
                     <field name="salesman_id"/>
-                    <field name="price_subtotal"/>
+                    <field name="price_subtotal" sum="Total"/>
                     <field name="state"/>
                     <field name="invoiced"/>
                 </tree>

From 32c4dfc3ec9daceb0974b8b08bd9205ad9285d54 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 8 Oct 2010 19:18:37 +0200
Subject: [PATCH 492/632] [IMP] hr_*: usability improvements

bzr revid: qdp-launchpad@tinyerp.com-20101008171837-iog32jb6x61fisv0
---
 addons/hr_evaluation/hr_evaluation_view.xml       |  4 ++--
 addons/hr_expense/hr_expense_view.xml             | 15 +++++++--------
 addons/hr_expense/hr_expense_workflow.xml         |  6 ------
 addons/hr_holidays/hr_holidays_view.xml           |  7 ++++---
 addons/hr_recruitment/hr_recruitment_view.xml     |  6 +++---
 .../hr_timesheet_sheet_view.xml                   |  6 ++++--
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e4ccb11ce4e..08a8135353c 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -183,14 +183,14 @@
                     <newline/>
                     <group col="6" colspan="4">
                     <field name="state"/>
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
+                            icon="gtk-cancel"/>
                     <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
                             icon="gtk-execute"/>
                     <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
                             icon="gtk-execute"/>
                     <button name="button_done" string="Done" states="progress" type="object"
                             icon="gtk-jump-to"/>
-                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
-                            icon="gtk-cancel"/>
                     </group>
               </form>
             </field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 7ffdb349826..b30b22c559a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -47,8 +47,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')"  string="Expenses" editable="top">
-                    <field name="date"/>
                     <field name="employee_id"/>
+                    <field name="date"/>
                     <field name="department_id" groups="base.group_extended"/>
                     <field name="ref"/>
                     <field name="name"/>
@@ -96,12 +96,11 @@
                             </field>
                             <field name="state"/>
                             <group col="6" colspan="2">
-                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
-                                <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
+                                <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
+                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
-                                <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
+                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                             </group>
                         </page>
                         <page string="Other Info" groups="base.group_extended">
@@ -143,14 +142,14 @@
                               domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
                       <field name="employee_id" select='1'/>
-                      <field name="name" select='1'/>
                       <field name="date" select='1'/>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
+                   <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
+                      <field name="name" select='1'/>
                       <field name="user_id"  string="User" invisible="True">
                       <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
-                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                   <filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
                </field>
                 </group>
                 <newline />
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 2bb0f51e26b..547129e89e2 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -83,12 +83,6 @@
             <field name="signal">refuse</field>
         </record>
 
-        <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_refused"/>
-            <field name="signal">refuse</field>
-        </record>
-
         <record id="t6" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_refused"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6ee69af1bca..124e424f620 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -90,11 +90,11 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                             </group>
                         </page>
@@ -401,7 +401,8 @@
 
     <!--  Shortcuts -->
         <act_window name="Holidays"
-            domain="[('employee_id', '=', active_id), ('type','=','remove')]"
+            domain="[('type','=','remove')]"
+            context="{'search_default_employee_id': [active_id]}" 
             res_model="hr.holidays"
             src_model="hr.employee"
             view_id ="eval('edit_holiday_new')"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index edd3bd77599..033fd68052c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -128,10 +128,10 @@
                         <separator colspan="4" string="Status"/>
                         <group col="8" colspan="4">
                             <field name="state"/>
-                            <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                            <button name="case_close" string="Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
                             <button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                            <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
+                            <button name="case_close" string="Hired" states="open,pending" type="object" icon="terp-partner"/>
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c31dfd1ab0f..cb034a8659d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -129,7 +129,7 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
+                        <button name="button_confirm" states="draft" string="Close" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                         <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
                         <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
@@ -322,7 +322,9 @@
             </field>
         </record>
   <!-- Timesheet Button on Employee Form -->
-  <act_window domain="[('user_id', '=', user_id)]" id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+  <act_window 
+           context="{'search_default_employee_id': [active_id]}" 
+           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
 
     </data>
 </openerp>

From ea26c97f35a214d1c291c0ae03c097776a60310a Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Sat, 9 Oct 2010 12:13:46 +0530
Subject: [PATCH 493/632] [FIX] account : Missing variable reference Corrected

bzr revid: ach@tinyerp.com-20101009064346-2rt41ect2lci0tr0
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 9176a2eec64..8ff9d35086e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2722,7 +2722,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
-        data = obj_pool.browse(cr, uid, data_id[0])
+        data = obj_data.browse(cr, uid, data_id[0])
         view_id_cash = data.res_id
 
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])

From fd38631931c2ae6843cdac4ea22a97bbfc5adbd8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 19:37:50 +0200
Subject: [PATCH 494/632] [IMP] removing based on for tax statement

bzr revid: fp@tinyerp.com-20101008173750-q0c5bqdx88pgvu2j
---
 addons/account/wizard/account_vat_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index c8a6645f744..018c753a7c2 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -10,7 +10,7 @@
             <form string="Select Period">
                 <field name="company_id" groups="base.group_multi_company" widget='selection'/>
                 <newline/>
-                <field name="based_on"/>
+                <field name="based_on" invisible="1"/>
                 <newline/>
                 <separator string="Select Period(s)" colspan="4"/>
                 <field name="periods" nolabel="1" colspan="2"/>

From 97372d3be9b12aad0bb812af8bc3597d1140f740 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 8 Oct 2010 19:38:51 +0200
Subject: [PATCH 495/632] modifs

bzr revid: fp@tinyerp.com-20101008173851-dduwvd1mt668u6hz
---
 addons/account/report/account_tax_report.py | 326 ++++++++++----------
 1 file changed, 163 insertions(+), 163 deletions(-)

diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index d9bcabf0ce4..b03aea5c05d 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -26,195 +26,195 @@ import rml_parse
 from report import report_sxw
 
 class tax_report(rml_parse.rml_parse):
-	_name = 'report.account.vat.declaration'
-	def __init__(self, cr, uid, name, context={}):
-		super(tax_report, self).__init__(cr, uid, name, context=context)
-		self.localcontext.update({
-			'time': time,
-			'get_period': self._get_period,
-			'get_codes': self._get_codes,
-			'get_general': self._get_general,
-			'get_company': self._get_company,
-			'get_currency': self._get_currency,
-			'get_lines': self._get_lines,
-		})
+    _name = 'report.account.vat.declaration'
+    def __init__(self, cr, uid, name, context={}):
+        super(tax_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+            'get_period': self._get_period,
+            'get_codes': self._get_codes,
+            'get_general': self._get_general,
+            'get_company': self._get_company,
+            'get_currency': self._get_currency,
+            'get_lines': self._get_lines,
+        })
 
 
-	def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
-		res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
+    def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
+        res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
 
-		if period_list:
-			res = self._add_codes(based_on, res, period_list, context=context)
-		else:
-			self.cr.execute ("select id from account_fiscalyear")
-			fy = self.cr.fetchall()
-			self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
-			periods = self.cr.fetchall()
-			for p in periods:
-				period_list.append(p[0])
-			res = self._add_codes(based_on, res, period_list, context=context)
+        if period_list:
+            res = self._add_codes(based_on, res, period_list, context=context)
+        else:
+            self.cr.execute ("select id from account_fiscalyear")
+            fy = self.cr.fetchall()
+            self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
+            periods = self.cr.fetchall()
+            for p in periods:
+                period_list.append(p[0])
+            res = self._add_codes(based_on, res, period_list, context=context)
 
-		i = 0
-		top_result = []
-		while i < len(res):
+        i = 0
+        top_result = []
+        while i < len(res):
 
-			res_dict = { 'code': res[i][1].code,
-				'name': res[i][1].name,
-				'debit': 0,
-				'credit': 0,
-				'tax_amount': res[i][1].sum_period,
-				'type': 1,
-				'level': res[i][0],
-				'pos': 0
-			}
+            res_dict = { 'code': res[i][1].code,
+                'name': res[i][1].name,
+                'debit': 0,
+                'credit': 0,
+                'tax_amount': res[i][1].sum_period,
+                'type': 1,
+                'level': res[i][0],
+                'pos': 0
+            }
 
-			top_result.append(res_dict)
-			res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
-			ind_general = 0
-			while ind_general < len(res_general):
-				res_general[ind_general]['type'] = 2
-				res_general[ind_general]['pos'] = 0
-				res_general[ind_general]['level'] = res_dict['level']
-				top_result.append(res_general[ind_general])
-				ind_general+=1
-			i+=1
-		return top_result
-		#return array_result
+            top_result.append(res_dict)
+            res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
+            ind_general = 0
+            while ind_general < len(res_general):
+                res_general[ind_general]['type'] = 2
+                res_general[ind_general]['pos'] = 0
+                res_general[ind_general]['level'] = res_dict['level']
+                top_result.append(res_general[ind_general])
+                ind_general+=1
+            i+=1
+        return top_result
+        #return array_result
 
-	def _get_period(self, period_id, context={}):
-		return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
+    def _get_period(self, period_id, context={}):
+        return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
 
-	def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
-		res=[]
-		obj_account = self.pool.get('account.account')
-		periods_ids = tuple(period_list)
-		if based_on == 'payments':
-			self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
-						SUM(line.debit) AS debit, \
-						SUM(line.credit) AS credit, \
-						COUNT(*) AS count, \
-						account.id AS account_id, \
-						account.name AS name,  \
-						account.code AS code \
-					FROM account_move_line AS line, \
-						account_account AS account, \
-						account_move AS move \
-						LEFT JOIN account_invoice invoice ON \
-							(invoice.move_id = move.id) \
-					WHERE line.state<>%s \
-						AND line.tax_code_id = %s  \
-						AND line.account_id = account.id \
-						AND account.company_id = %s \
-						AND move.id = line.move_id \
-						AND line.period_id IN %s \
-						AND ((invoice.state = %s) \
-							OR (invoice.id IS NULL))  \
-					GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
-						company_id, periods_ids, 'paid',))
+    def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
+        res=[]
+        obj_account = self.pool.get('account.account')
+        periods_ids = tuple(period_list)
+        if based_on == 'payments':
+            self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+                        SUM(line.debit) AS debit, \
+                        SUM(line.credit) AS credit, \
+                        COUNT(*) AS count, \
+                        account.id AS account_id, \
+                        account.name AS name,  \
+                        account.code AS code \
+                    FROM account_move_line AS line, \
+                        account_account AS account, \
+                        account_move AS move \
+                        LEFT JOIN account_invoice invoice ON \
+                            (invoice.move_id = move.id) \
+                    WHERE line.state<>%s \
+                        AND line.tax_code_id = %s  \
+                        AND line.account_id = account.id \
+                        AND account.company_id = %s \
+                        AND move.id = line.move_id \
+                        AND line.period_id IN %s \
+                        AND ((invoice.state = %s) \
+                            OR (invoice.id IS NULL))  \
+                    GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+                        company_id, periods_ids, 'paid',))
 
-		else:
-			self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
-						SUM(line.debit) AS debit, \
-						SUM(line.credit) AS credit, \
-						COUNT(*) AS count, \
-						account.id AS account_id, \
-						account.name AS name,  \
-						account.code AS code \
-					FROM account_move_line AS line, \
-						account_account AS account \
-					WHERE line.state <> %s \
-						AND line.tax_code_id = %s  \
-						AND line.account_id = account.id \
-						AND account.company_id = %s \
-						AND line.period_id IN %s\
-						AND account.active \
-					GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
-						company_id, periods_ids,))
-		res = self.cr.dictfetchall()
+        else:
+            self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+                        SUM(line.debit) AS debit, \
+                        SUM(line.credit) AS credit, \
+                        COUNT(*) AS count, \
+                        account.id AS account_id, \
+                        account.name AS name,  \
+                        account.code AS code \
+                    FROM account_move_line AS line, \
+                        account_account AS account \
+                    WHERE line.state <> %s \
+                        AND line.tax_code_id = %s  \
+                        AND line.account_id = account.id \
+                        AND account.company_id = %s \
+                        AND line.period_id IN %s\
+                        AND account.active \
+                    GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+                        company_id, periods_ids,))
+        res = self.cr.dictfetchall()
 
-		i = 0
-		while i<len(res):
-			res[i]['account'] = obj_account.browse(self.cr, self.uid, res[i]['account_id'], context=context)
-			i+=1
-		return res
+        i = 0
+        while i<len(res):
+            res[i]['account'] = obj_account.browse(self.cr, self.uid, res[i]['account_id'], context=context)
+            i+=1
+        return res
 
-	def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context={}):
-		obj_tc = self.pool.get('account.tax.code')
-		ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], context=context)
+    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context={}):
+        obj_tc = self.pool.get('account.tax.code')
+        ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], context=context)
 
-		res = []
-		for code in obj_tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
-			res.append(('.'*2*level, code))
+        res = []
+        for code in obj_tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
+            res.append(('.'*2*level, code))
 
-			res += self._get_codes(based_on, company_id, code.id, level+1, context=context)
-		return res
+            res += self._get_codes(based_on, company_id, code.id, level+1, context=context)
+        return res
 
-	def _add_codes(self, based_on, account_list=[], period_list=[], context={}):
-		res = []
-		obj_tc = self.pool.get('account.tax.code')
-		for account in account_list:
-			ids = obj_tc.search(self.cr, self.uid, [('id','=', account[1].id)], context=context)
-			sum_tax_add = 0
-			for period_ind in period_list:
-				for code in obj_tc.browse(self.cr, self.uid, ids, {'period_id':period_ind,'based_on': based_on}):
-					sum_tax_add = sum_tax_add + code.sum_period
+    def _add_codes(self, based_on, account_list=[], period_list=[], context={}):
+        res = []
+        obj_tc = self.pool.get('account.tax.code')
+        for account in account_list:
+            ids = obj_tc.search(self.cr, self.uid, [('id','=', account[1].id)], context=context)
+            sum_tax_add = 0
+            for period_ind in period_list:
+                for code in obj_tc.browse(self.cr, self.uid, ids, {'period_id':period_ind,'based_on': based_on}):
+                    sum_tax_add = sum_tax_add + code.sum_period
 
-			code.sum_period = sum_tax_add
+            code.sum_period = sum_tax_add
 
-			res.append((account[0], code))
-		return res
+            res.append((account[0], code))
+        return res
 
 
-	def _get_company(self, form, context={}):
-		obj_company = self.pool.get('res.company')
-		return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).name
+    def _get_company(self, form, context={}):
+        obj_company = self.pool.get('res.company')
+        return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).name
 
-	def _get_currency(self, form, context={}):
-		obj_company = self.pool.get('res.company')
-		return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name
+    def _get_currency(self, form, context={}):
+        obj_company = self.pool.get('res.company')
+        return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name
 
-	def sort_result(self, accounts, context={}):
-		# On boucle sur notre rapport
-		result_accounts = []
-		ind=0
-		old_level=0
-		while ind<len(accounts):
-			#
-			account_elem = accounts[ind]
-			#
+    def sort_result(self, accounts, context={}):
+        # On boucle sur notre rapport
+        result_accounts = []
+        ind=0
+        old_level=0
+        while ind<len(accounts):
+            #
+            account_elem = accounts[ind]
+            #
 
-			#
-			# we will now check if the level is lower than the previous level, in this case we will make a subtotal
-			if (account_elem['level'] < old_level):
-				bcl_current_level = old_level
-				bcl_rup_ind = ind - 1
+            #
+            # we will now check if the level is lower than the previous level, in this case we will make a subtotal
+            if (account_elem['level'] < old_level):
+                bcl_current_level = old_level
+                bcl_rup_ind = ind - 1
 
-				while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
-					tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
-					res_tot = { 'code': accounts[bcl_rup_ind]['code'],
-						'name': '',
-						'debit': 0,
-						'credit': 0,
-						'tax_amount': accounts[bcl_rup_ind]['tax_amount'],
-						'type': accounts[bcl_rup_ind]['type'],
-						'level': 0,
-						'pos': 0
-					}
+                while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
+                    tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
+                    res_tot = { 'code': accounts[bcl_rup_ind]['code'],
+                        'name': '',
+                        'debit': 0,
+                        'credit': 0,
+                        'tax_amount': accounts[bcl_rup_ind]['tax_amount'],
+                        'type': accounts[bcl_rup_ind]['type'],
+                        'level': 0,
+                        'pos': 0
+                    }
 
-					if res_tot['type'] == 1:
-						# on change le type pour afficher le total
-						res_tot['type'] = 2
-						result_accounts.append(res_tot)
-					bcl_current_level =  accounts[bcl_rup_ind]['level']
-					bcl_rup_ind -= 1
+                    if res_tot['type'] == 1:
+                        # on change le type pour afficher le total
+                        res_tot['type'] = 2
+                        result_accounts.append(res_tot)
+                    bcl_current_level =  accounts[bcl_rup_ind]['level']
+                    bcl_rup_ind -= 1
 
-			old_level = account_elem['level']
-			result_accounts.append(account_elem)
-			ind+=1
+            old_level = account_elem['level']
+            result_accounts.append(account_elem)
+            ind+=1
 
-		return result_accounts
+        return result_accounts
 
 report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
-	'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
+    'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 0cbf401d86b2ab0364d41036a66d5bee4abb87ab Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 8 Oct 2010 21:14:23 +0200
Subject: [PATCH 496/632] [FIX] base: Can translate the shortcut of a partner

bzr revid: stephane@openerp.com-20101008191423-i9re6cdmoc22vddb
---
 bin/addons/base/res/partner/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 05630dea85b..3bef2042774 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -84,7 +84,7 @@ class res_partner_title(osv.osv):
     _name = 'res.partner.title'
     _columns = {
         'name': fields.char('Title', required=True, size=46, translate=True),
-        'shortcut': fields.char('Shortcut', required=True, size=16),
+        'shortcut': fields.char('Shortcut', required=True, size=16, translate=True),
         'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
     }
     _order = 'name'

From 56d97c79393a156af150fdb38cc99387ce85ae96 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Sat, 9 Oct 2010 02:42:28 +0530
Subject: [PATCH 497/632] [REF] project_timesheet

bzr revid: jvo@tinyerp.com-20101008211228-19r3vi8uar5py31f
---
 .../test/worktask_entry_to_timesheetline_entry.yml     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index d0477c545ff..b08300b8d33 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -1,5 +1,5 @@
 - 
-  Create an user 'HR Manager'
+  Create a user 'HR Manager'
 - 
   !record {model: res.users, id: res_users_hrmanager0}:
     company_id: base.main_company
@@ -9,7 +9,7 @@
     password: hr
             
 - 
-  Create a product with type service used to specifies employees designation
+  Create a product with type service used to specify employees designation
 - 
   !record {model: product.product, id: product_product_hrmanger0}:
     categ_id: product.product_category_services
@@ -45,7 +45,7 @@
     journal_id: account_analytic_journal_hrtimesheet0
         
 - 
-  Create a timesheet sheet for hr manager
+  Create a timesheet sheet for HR manager
 - 
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}:
     date_current: '2010-06-03'
@@ -86,7 +86,7 @@
       False, "active_id": ref("project_project_timesheetmanagement0"), })
 
 - 
-  Make a work task entry 'Get work calendar of all employees' of 10 hours done by hr manager 
+  Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager 
 - 
   !record {model: project.task, id: project_task_getalltimesheetrecords0}:
     work_ids:
@@ -96,7 +96,7 @@
         user_id: res_users_hrmanager0
 
 -
-  Check for timesheet_ids in hr manager's timesheet
+  Check for timesheet_ids in HR manager's timesheet
 -
   !assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0, string: After hr manager's work task, length of timesheet line of current timesheet must be greater then 1}:
      - len(timesheet_ids) > 0             
\ No newline at end of file

From d0317628aade90d1d8015cae782440683b862e21 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Sat, 9 Oct 2010 02:47:00 +0530
Subject: [PATCH 498/632] [FIX] Regression : changes from mx to datetime caused
 trouble for tasks by month

bzr revid: jvo@tinyerp.com-20101008211700-oa4037dd8mlmw37i
---
 addons/project_timesheet/report/task_report.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 261f4e17c64..623d4e4a5cd 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -32,8 +32,8 @@ class report_timesheet_task_user(osv.osv):
     def _get_task_hours(self, cr, uid, ids, name,args,context):
         result = {}
         for record in self.browse(cr, uid, ids,context):
-            last_date = datetime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1
-            task_obj=self.pool.get('project.task.work')
+            last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
+            task_obj = self.pool.get('project.task.work')
             task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
             tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id'])
             total = 0.0
@@ -46,8 +46,8 @@ class report_timesheet_task_user(osv.osv):
         result = {}
         sum = 0.0
         for record in self.browse(cr, uid, ids, context):
-            last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - 1
-            obj=self.pool.get('hr_timesheet_sheet.sheet.day')
+            last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
+            obj = self.pool.get('hr_timesheet_sheet.sheet.day')
             sheet_ids = obj.search(cr, uid, [('sheet_id.user_id','=',record.user_id.id),('name','>=',record.name),('name','<=',last_date.strftime('%Y-%m-%d'))])
             data_days = obj.read(cr, uid, sheet_ids, ['name','sheet_id.user_id','total_attendance'])
             total = 0.0

From 15aca5c64f27439f1d0f1e531a2d326006d8fd5b Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Sat, 9 Oct 2010 02:49:53 +0530
Subject: [PATCH 499/632] [REF] project_timesheet

bzr revid: jvo@tinyerp.com-20101008211953-90137gcozrk0wk3s
---
 addons/project_timesheet/project_timesheet.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 370525f0ae3..d6ed37a8aae 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -46,7 +46,7 @@ class project_work(osv.osv):
             raise osv.except_osv(_('Bad Configuration !'),
                  _('No journal defined on the related employee.\nFill in the timesheet tab of the employee form.'))
 
-        a =  emp.product_id.product_tmpl_id.property_account_expense.id
+        a = emp.product_id.product_tmpl_id.property_account_expense.id
         if not a:
             a = emp.product_id.categ_id.property_account_expense_categ.id
             if not a:
@@ -108,7 +108,6 @@ class project_work(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        obj = self.pool.get('hr.analytic.timesheet')
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
         project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
@@ -144,7 +143,7 @@ class project_work(osv.osv):
                     vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
                     
                 # Compute based on pricetype
-                amount_unit = obj.on_change_unit_amount(cr, uid, line_id.id,
+                amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
                     prod_id=prod_id,
                     quantity=vals_line['unit_amount'], unit=False, context=context)
 

From 9df9281b003637e6a716598518f2140288c0dda7 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 9 Oct 2010 12:13:48 +0000
Subject: [PATCH 500/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101009121348-auo95q0gwebhlzzn
---
 addons/account/i18n/ar.po                 |  64 +--
 addons/account/i18n/sv.po                 |   4 +-
 addons/account_analytic_plans/i18n/mn.po  | 376 ++++++++++++++++++
 addons/account_cancel/i18n/es.po          |   6 +-
 addons/account_chart/i18n/eu.po           |   6 +-
 addons/account_reporting/i18n/nl.po       |   6 +-
 addons/account_voucher/i18n/pl.po         |   6 +-
 addons/base_calendar/i18n/nl.po           | 335 ++++++++--------
 addons/base_contact/i18n/nl.po            |   6 +-
 addons/base_iban/i18n/eu.po               |   6 +-
 addons/base_module_quality/i18n/nl.po     |   6 +-
 addons/base_module_record/i18n/nl.po      |   6 +-
 addons/base_vat/i18n/eu.po                |   6 +-
 addons/claim_from_delivery/i18n/nl.po     |   6 +-
 addons/crm/i18n/it.po                     |   4 +-
 addons/crm/i18n/nl.po                     | 451 ++++++++++++----------
 addons/crm/i18n/pl.po                     |   6 +-
 addons/crm_claim/i18n/nl.po               | 286 +++++++-------
 addons/document_webdav/i18n/eu.po         |   6 +-
 addons/fetchmail/i18n/nl.po               |   6 +-
 addons/knowledge/i18n/nl.po               |   6 +-
 addons/marketing/i18n/nl.po               |   6 +-
 addons/mrp_jit/i18n/kab.po                |  23 ++
 addons/product/i18n/eu.po                 |   6 +-
 addons/product_expiry/i18n/pl.po          |   6 +-
 addons/project/i18n/eu.po                 |  23 +-
 addons/project_issue_sheet/i18n/pl.po     |   6 +-
 addons/project_messages/i18n/pl.po        |   6 +-
 addons/project_retro_planning/i18n/kab.po |  23 ++
 addons/thunderbird/i18n/eu.po             |   6 +-
 addons/wiki/i18n/sv.po                    |   4 +-
 31 files changed, 1109 insertions(+), 604 deletions(-)
 create mode 100644 addons/account_analytic_plans/i18n/mn.po
 create mode 100644 addons/mrp_jit/i18n/kab.po
 create mode 100644 addons/project_retro_planning/i18n/kab.po

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 8e2da0697f9..93e9f9a81ff 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 21:43+0000\n"
+"Last-Translator: Hamza Nizam <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -40,7 +40,7 @@ msgstr "تشفير المدخلات"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "تحديد الرسالة لتقرير الدفع المتأخر"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -55,17 +55,17 @@ msgstr "أصل"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "اسم النموذج غير صالح في تعريف العمل."
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "العملة المستعملة لإدخال البيان"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr "أختر رسالة"
+msgstr "اختر رسالة"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -73,28 +73,29 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"سيتم استخدام هذا الحساب لتقييم المؤن الواردة بالنسبة لفئة المنتج الحالي"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
+msgstr "الإبقاء فارغ لاستخدام فترة تاريخ المصادقة (الفاتورة)"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "نتيجة التسوية"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "مدخلات لم يتم تسويتها"
+msgstr "إدخالات لم يتم تسويتها"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "رمز الأساس"
 
 #. module: account
 #: view:account.account:0
@@ -115,12 +116,12 @@ msgstr "أصل"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "قسيمة الدفتر"
 
 #. module: account
 #: field:account.invoice,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "متبقي"
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -128,18 +129,18 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "علامة رمز الأساس"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "إلغاء تسوية الإدخالات"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr ""
+msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -149,17 +150,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "مُدخلات"
+msgstr "إدخالات"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "تمركز المدين"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "تثبيت مشاريع الفواتير"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -168,11 +169,14 @@ msgid ""
 "positive, it gives the day of the next month. Set 0 for net days (otherwise "
 "it's based on the beginning of the month)."
 msgstr ""
+"يوم الشهر، إدخال -1 من أجل آخر يوم من الشهر الحالي. إذا كان إيجابيا  فسيعطي "
+"اليوم من الشهر القادم. إدخال 0 من أجل أيام صافية (وإلا فإنه يستند إلى بداية "
+"الشهر)."
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "مجموع المدين"
 
 #. module: account
 #: field:account.config.wizard,charts:0
@@ -190,39 +194,39 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Entry label"
-msgstr ""
+msgstr "تسمية المدخل"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "إدخالات نماذج الحسابات"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr ""
+msgstr "مجموع الفترة"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "رمز الحساب (إذا كان النوع = الرمز)"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "خط إدخال الحساب"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr ""
+msgstr "ميزان المراجعة القديم"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr ""
+msgstr "إدخالات متكررة"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -235,19 +239,19 @@ msgstr ""
 #: field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
-msgstr ""
+msgstr "المبلغ"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr ""
+msgstr "دفتر الشركاء"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "ضرائب المورد"
 
 #. module: account
 #: view:account.move:0
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index dca0d843292..3d0b6f9dc62 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-07 19:39+0000\n"
+"PO-Revision-Date: 2010-10-08 07:35+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: <> <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
new file mode 100644
index 00000000000..db1f0696490
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/mn.po
@@ -0,0 +1,376 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-08 11:24+0000\n"
+"Last-Translator: sugi <Unknown>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr "Дансны дугаар 4"
+
+#. module: account_analytic_plans
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"\"\"болохгүй!"
+
+#. module: account_analytic_plans
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
+msgid "Crossovered Analytic"
+msgstr "Crossovered Analytic"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Дансны дугаар 5"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date2:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Үнэ (%)"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Аналитик төлөвлөгөө"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr "Analytic Instance Line"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr "Analytic Distribution Lines"
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,print:0
+msgid "Print"
+msgstr "Хэвлэх"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Огноо"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Төлөвлөгөөний дугаар"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Аналитик байрлалын модел"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Дансны нэр"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr "Analytic Distribution Line"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr "Байрлалын код"
+
+#. module: account_analytic_plans
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Plan Name"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Хэвлэсэн огноо"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Хувь"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
+msgid "Dont show empty lines"
+msgstr "Хоосон мөрийг харуулахгүй"
+
+#. module: account_analytic_plans
+#: wizard_view:wizard.crossovered.analytic,init:0
+msgid "Select Information"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Дансны дугаар 3"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Аналитик Журнал"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr "100.00%"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,ref:0
+msgid "Analytic Account Ref."
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Analytic Account :"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Line"
+msgstr "Analytic Plan Line"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr "Analytic Account Reference:"
+
+#. module: account_analytic_plans
+#: model:ir.actions.wizard,name:account_analytic_plans.create_model
+msgid "Create Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr "Default Entries"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+msgid "Analytic Plans"
+msgstr "Аналитик төлөвлөгөө"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimum Allowed (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr "Account1 Id"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Maximum Allowed (%)"
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid "Distribution Model Saved"
+msgstr "Distribution Model Saved"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Analytic Plan Instance"
+
+#. module: account_analytic_plans
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr "Distribution Models"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"        "
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr "Multiple-plans management in Analytic Accounting"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Lines"
+msgstr "Analytic Plan Lines"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Crossovered Analytic -"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Model's Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Account2 Id"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Дүн"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Root account of this plan."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Account6 Id"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr "Account Id"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Код"
+
+#. module: account_analytic_plans
+#: wizard_button:create.model,info,end:0
+msgid "OK"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Root Account"
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid ""
+"This distribution model has been saved. You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Sequence"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Аналитик Данс"
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Аналитик тархалт"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
+msgid "Analytic Distribution's models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,end:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date1:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "at"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "From Date"
diff --git a/addons/account_cancel/i18n/es.po b/addons/account_cancel/i18n/es.po
index 555253dc4d1..946a5d1e60e 100644
--- a/addons/account_cancel/i18n/es.po
+++ b/addons/account_cancel/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-10-06 02:17+0000\n"
-"Last-Translator: Marcelo Zunino (http://infoprimo.com) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:36+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Spanish <es@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_cancel
diff --git a/addons/account_chart/i18n/eu.po b/addons/account_chart/i18n/eu.po
index ed5e94e1f73..570795a55f6 100644
--- a/addons/account_chart/i18n/eu.po
+++ b/addons/account_chart/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 09:31+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_reporting/i18n/nl.po b/addons/account_reporting/i18n/nl.po
index 4ed85667eba..6202a88cc3b 100644
--- a/addons/account_reporting/i18n/nl.po
+++ b/addons/account_reporting/i18n/nl.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 17:30+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:36+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index a1ddddebc4d..2bde4729e33 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-07 16:41+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 2f356806b1e..36433e6ca48 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-10-04 06:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 12:13+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "De activiteit begint"
+msgstr "De gebeurtenis begint"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -173,7 +173,7 @@ msgstr "Geeft aan of een antwoordverzoek gevraagd wordt"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
@@ -218,7 +218,7 @@ msgstr "Jaarlijks"
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "De activiteit eindigt"
+msgstr "De gebeurtenis eindigt"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -312,7 +312,7 @@ msgstr "Per seconde"
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr "Datum activiteit"
+msgstr "Datum gebeurtenis"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -328,7 +328,7 @@ msgstr "Relatie gekoppeld aan contactpersoon"
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr ""
+msgstr "Geef de soort uitnodiging op"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -336,12 +336,14 @@ msgstr ""
 msgid ""
 "defines a rule or repeating pattern for an exception to a recurrence set"
 msgstr ""
+"definieert een regel of herhalingspatroon voor een uitzondering op een "
+"herhaling"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "Einddatum activiteit"
+msgstr "Einddatum gebeurtenis"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -384,7 +386,7 @@ msgstr "Organisator"
 #: model:res.request.link,name:base_calendar.request_link_meeting
 #, python-format
 msgid "Event"
-msgstr "Activiteit"
+msgstr "Gebeurtenis"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
@@ -402,7 +404,7 @@ msgstr "Bevestigd"
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
 msgid "Edit all events"
-msgstr "Reeks bewerken"
+msgstr "Wijzig alle gebeurtenissen"
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
@@ -478,7 +480,7 @@ msgstr "E-mail"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Event Detail"
-msgstr "Detail activiteit"
+msgstr "Detail gebeurtenis"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -488,7 +490,7 @@ msgstr "Uitvoeren"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr "Informatie herinnering activiteit"
+msgstr "Alarminformatie gebeurtenis"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
@@ -553,7 +555,7 @@ msgstr "Toegewezen aan"
 #. module: base_calendar
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Ongeldige argumenten"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -631,219 +633,220 @@ msgstr "Selecteer gegevens voor uitzondering regel"
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Contactpersonen relatie"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Ok"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "Eerste"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacy"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Onderwerp"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
 msgid "Check this if you want to send an Email to Invited Person"
-msgstr ""
+msgstr "Vink aan als u een email naar de uitgenodigde persoon te sturen"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Beschikbaarheid"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "_Save"
-msgstr ""
+msgstr "Op_slaan"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "Persoon"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Eigenaar"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "Overdracht info"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "Algemene naam"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "Geweigerd"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "Mijn rol"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "Mijn gebeurtenissen"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "Weigeren"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "Groep"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Edit All"
-msgstr ""
+msgstr "Bewerk alles"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactpersonen"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Basis alarm informatie"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Vrij"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Detail uitnodiging"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "Lid"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Locatie gebeurtenis"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Herhaling regel"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "Bijlage"
 
 #. module: base_calendar
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief Menu maken."
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Uitnodiging van"
 
 #. module: base_calendar
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "Herinnering"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
-msgstr ""
+msgstr "Stel uitzondering regel in"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr ""
+msgstr "Gebeurtenissen"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "Uitnodigen deelnemers"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "E-mail van uitgenodigde persoon"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Herhaal"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -851,131 +854,133 @@ msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
 msgstr ""
+"Verwijzing naar de URL die wijst naar de directory informatie die "
+"overeenkomt met de deelnemer."
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Maandag"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Derde"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "Basis alarm"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "De"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "Overgenomen van"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "ExRule"
-msgstr ""
+msgstr "UitzRegel"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Geeft de groepen aan waar de deelnemer bij behoort"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Maa"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 #: field:calendar.event,count:0
 #: field:calendar.todo,count:0
 msgid "Count"
-msgstr ""
+msgstr "Aantal"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Onzeker"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "Taal"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Voor of na"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "Begin of eind"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
@@ -984,20 +989,20 @@ msgstr ""
 #: field:calendar.todo,interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Interval"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Woensdag"
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1005,17 +1010,17 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation"
-msgstr ""
+msgstr "Uitnodiging"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "Actie"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1024,31 +1029,33 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"Duur en herhaling zijn beide optioneel, maar als één is ingevuld dan moet de "
+"ander ook"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Agenda wijzig alle gebeurtenissen"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "Aanwezigheid"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Referentie"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "Definieert de te nemen actie als het alarm afgaat"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Zoek gebeurtenissen"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -1057,7 +1064,7 @@ msgstr ""
 #: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Wekelijks"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1068,12 +1075,14 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Als het actief veld wordt uitgezet, kunt u het verbergen zonder te moeten "
+"verwijderen"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Herhaling ID datum"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1083,60 +1092,60 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "Details herinnering"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "Na te kijken"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Frequentie"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Klaar"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "of"
-msgstr ""
+msgstr "van"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Dinsdag"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1145,11 +1154,13 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
+"Geeft een meer complete beschrijving van de agenda component dan het "
+"\"Samenvatting\" veld."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Verantwoordelijke gebruiker"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1157,82 +1168,84 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "Bezet"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "Agenda gebeurtenis"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "Voorlopig"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Herhaling"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
 #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
 msgid "Event Invitations"
-msgstr ""
+msgstr "Uitnodigingen"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Donderdag"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Aangepast"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Uitzondering regel"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
 msgstr ""
+"Om de taal op te geven voor tekst waarden in de eigenschap of eigenschap "
+"parameter."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Personen uitnodigen"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1242,11 +1255,14 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Definieert een regel of herhalingspatroon voor terugkerende gebeurtenissen,\n"
+"bijv.: Om de maand op de laatste zondag van de maand voor 10 keer:\n"
+"        FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr ""
+msgstr "URI Referentie"
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1256,59 +1272,59 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "Soort"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Search Invitations"
-msgstr ""
+msgstr "Zoek uitnodigingen"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "Na"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "Stoppen"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.values"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "Objecten"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Overgedragen"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Zat"
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -1319,47 +1335,52 @@ msgid ""
 "    - Recurring events\n"
 "    - Invitations to people"
 msgstr ""
+"Compleet agenda systeem met ondersteuning voor:\n"
+"    - Agenda voor vergaderingen\n"
+"    - Herinneringen (create requests)\n"
+"    - Terugkerende gebeurtenissen\n"
+"    - Uitnodigingen aan personen"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Elke minuut"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "Geef de gebruiker op die optreedt namens de kalender gebruiker"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Resource"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Uitzondering data/tijden"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1367,6 +1388,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Bevat de tekst om te gebruiken als email bericht onderwerp of bevat de tekst "
+"voor weergave"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1374,133 +1397,133 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarm"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
 #, python-format
 msgid "Please Apply Recurrency before applying Exception Rule."
-msgstr ""
+msgstr "Pas eerst herhaling toe en daarna de uitzondering regel."
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "Verstuurd door gebruiker"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Weekdag"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Op dag"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Geluid"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "Voor informatie doeleinden"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "Uitnodigen"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Informatie deelnemer"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Resource ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Vereist actie"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "Verstuurd door"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgnummer"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
 #: field:calendar.todo,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Tijdzone"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "Interne gebruiker"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Accepteren"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Zaterdag"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Uitnodiging naar"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Seconde"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Vrij/bezet"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1511,17 +1534,17 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duur"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "Externe e-mail"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Activeerdatum"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1533,10 +1556,16 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
+"* Verwijst naar een geluidsfragment, dat wordt afgespeeld nadat het alarm "
+"voor audio is afgegaan,\n"
+"                    * Bestand dat bedoeld is om mee te worden gestuurd als "
+"bijlage bij een e-mail bericht,\n"
+"                    * Verwijst naar een procedure bron, die wordt "
+"aangeroepen nadat het alarm is afgegaan voor procedure."
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Vijfde"
diff --git a/addons/base_contact/i18n/nl.po b/addons/base_contact/i18n/nl.po
index 210a3c644f8..849de035083 100644
--- a/addons/base_contact/i18n/nl.po
+++ b/addons/base_contact/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 01:32+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 15:15+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po
index 127595af75a..969dd928d23 100644
--- a/addons/base_iban/i18n/eu.po
+++ b/addons/base_iban/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 09:51+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/nl.po b/addons/base_module_quality/i18n/nl.po
index f3255b12f65..53e5775f97c 100644
--- a/addons/base_module_quality/i18n/nl.po
+++ b/addons/base_module_quality/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 17:56+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po
index efb8c5644a1..602cf5e47ab 100644
--- a/addons/base_module_record/i18n/nl.po
+++ b/addons/base_module_record/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 17:28+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po
index 0c74a4f7195..d291216494b 100644
--- a/addons/base_vat/i18n/eu.po
+++ b/addons/base_vat/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 09:35+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:35+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/claim_from_delivery/i18n/nl.po b/addons/claim_from_delivery/i18n/nl.po
index a30269ad2b4..90a8df127f3 100644
--- a/addons/claim_from_delivery/i18n/nl.po
+++ b/addons/claim_from_delivery/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:02+0000\n"
-"PO-Revision-Date: 2010-10-07 05:54+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index f8e168df0cf..bd2d8953efa 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-06 12:16+0000\n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 6a3af2858cc..d91cd46c9fd 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-07 17:37+0000\n"
+"PO-Revision-Date: 2010-10-08 11:38+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -326,7 +326,7 @@ msgstr "Tweede gesprek"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
 msgid "Subscribe to a Remote calendar"
-msgstr "Abonneer op een kalender op afstand"
+msgstr "Abonneer op een agenda op afstand"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
@@ -478,7 +478,7 @@ msgstr "Bestaande klant"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #. module: crm
 #: field:crm.case,categ_id:0
@@ -672,7 +672,7 @@ msgstr "Deze personen ontvangen email."
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr "Kalender tonen toegestaan"
+msgstr "Agenda tonen toegestaan"
 
 #. module: crm
 #: view:crm.job:0
@@ -1484,7 +1484,7 @@ msgstr "Minimum prioriteit"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_generic_wizard_act
 msgid "Meeting Generic Wizard"
-msgstr "Generieke afspraak wizard"
+msgstr "Generiek afspraak assistent"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim2
@@ -1946,12 +1946,12 @@ msgstr "crm.meeting.generic_wizard"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_history-act
 msgid "Histories"
-msgstr ""
+msgstr "Geschiedenis"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job1
 msgid "Graduate"
-msgstr ""
+msgstr "Afgestudeerde"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
@@ -1966,23 +1966,23 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Tree"
-msgstr ""
+msgstr "Leads-boom"
 
 #. module: crm
 #: field:crm.meeting,caldav_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav URL"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee"
-msgstr ""
+msgstr "Deelnemer"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Email Mislukt!"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1990,12 +1990,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Inkomend"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Fout! U kunt geen recursieve secties maken."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
@@ -2008,6 +2008,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Maakt het mogelijk uw OpenERP-agenda te synchroniseren met uw telefoon, "
+"Outlook, Sunbird, iCAL, ..."
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2015,7 +2017,7 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Year"
-msgstr ""
+msgstr "Dit jaar"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -2033,7 +2035,7 @@ msgstr "Hoogste"
 #. module: crm
 #: view:crm.job:0
 msgid "Contract Data"
-msgstr ""
+msgstr "Contractgegevens"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2044,11 +2046,13 @@ msgstr "Dagen"
 #: help:crm.menu.config_wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Wordt door bedrijven gebruikt voor foutopvolging en support vragen over "
+"software"
 
 #. module: crm
 #: field:crm.menu.config_wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Gedeelde agenda"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
@@ -2058,7 +2062,7 @@ msgstr "Antwoord aan"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
 msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Dossiers per lead en soort"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2069,12 +2073,12 @@ msgstr "Minuten"
 #: field:report.crm.case.section.categ2,amount_revenue:0
 #: field:report.crm.case.section.stage,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Gesch. omzet"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Initiële wervingsvraag"
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
@@ -2084,17 +2088,17 @@ msgstr "Hoogste prioriteit"
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "OPAQUE"
-msgstr ""
+msgstr "OPAQUE"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claims Info"
-msgstr ""
+msgstr "Info klachten"
 
 #. module: crm
 #: field:crm.case.category2,name:0
 msgid "Case Category2 Name"
-msgstr ""
+msgstr "Dossier naam categorie2"
 
 #. module: crm
 #: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2108,23 +2112,23 @@ msgstr "Omzetten naar verkoopkans"
 #: model:crm.case.stage,name:crm.stage_phone2
 #: view:crm.phonecall:0
 msgid "Held"
-msgstr ""
+msgstr "Vastgehouden"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Helpdesk Supports"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support4
 #: model:ir.ui.menu,name:crm.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm
 #: selection:crm.new.send.mail,init,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Ongewijzigd"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -2133,7 +2137,7 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Convert To Partner"
-msgstr ""
+msgstr "Omzetten naar relatie"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_from:0
@@ -2159,17 +2163,17 @@ msgstr "Prioriteit"
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Source"
-msgstr ""
+msgstr "Bron"
 
 #. module: crm
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Locatie"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Betalingsvorm"
 
 #. module: crm
 #: help:crm.case.rule,trg_date_range:0
@@ -2187,7 +2191,7 @@ msgstr ""
 #: view:crm.job:0
 #: view:crm.lead:0
 msgid "Stage: "
-msgstr ""
+msgstr "Fase: "
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2218,7 +2222,7 @@ msgstr "Te veranderen velden"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "Telefonische verkoop"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2233,7 +2237,7 @@ msgstr "Aangemaakt"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Information"
-msgstr ""
+msgstr "Lead informatie"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -2245,7 +2249,7 @@ msgstr "Segmentatieregels"
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
 #: view:crm.phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Geplande datum"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2258,21 +2262,23 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Helpt bij het vastleggen van het telefoongesprek resultaat of het plannen "
+"van een lijst van te voeren gesprekken."
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import
 msgid "Import ICS File"
-msgstr ""
+msgstr "Importeer ICS bestand"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Attendee Detail"
-msgstr ""
+msgstr "Detail deelnemer"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job3
 msgid " > Bac +5"
-msgstr ""
+msgstr " > Bac +5"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -2280,17 +2286,17 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor1
 msgid "Prospecting"
-msgstr ""
+msgstr "Zoeken"
 
 #. module: crm
 #: field:crm.case,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "E-mail werknemer"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_meeting
@@ -2300,7 +2306,7 @@ msgstr "Afspraak dossiers"
 #. module: crm
 #: view:crm.job:0
 msgid "Job Info"
-msgstr ""
+msgstr "Vacature-info"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2310,18 +2316,18 @@ msgstr "Afspraak annuleren"
 #. module: crm
 #: model:crm.case.section,name:crm.section_support0
 msgid "Jobs"
-msgstr ""
+msgstr "Banen"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(case_date)s = Creation date"
-msgstr ""
+msgstr "%(case_date)s = Aanmaakdatum"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone3
 #: view:crm.phonecall:0
 msgid "Not Held"
-msgstr ""
+msgstr "Niet vastgehouden"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_user:0
@@ -2331,12 +2337,12 @@ msgstr "Email de verantwoordelijke"
 #. module: crm
 #: view:crm.job:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Banen - Wervingsformulier"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Correctief"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity
@@ -2346,7 +2352,7 @@ msgstr "Verkoopkans dossiers"
 #. module: crm
 #: view:crm.case:0
 msgid "Support Query"
-msgstr ""
+msgstr "Supportvraag"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2359,7 +2365,7 @@ msgstr "Sjabloon te verzenden email"
 #: field:report.crm.case.section.categ2,month:0
 #: field:report.crm.case.section.stage,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support2
@@ -2369,23 +2375,23 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Leads"
 
 #. module: crm
 #: wizard_button:crm.new.send.mail,init,send:0
 #: wizard_button:crm.send.mail,init,send:0
 msgid "Send Email"
-msgstr ""
+msgstr "Verstuur Email"
 
 #. module: crm
 #: wizard_view:crm.new.send.mail,init:0
 msgid "Set case state to"
-msgstr ""
+msgstr "Zet dossierstatus op"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Creditcard"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2400,7 +2406,7 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Zoek banen"
 
 #. module: crm
 #: field:crm.case.history,log_id:0
@@ -2411,17 +2417,17 @@ msgstr "Log"
 #: help:crm.menu.config_wizard,fund:0
 msgid ""
 "This may help associations in their fund raising process and tracking."
-msgstr ""
+msgstr "Dit kan verenigingen helpen bij het bijhouden van hun fondsenwerving"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Terugzetten naar onbevestigd"
 
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "Helpdesk Support"
 
 #. module: crm
 #: field:crm.case,email_cc:0
@@ -2439,7 +2445,7 @@ msgstr "Opmerking"
 #: field:report.crm.case.section.categ2,delay_close:0
 #: field:report.crm.case.section.stage,delay_close:0
 msgid "Delay Close"
-msgstr ""
+msgstr "Vertraag afsluiten"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -2465,7 +2471,7 @@ msgstr "Gesloten"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Name2"
-msgstr ""
+msgstr "Naam kandidaat 2"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2485,7 +2491,7 @@ msgstr "Interne bespreking"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Events"
-msgstr ""
+msgstr "Gebeurtenissen"
 
 #. module: crm
 #: help:crm.menu.config_wizard,lead:0
@@ -2493,6 +2499,8 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Maakt het mogelijk om leads, pre-sales verzoeken en -contacten, te "
+"registreren en te volgen."
 
 #. module: crm
 #: help:crm.case,som:0
@@ -2501,11 +2509,15 @@ msgid ""
 "mentality in relation to our services.The scale hasto be created with a "
 "factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."
 msgstr ""
+"De gemoedstoestanden laat u een schaalverdeling definieren van de houding "
+"van de relatie t.o.v. onze dienstverlening. De verdeling moet worden gemaakt "
+"met een factor voor elk niveau van 0 (zeer ontevreden) tot 10 (uitzonderlijk "
+"tevreden)"
 
 #. module: crm
 #: field:crm.meeting,freebusy:0
 msgid "FreeBusy"
-msgstr ""
+msgstr "Vrijbezet"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
@@ -2515,22 +2527,22 @@ msgstr "Klant afspraak"
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc2:0
 msgid "Attachment2"
-msgstr ""
+msgstr "Bijlage2"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc3:0
 msgid "Attachment3"
-msgstr ""
+msgstr "Bijlage3"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Degree"
-msgstr ""
+msgstr "Graad"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,doc1:0
 msgid "Attachment1"
-msgstr ""
+msgstr "Bijlage1"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:0
@@ -2541,7 +2553,7 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #, python-format
 msgid "Phone Calls"
-msgstr ""
+msgstr "Telefoongesprekken"
 
 #. module: crm
 #: help:crm.case,active:0
@@ -2549,11 +2561,13 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "without removing it."
 msgstr ""
+"Als het actiefveld is gevuld, laat het u het dossier verbergen zonder het te "
+"verwijderen."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_menu_config_wizard
 msgid "crm.menu.config_wizard"
-msgstr ""
+msgstr "crm.menu.config_wizard"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -2563,12 +2577,12 @@ msgstr "Dossiergeschiedenis"
 #. module: crm
 #: field:crm.case,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Cheque"
 
 #. module: crm
 #: field:crm.case,active:0
@@ -2599,12 +2613,12 @@ msgstr ">"
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Phone"
-msgstr ""
+msgstr "Telefoonnummer kandidaat"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
 msgid "Send Mail"
-msgstr ""
+msgstr "Verstuur bericht"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
@@ -2621,13 +2635,13 @@ msgstr "Maanden"
 #: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
 msgid "To Assign"
-msgstr ""
+msgstr "Toe te wijzen"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_cal_subscribe.py:0
 #, python-format
 msgid "Please provide Proper URL !"
-msgstr ""
+msgstr "Geef aub correcte URL !"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
@@ -2638,6 +2652,7 @@ msgstr "Wanneer een echt project/verkoopkans is ontdekt"
 #: wizard_view:crm.job.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
+"Weet u zeker dat u een relatie wilt maken op basis van deze vacature?"
 
 #. module: crm
 #: wizard_field:crm.lead.opportunity_set,create_partner,action:0
@@ -2654,7 +2669,7 @@ msgstr "Actie"
 #: model:ir.ui.menu,name:crm.menu_crm_case_claims
 #, python-format
 msgid "Claims"
-msgstr ""
+msgstr "Klachten"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
@@ -2664,18 +2679,18 @@ msgstr "Verminder (0>1)"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_case_history_event
 msgid "History of Events"
-msgstr ""
+msgstr "Gebeurtenis geschiedenis"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_category2
 msgid "Category2 of case"
-msgstr ""
+msgstr "Categorie2 van dossier"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,to:0
 #: wizard_field:crm.send.mail,init,to:0
 msgid "To"
-msgstr ""
+msgstr "Aan"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -2685,7 +2700,7 @@ msgstr "%(case_user_email)s = Email verantwoordelijke"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_presale
 msgid "Sales"
-msgstr ""
+msgstr "Verkoop"
 
 #. module: crm
 #: view:crm.case:0
@@ -2696,18 +2711,18 @@ msgstr "Algemeen"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Assigned"
-msgstr ""
+msgstr "Toegewezen"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Recycled"
-msgstr ""
+msgstr "Hergebruikt"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead8
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "Overig"
 
 #. module: crm
 #: view:crm.case:0
@@ -2717,7 +2732,7 @@ msgstr ""
 #: selection:crm.new.send.mail,init,state:0
 #: view:crm.opportunity:0
 msgid "Done"
-msgstr ""
+msgstr "Klaar"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2727,7 +2742,7 @@ msgstr "Max interval"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
 msgid "All Opportunities"
-msgstr ""
+msgstr "Alle verkoopkansen"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2748,12 +2763,12 @@ msgstr ""
 #: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Open"
-msgstr "Openen"
+msgstr "Open"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PUBLIC"
-msgstr ""
+msgstr "PUBLIEK"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -2761,22 +2776,22 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Er bestaat al een relatie met deze naam."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "Phonecall Cases"
-msgstr ""
+msgstr "Telefoongesprek dossiers"
 
 #. module: crm
 #: help:crm.case.rule,sequence:0
 msgid "Gives the sequence order when displaying a list of case rules."
-msgstr ""
+msgstr "Bepaalt de volgorde waarin de dossier regels lijst wordt afgebeeld."
 
 #. module: crm
 #: field:crm.menu.config_wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm
 #: field:crm.case,user_id:0
@@ -2798,7 +2813,7 @@ msgstr "Verantwoordelijke"
 #: model:crm.case.stage,name:crm.stage_claim4
 #: model:crm.case.stage,name:crm.stage_meet3
 msgid "Invalid"
-msgstr ""
+msgstr "Ongeldig"
 
 #. module: crm
 #: wizard_button:crm.job.meeting_set,init,order:0
@@ -2814,7 +2829,7 @@ msgstr "Afsprakenagenda"
 #. module: crm
 #: view:crm.case:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Dossiers op fase en schattingen"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2829,12 +2844,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Name"
-msgstr ""
+msgstr "Leadnaam"
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Klacht/Actie Omschrijving"
 
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
@@ -2850,22 +2865,22 @@ msgstr "Afspraak voor leads-generatie"
 #: wizard_view:crm.lead.opportunity_set,create_partner:0
 #: wizard_view:crm.lead.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr ""
+msgstr "Weet u zeker dat u een relatie wilt aanmaken op basis van deze lead?"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job6
 msgid "Refused by Employee"
-msgstr ""
+msgstr "Geweigerd door werknemer"
 
 #. module: crm
 #: field:crm.case,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Werknemernaam"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job2
 msgid "First Interview"
-msgstr ""
+msgstr "Eerste gesprek"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -2873,17 +2888,17 @@ msgstr ""
 #: view:report.crm.case.section.categ2:0
 #: view:report.crm.case.section.stage:0
 msgid "This Month"
-msgstr ""
+msgstr "Deze maand"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Availability (weeks)"
-msgstr ""
+msgstr "Beschikbaarheid (weken)"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Opportunities Tree"
-msgstr ""
+msgstr "Verkoopkansen"
 
 #. module: crm
 #: help:crm.case,state:0
@@ -2896,16 +2911,23 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"De status wordt op 'Concept' gezet als het dossier wordt gemaakt.            "
+"                  \n"
+"Als het dossier in behandeling is, wordt de status op 'Open' gezet.          "
+"                        \n"
+"Als het dossier klaar is, gaat de status naar 'Gereed'.                      "
+"            \n"
+"Als het dossier moet worden nagekeken, wordt de status op 'Wachtend' gezet."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Open Jobs"
-msgstr ""
+msgstr "Open vacatures"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
 msgid "Email Address"
-msgstr ""
+msgstr "Emailadres"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2919,17 +2941,17 @@ msgstr ""
 #. module: crm
 #: field:crm.case,case_id:0
 msgid "Related Case"
-msgstr ""
+msgstr "Gerelateerde dossiers"
 
 #. module: crm
 #: field:crm.case.rule,server_action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Server-actie"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
 msgid "All Claims"
-msgstr ""
+msgstr "Alle klachten"
 
 #. module: crm
 #: field:crm.case.log,user_id:0
@@ -2940,12 +2962,12 @@ msgstr "Verantwoordelijke"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Email not sent !"
-msgstr ""
+msgstr "Email niet verstuurd!"
 
 #. module: crm
 #: wizard_field:crm.phonecall.partner_create,init,close:0
 msgid "Close Phonecall"
-msgstr ""
+msgstr "Afsluiten telefoongesprek"
 
 #. module: crm
 #: field:crm.case,email_last:0
@@ -2955,12 +2977,12 @@ msgstr "Laatste e-mail"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Regex on Communication History"
-msgstr ""
+msgstr "Regex op communicatie historie"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Incasso"
 
 #. module: crm
 #: field:crm.case,id:0
@@ -2981,7 +3003,7 @@ msgstr "Samenvatting verkoopkans"
 #. module: crm
 #: view:crm.case:0
 msgid "Search Case"
-msgstr ""
+msgstr "Zoek dossier"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2997,7 +3019,7 @@ msgstr "Dossieromschrijving"
 #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Toewijzen aan"
 
 #. module: crm
 #: field:crm.case,date_action_last:0
@@ -3007,22 +3029,22 @@ msgstr "Laatste actie"
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duur"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
 msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Dossiers op sectie, categorie en fase"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "Kandidaat aangenomen"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Werving & selectieproces"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
@@ -3033,12 +3055,12 @@ msgstr "Alle dossiers"
 #: code:addons/crm/wizard/crm_lead_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this lead."
-msgstr ""
+msgstr "Er is al een relatie gekoppeld aan deze lead"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Source"
-msgstr ""
+msgstr "Bron lead"
 
 #. module: crm
 #: field:report.crm.case.section.categ.categ2,nbr:0
@@ -3046,17 +3068,17 @@ msgstr ""
 #: field:report.crm.case.section.categ2,nbr:0
 #: field:report.crm.case.section.stage,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# Dossiers"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "PRIVATE"
-msgstr ""
+msgstr "PRIVÉ"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
 msgid "Provide path for Remote Calendar"
-msgstr ""
+msgstr "Geef pad naar remote agenda"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -3067,7 +3089,7 @@ msgstr "Segmentatie"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Fondsenformulier"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3078,17 +3100,17 @@ msgstr "Zoek afspraken"
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Maak een nieuwe relatie"
 
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "In behandeling"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3104,18 +3126,18 @@ msgstr "%(case_user)s = Naam verantwoordelijke"
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Doelstellingen"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Dossiers op sectie en soort"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Nazorg"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -3123,17 +3145,17 @@ msgstr ""
 #: wizard_button:caldav.crm.subscribe,display,end:0
 #: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Bestandsnaam"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Zoek leads"
 
 #. module: crm
 #: help:crm.case.rule,active:0
@@ -3141,6 +3163,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case rule "
 "without removing it."
 msgstr ""
+"Als het actiefveld in gevuld, kunt u het dossier verbergen zonder het te "
+"verwijderen."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3152,13 +3176,13 @@ msgstr "Fout!"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim_assign_wizard
 msgid "crm.claim.assign_wizard"
-msgstr ""
+msgstr "crm.claim.assign_wizard"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "Alle vacatureaanvragen"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3170,12 +3194,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Toegepaste baan"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -3183,11 +3207,13 @@ msgid ""
 "defines a rule or repeating pattern                                 for "
 "anexception to a recurrence set"
 msgstr ""
+"definieert een regel of herhalingspatroon voor een uitzondering op de "
+"herhalingsset"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr ""
+msgstr "Relevant"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
@@ -3197,17 +3223,17 @@ msgstr "Naam verkoopkans"
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Herhaling regel"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "ICS importeren"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Samenvatting gesprek"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -3222,7 +3248,7 @@ msgstr "Communicatiegeschiedenis dossier"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
 msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "Dossiers op verkoopkans en soort"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3256,17 +3282,18 @@ msgstr "Optionele expressie"
 #: model:crm.case.categ,name:crm.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
 msgstr ""
+"Sociale reïntegratie en ontwikkelingsstimulans niet-stedelijke gebieden"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this job request."
-msgstr ""
+msgstr "Er is al een relatie gedefinieerd voor deze vacature."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #. module: crm
 #: field:crm.case,description:0
@@ -3290,12 +3317,12 @@ msgstr "Kanaal"
 #. module: crm
 #: help:crm.case.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
-msgstr ""
+msgstr "Email-id van de personen waarvan de mail wordt verstuurd"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_claim
 msgid "Claim Cases"
-msgstr ""
+msgstr "Klachtendossiers"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3305,27 +3332,27 @@ msgstr "Email herinneringen (Inclusief de inhoud van het dossier)"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr ""
+msgstr "Dossiers op lead en fase"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Uitzondering Data/tijden"
 
 #. module: crm
 #: view:crm.meeting.generic_wizard:0
 msgid "Generic Wizard"
-msgstr ""
+msgstr "Generieke assistent"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Verkoopkansen van leads maken"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Overzichten"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3356,7 +3383,7 @@ msgstr "Verkoopkans prospect"
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Verwacht salaris"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
@@ -3366,7 +3393,7 @@ msgstr "Instellingen"
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
 msgid "Send New Mail"
-msgstr ""
+msgstr "Verstuur nieuwe mail"
 
 #. module: crm
 #: constraint:ir.cron:0
@@ -3376,23 +3403,23 @@ msgstr "Ongeldige argumenten"
 #. module: crm
 #: field:crm.meeting,transparent:0
 msgid "Trensparent"
-msgstr ""
+msgstr "Transparant"
 
 #. module: crm
 #: view:crm.case:0
 msgid "My Cases"
-msgstr ""
+msgstr "Mijn dossiers"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead7
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Word of mouth"
-msgstr ""
+msgstr "Mond-op-mond reclame"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Subject"
-msgstr ""
+msgstr "Onderwerp lead"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3403,27 +3430,27 @@ msgstr "Omzetten naar verkoopkans"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "Gepland"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
 msgid "Customer Office"
-msgstr ""
+msgstr "Kantoor klant"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Email"
-msgstr ""
+msgstr "E-mail kandidaat"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage: "
-msgstr ""
+msgstr "Verkoopfase: "
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "Soort actie"
 
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
@@ -3456,12 +3483,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Search Cases by User"
-msgstr ""
+msgstr "Zoek dossiers per gebruiker"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3476,7 +3503,7 @@ msgstr "Naar relatie mailen"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Fondsen"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
@@ -3486,7 +3513,7 @@ msgstr "Object-methode aanroepen"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
 msgid "All Funds"
-msgstr ""
+msgstr "Alle fondsen"
 
 #. module: crm
 #: field:crm.case.section,calendar:0
@@ -3498,12 +3525,12 @@ msgstr "Agenda"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "Verkoper"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
 msgid "HelpDesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm
 #: field:crm.case,ref2:0
@@ -3525,7 +3552,7 @@ msgstr "Afspraak plannen"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Kunst en cultuur"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3533,7 +3560,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Uitgaand"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3544,7 +3571,7 @@ msgstr "In historie plaatsen"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bevestigd"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3556,7 +3583,7 @@ msgstr "Niet lopend"
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Kans op succes"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3581,7 +3608,7 @@ msgstr "Uitstellen na trigger datum"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Details"
-msgstr ""
+msgstr "Details lead"
 
 #. module: crm
 #: field:crm.case.rule,act_section_id:0
@@ -3613,17 +3640,17 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "U dient te controleren of deze relatie niet al bestaat."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Qualication"
-msgstr ""
+msgstr "Kwalificatie"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Change RRule"
-msgstr ""
+msgstr "Wijzig regel"
 
 #. module: crm
 #: selection:crm.email.add.cc,name:0
@@ -3633,14 +3660,14 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "Dossiers op sectie, categorie en soort"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3648,12 +3675,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
 msgid "Licenced"
-msgstr ""
+msgstr "In licentie"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -3669,7 +3696,7 @@ msgstr "Hoofdsectie"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Plan telefoongesprek"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3686,12 +3713,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Contract"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -3706,7 +3733,7 @@ msgstr "Geraamde omzet"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Gezondheidszorg"
 
 #. module: crm
 #: view:crm.case:0
@@ -3720,7 +3747,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.assign_wizard:0
 msgid "Assign"
-msgstr ""
+msgstr "Toewijzen"
 
 #. module: crm
 #: field:crm.case,partner_address_id:0
@@ -3730,17 +3757,17 @@ msgstr "Contactpersoon relatie"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "Kantoor"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
 msgid "Fund Raising Cases"
-msgstr ""
+msgstr "Fondsenwerving dossiers"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Dossierfase"
 
 #. module: crm
 #: view:crm.case:0
@@ -3764,7 +3791,7 @@ msgstr "Afsluiten"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard
 msgid "crm.helpdesk.assign_wizard"
-msgstr ""
+msgstr "crm.helpdesk.assign_wizard"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3785,23 +3812,23 @@ msgstr "Afspraakdatum"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "CONFIDENTIAL"
-msgstr ""
+msgstr "VERTROUWELIJK"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "Inhoud van mail"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet2
 msgid "Not fixed"
-msgstr ""
+msgstr "Niet opgelost"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead3
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Employee"
-msgstr ""
+msgstr "Werknemer"
 
 #. module: crm
 #: field:crm.case,email_from:0
@@ -3811,7 +3838,7 @@ msgstr "Email relatie"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "% = The '%' Character"
-msgstr ""
+msgstr "% = het '%' teken"
 
 #. module: crm
 #: view:crm.case:0
@@ -3832,12 +3859,12 @@ msgstr "Omschrijving"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne notities"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
@@ -3857,7 +3884,7 @@ msgstr ""
 #: view:crm.opportunity:0
 #: wizard_field:crm.send.mail,init,cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
@@ -3867,7 +3894,7 @@ msgstr "Verplicht / Optioneel"
 #. module: crm
 #: wizard_button:caldav.crm.import,init,open:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importeren"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3900,7 +3927,7 @@ msgstr "Laagste"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3928,7 +3955,7 @@ msgstr ""
 #: wizard_view:crm.new.send.mail,init:0
 #: wizard_view:crm.send.mail,init:0
 msgid "Mass Mailing"
-msgstr ""
+msgstr "Bulk-mailing"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3941,22 +3968,22 @@ msgstr "E-mail acties"
 #: field:report.crm.case.section.categ2,name:0
 #: field:report.crm.case.section.stage,name:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Contant"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Fondsen op categorie"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Eerste contact met een nieuwe mogelijke klant"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3964,22 +3991,22 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_meet5
 msgid "Future"
-msgstr ""
+msgstr "Toekomst"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,file_path:0
 msgid "Save ICS file"
-msgstr ""
+msgstr "ICS bestand opslaan"
 
 #. module: crm
 #: wizard_field:caldav.crm.subscribe,init,url_path:0
 msgid "Provide path for remote calendar"
-msgstr ""
+msgstr "Geef het pas naar de remote agenda"
 
 #. module: crm
 #: view:crm.case.log:0
@@ -3994,12 +4021,12 @@ msgstr "Voorwaarden aan timing"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_helpdesk
 msgid "Helpdesk Cases"
-msgstr ""
+msgstr "Helpdesk dossiers"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export
 msgid "Export ICS File"
-msgstr ""
+msgstr "Exporteer ICS bestand"
 
 #. module: crm
 #: field:crm.case.rule,sequence:0
@@ -4012,12 +4039,12 @@ msgstr "Reeks"
 #: wizard_view:caldav.crm.import,init:0
 #: wizard_field:caldav.crm.import,init,file_path:0
 msgid "Select ICS file"
-msgstr ""
+msgstr "Selecteer ICS bestand"
 
 #. module: crm
 #: wizard_view:caldav.crm.import,display:0
 msgid "Import Message"
-msgstr ""
+msgstr "Importeer bericht"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -4033,17 +4060,17 @@ msgstr "Dossiers op sectie"
 #. module: crm
 #: view:crm.job:0
 msgid "New Jobs"
-msgstr ""
+msgstr "Nieuwe banen"
 
 #. module: crm
 #: field:crm.menu.config_wizard,fund:0
 msgid "Fund Raising Operations"
-msgstr ""
+msgstr "Fondswervingsacties"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Nieuwsbrief"
 
 #~ msgid "Add Last Mail for Replying"
 #~ msgstr "Laatste email aan het antwoord toevoegen"
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index de78871a520..efb185982ed 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-06 13:24+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 12c33ba2d66..e6794aa1fda 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -8,84 +8,84 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:07+0000\n"
-"PO-Revision-Date: 2010-09-10 11:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-08 12:56+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
 #: field:crm.claim,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Geraamde omzet"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# Dossiers"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op.."
 
 #. module: crm_claim
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Vertraging tot sluiting"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: crm_claim
 #: field:crm.claim,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Email toeschouwers"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr ""
+msgstr "# Klacht"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "This Year"
-msgstr ""
+msgstr "Dit jaar"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Cases"
-msgstr ""
+msgstr "Dossiers"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Hoogste"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: crm_claim
 #: help:crm.claim,canal_id:0
@@ -94,6 +94,9 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate thecanall which "
 "is this opportunity source."
 msgstr ""
+"De kanalen geven de verschillende beschikbare communicatievormen met de "
+"klant weer. Met elke verkoopkans kunt u aangeven via welk kanaal deze kans "
+"is ontstaan."
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
@@ -101,152 +104,154 @@ msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Verkoopteam waaraan het dossier is toegewezen. Definieer de "
+"verantwoordelijke gebruiker en email account voor mail gateway."
 
 #. module: crm_claim
 #: field:crm.claim,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobiel"
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Feitelijke klachten"
 
 #. module: crm_claim
 #: field:crm.claim,type_id:0
 #: field:crm.claim.report,type_id:0
 msgid "Claim Type"
-msgstr ""
+msgstr "Soort klacht"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventief"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
 msgid "Fixed"
-msgstr ""
+msgstr "Opgelost"
 
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contactpersoon relatie"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case"
-msgstr ""
+msgstr "Mijn klacht"
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referentie"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Volgende actie"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Terugzetten naar Concept"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Extra info"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,partner_id:0
 #: field:crm.claim.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: crm_claim
 #: field:crm.claim,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
 #: selection:crm.claim,state:0
 #: selection:crm.claim.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Gesloten"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Afdeling"
 
 #. module: crm_claim
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Verstuur nieuwe email"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "Beantwoorden"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Stage: "
-msgstr ""
+msgstr "Fase: "
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Soort"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: crm_claim
 #: field:crm.claim,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanaal"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Laagste"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -254,28 +259,28 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Wacht"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Uiterste datum"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr ""
+msgstr "Klachtfases"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
 msgid "Categories"
-msgstr ""
+msgstr "Categoriën"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -283,110 +288,110 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History Information"
-msgstr ""
+msgstr "Historie Informatie"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Dates"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_resource_act
 msgid "Claim Resource Type"
-msgstr ""
+msgstr "Klacht Actie Soorten"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Contact"
-msgstr ""
+msgstr "Contactpersoon"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Fasen"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
 msgid "Claims Analysis"
-msgstr ""
+msgstr "Klachten Analyse"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Aantal dagen om de klacht te sluiten"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "CRM Klachtenrapport"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Status and Categorization"
-msgstr ""
+msgstr "Status en and indeling"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Geaccepteerd als klacht"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Correctief"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Wijzigingsdatum"
 
 #. module: crm_claim
 #: field:crm.claim,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referentie 2"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
 #: view:crm.claim.report:0
 #: field:crm.claim.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Waarde klachten"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure Date"
-msgstr ""
+msgstr "Afsluitdatum"
 
 #. module: crm_claim
 #: field:crm.claim,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Verwachte kosten"
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -395,111 +400,114 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Deze email adressen worden toegevoegd aan het CC veld van alle inkomende en "
+"uitgaande emails van dit record voordat het wordt verstuurd. Meerdere namen "
+"scheidt u met een komma (,)."
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Laag"
 
 #. module: crm_claim
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 Dagen"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globale CC"
 
 #. module: crm_claim
 #: model:ir.module.module,shortdesc:crm_claim.module_meta_information
 msgid "Customer & Supplier Relationship Management"
-msgstr ""
+msgstr "Customer & Supplier Relationship Management"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "Soort actie"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Wacht op reactie"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr ""
+msgstr "Klachtcategoriën"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "Afsluiting"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_claim_type_act
 msgid "Resource Type"
-msgstr ""
+msgstr "Actie Soort"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Search"
-msgstr ""
+msgstr "Zoeken"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm_claim
 #: model:ir.module.module,description:crm_claim.module_meta_information
@@ -511,31 +519,37 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Deze modules laten u de klachten van uw klanten en leveranciers volgen.\n"
+"Het is volledig geïntegreerd met de e-mail gateway zodat u automatisch "
+"nieuwe\n"
+"klachten kunt maken op basis van ingekomen emails.\n"
+"    "
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Date"
-msgstr ""
+msgstr "Klachtdatum"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Deze personen ontvangen email."
 
 #. module: crm_claim
 #: field:crm.claim,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim4
 msgid "Invalid"
-msgstr ""
+msgstr "Ongeldig"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -544,28 +558,28 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 msgid "Claims"
-msgstr ""
+msgstr "Klachten"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Procedurele klachten"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_config_claim
 msgid "Claim"
-msgstr ""
+msgstr "Klacht"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bijlagen"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -573,34 +587,34 @@ msgstr ""
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Info"
-msgstr ""
+msgstr "Klacht Informatie"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Done"
-msgstr ""
+msgstr "Klaar"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication"
-msgstr ""
+msgstr "Communicatie"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -608,85 +622,86 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Open"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "In behandeling"
 
 #. module: crm_claim
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Date of Claim"
-msgstr ""
+msgstr "Klachtdatum"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "Actueel"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Klachten op fase en schattingen"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr ""
+msgstr "Klacht/actie omschrijving"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr ""
+msgstr "Zoek klachten"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
 msgid "Report a Claim"
-msgstr ""
+msgstr "Rapporteer een klacht"
 
 #. module: crm_claim
 #: field:crm.claim,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Waarschijnlijkheid (%)"
 
 #. module: crm_claim
 #: field:crm.claim,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Werknemernaam"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "This Month"
-msgstr ""
+msgstr "Deze maand"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -699,66 +714,73 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"De status wordt op 'Concept' gezet als het dossier wordt gemaakt.            "
+"                  \n"
+"Als het dossier in behandeling is, wordt de status op 'Open' gezet.          "
+"                        \n"
+"Als het dossier klaar is, gaat de status naar 'Gereed'.                      "
+"            \n"
+"Als het dossier moet worden nagekeken, wordt de status op 'Wachtend' gezet."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication history"
-msgstr ""
+msgstr "Communicatiegeschiedenis"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr ""
+msgstr "Wordt niet opgelost"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "References"
-msgstr ""
+msgstr "Verwijzingen"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Hoog"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Verkoopteam"
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Laatste actie"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
index 2bcc8ad61a4..dde3ab14915 100644
--- a/addons/document_webdav/i18n/eu.po
+++ b/addons/document_webdav/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-05-30 15:14+0000\n"
-"PO-Revision-Date: 2010-10-06 09:58+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index ec87c239bcc..8a78d6f631b 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 13:33+0000\n"
-"PO-Revision-Date: 2010-10-07 20:03+0000\n"
-"Last-Translator: Wouter Schrijvers <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index 2e270076d5f..0a432783b9e 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 06:56+0000\n"
-"PO-Revision-Date: 2010-10-06 18:07+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index bcf2ce6e299..d194189a5ee 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 07:04+0000\n"
-"PO-Revision-Date: 2010-10-06 15:02+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:32+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po
new file mode 100644
index 00000000000..cabc118afb8
--- /dev/null
+++ b/addons/mrp_jit/i18n/kab.po
@@ -0,0 +1,23 @@
+# Kabyle translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-09 09:33+0000\n"
+"Last-Translator: yugurten <yugurten1@hotmail.fr>\n"
+"Language-Team: Kabyle <kab@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: 2010-10-09 12:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_jit
+#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
+msgid "MRP JIT"
+msgstr "MRP JIT"
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index c4de97452cf..f01bcd3abda 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-05 22:13+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po
index 0a452d38977..ab6fb7826bf 100644
--- a/addons/product_expiry/i18n/pl.po
+++ b/addons/product_expiry/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-06-30 15:09+0000\n"
-"PO-Revision-Date: 2010-10-07 16:55+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 27209105cea..7bb7f43723c 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-06 11:02+0000\n"
+"PO-Revision-Date: 2010-10-09 12:10+0000\n"
 "Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -307,57 +307,58 @@ msgstr ""
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Nork egina:"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
 #: model:ir.actions.act_window,name:project.action_view_task
 #: model:ir.ui.menu,name:project.menu_action_view_task
 msgid "All Tasks"
-msgstr ""
+msgstr "Ataza Guztiak"
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planifikazioa"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informazio gehigarria"
 
 #. module: project
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Kidea"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Aurreikusitako Orduak"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "Ataza: %(name)s"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Proiektu bezala berrezarri"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr ""
+msgstr "Delegazioak"
 
 #. module: project
 #: help:project.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
+"Proiektuko kideak. Ez da inolako kalkulutan erabiltzen, informatzeko soilik."
 
 #. module: project
 #: view:project.project:0
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
index 4087328ec2c..48db8e1680b 100644
--- a/addons/project_issue_sheet/i18n/pl.po
+++ b/addons/project_issue_sheet/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 10:05+0000\n"
-"PO-Revision-Date: 2010-10-07 16:53+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_messages/i18n/pl.po b/addons/project_messages/i18n/pl.po
index 30c1ea5569c..0e70ef20021 100644
--- a/addons/project_messages/i18n/pl.po
+++ b/addons/project_messages/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 10:28+0000\n"
-"PO-Revision-Date: 2010-10-07 16:53+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_messages
diff --git a/addons/project_retro_planning/i18n/kab.po b/addons/project_retro_planning/i18n/kab.po
new file mode 100644
index 00000000000..770cad5b13f
--- /dev/null
+++ b/addons/project_retro_planning/i18n/kab.po
@@ -0,0 +1,23 @@
+# Kabyle translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-09 09:40+0000\n"
+"Last-Translator: yugurten <yugurten1@hotmail.fr>\n"
+"Language-Team: Kabyle <kab@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: 2010-10-09 12:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_retro_planning
+#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
+msgid "Project Retro planning"
+msgstr "A qanib d we Siqwas n we Senfar"
diff --git a/addons/thunderbird/i18n/eu.po b/addons/thunderbird/i18n/eu.po
index 17c268d7652..d5836168c61 100644
--- a/addons/thunderbird/i18n/eu.po
+++ b/addons/thunderbird/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 06:05+0000\n"
-"PO-Revision-Date: 2010-10-05 22:18+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 07:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po
index 1da34d2bef1..30b8bc8f72e 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/wiki/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-07 19:19+0000\n"
+"PO-Revision-Date: 2010-10-08 07:35+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki

From dc25e393c833cafe4fa5bacb35e607fb0e8e5171 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Oct 2010 11:36:34 +0200
Subject: [PATCH 501/632] [imp] remoed gtk contact form

bzr revid: fp@tinyerp.com-20101009093634-isv2b1fe36zpw2lu
---
 addons/base_setup/__init__.py          |   1 -
 addons/base_setup/gtk_contact_form.py  | 114 -------------------------
 addons/base_setup/gtk_contact_form.xml |  77 -----------------
 3 files changed, 192 deletions(-)
 delete mode 100644 addons/base_setup/gtk_contact_form.py
 delete mode 100644 addons/base_setup/gtk_contact_form.xml

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 59598f6577a..934e1a3bdf8 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -21,7 +21,6 @@
 
 import installer
 import todo
-import gtk_contact_form
 import wizard
 import os
 import base64
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
deleted file mode 100644
index c62951b13b7..00000000000
--- a/addons/base_setup/gtk_contact_form.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from operator import itemgetter
-
-from osv import osv, fields
-import netsvc
-import tools
-from tools import misc
-
-class base_gtkcontactform(osv.osv_memory):
-    """
-    """
-    _name = 'base.gtkcontactform'
-    _inherit = 'res.config'
-    logger = netsvc.Logger()
-
-    def default_get(self, cr, uid, fields_list=None, context=None):
-         ''' set email and phone number selected in the previous company information
-             form '''
-         defaults = super(base_gtkcontactform, self)\
-         .default_get(cr, uid, fields_list=fields_list, context=context)
-         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
-         company = self.pool.get('base.setup.company').read(cr, uid, company_id)
-         company = company and company[0] or False
-         if company:
-             defaults.update({'email':company.get('email',''),
-                          'phone': company.get('phone','')})
-         return defaults
-
-    _columns = {
-             'name':fields.char('Your Name', size=64),
-             'job':fields.char('Job Title', size=64,),
-             'email':fields.char('E-mail', size=64),
-             'phone':fields.char('Phone', size=64),
-             'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
-             'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
-                                          ('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),
-                                          ('entertainment','Entertainment'),('environmental','Environmental'),('finance','Finance'),('government','Government'),('healthcare','Healthcare'),('hospitality','Hospitality'),
-                                          ('insurance','Insurance'),('machinery','Machinery'),('manufacturing','Manufacturing'),('media','Media'),('notforprofit','Not For Profit'),
-                                          ('recreation','Recreation'),('retail','Retail'),('shipping','Shipping'),('technology','Technology'),('telecommunications','Telecommunications'),
-                                          ('transportation','Transportation'),('utilities','Utilities'),('other','Other'),
-                                          ], 'Industry', size=32),
-             'use_openerp':fields.boolean('We plan to use OpenERP'),
-             'already_using_openerp':fields.boolean('Already using OpenERP'),
-             'sell_openerp':fields.boolean('Plan to sell OpenERP'),
-             'already_selling__openerp':fields.boolean('Already selling OpenERP'),
-
-             'features':fields.boolean('The features of OpenERP'),
-             'saas':fields.boolean('OpenERP Online Solutions (SaaS)'),
-             'partners_program':fields.boolean('OpenERP Partners Program (for integrators)'),
-             'support':fields.boolean('Support and Maintenance Solutions'),
-             'training':fields.boolean('OpenERP Training Program'),
-             'other':fields.boolean('Other'),
-             'ebook':fields.boolean('ebook'),
-             'updates':fields.boolean('Updates'),
-             }
-    def execute(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-
-        company_id = self.pool.get('base.setup.company').search(cr, uid, [], context=context)
-        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context)
-        company_data = company_data and company_data[0] or {}
-        country = ''
-
-        if company_data.get('country_id', False):
-            country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name']
-
-        for res in self.read(cr, uid, ids, context=context):
-            email = res.get('email','')
-            result = "\ncompany: "+ tools.ustr(company_data.get('name',''))
-            result += "\nname: " + tools.ustr(res.get('name',''))
-            result += "\njob: " + tools.ustr(res.get('job',''))
-            result += "\nphone: " + str(res.get('phone',''))
-            result += "\ncity: " + tools.ustr(company_data.get('city',''))
-            result += "\ncountry: " + str(country)
-            result += "\nindustry: " + tools.ustr(res.get('industry', ''))
-            result += "\ntotal_employees: " + str(res.get('total_employees', ''))
-            result += "\nplan_use: " +  str(res.get('use_openerp', False))
-            result += "\nalready_using_openerp: " + str(res.get('already_using_openerp', False))
-            result += "\nsell_openerp: " + str(res.get('sell_openerp', False))
-            result += "\nalready_selling__openerp: " + str(res.get('already_selling__openerp', False))
-            result += "\nfeatures: " +  str(res.get('features', False))
-            result += "\nsaas: " +  str(res.get('saas', False))
-            result += "\npartners_program: " +  str(res.get('partners_program', False))
-            result += "\nsupport: " +  str(res.get('support', False))
-            result += "\ntraining: " +  str(res.get('training', False))
-            result += "\nupdates: " +  str(res.get('updates', False))
-            result += "\ncontact_me: " +  str(res.get('contact_me', False))
-            result += "\nebook: " + str(res.get('ebook',False))
-            result += "\ngtk: " + str(True)
-        misc.upload_data(email, result, type='SURVEY')
-
-
-
-base_gtkcontactform()
\ No newline at end of file
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
deleted file mode 100644
index 660187a8ce0..00000000000
--- a/addons/base_setup/gtk_contact_form.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<openerp>
-  <data>
-    <record id="view_base_setup_contact" model="ir.ui.view">
-      <field name="name">Contact information</field>
-      <field name="model">base.gtkcontactform</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Contact Information</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Would you like more information or documentation ?</attribute>
-                    <attribute name='colspan'>4</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>22</attribute>
-                    <attribute name='string'></attribute>
-          </xpath>
-          <group string="res_config_contents" position="replace">
-              <group colspan="4" height="450" width="600">
-                   <group colspan="4">
-                     <field name="ebook" nolabel="1"/>
-                    <label align="0.0" string="I want to receive the OpenERP ebook (PDF) by email." colspan="3"/>
-                    <field name="updates" nolabel="1"/>
-                    <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>
-               </group>
-                  <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
-                       <separator colspan="4" string="About You"/>
-                    <field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-                    <field name="job" colspan="2"/>
-                    <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-                    <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
-                    <field name="total_employees" colspan="2"/>
-                    <field name="industry" colspan="2"/>
-                </group>
-                <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
-                    <separator string="Your projects with OpenERP" colspan="4"/>
-                    <field name="use_openerp" align="0.0"  colspan="1"/>
-                    <field name="already_using_openerp" align="0.0"  colspan="1"/>
-                    <field name="sell_openerp" align="0.0"  colspan="1"/>
-                    <field name="already_selling__openerp" align="0.0" colspan="1"/>
-                    <separator colspan="4" string="You would like to know more about"/>
-                    <field name="features" align="0.0" colspan="1"/>
-                    <field name="training" align="0.0" colspan="1"/>
-                    <field name="saas" align="0.0" colspan="1"/>
-                    <field name="support" align="0.0" colspan="1"/>
-                    <field name="partners_program" align="0.0" colspan="1"/>
-                    <field name="other" align="0.0" colspan="1"/>
-               </group>
-           </group>
-           </group>
-        </data>
-      </field>
-    </record>
-
-    <record id="action_base_contact" model="ir.actions.act_window">
-      <field name="name">Setup contact information</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">base.gtkcontactform</field>
-      <field name="view_id" ref="view_base_setup_contact"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="base_setup_contact_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_contact"/>
-        <field name="sequence">5</field>
-        <field name="restart">never</field>
-    </record>
-  </data>
-</openerp>

From eaccd57934fafc2d24987226c623bc94519c186f Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Sat, 9 Oct 2010 17:16:34 +0530
Subject: [PATCH 502/632] [IMP]Improves all reports of point of sale module

bzr revid: azaz.201186@gmail.com-20101009114634-4ruovxonxa1bny4d
---
 .../report/all_closed_cashbox_of_the_day.rml  |  30 +--
 .../report/pos_details_summary.rml            | 189 +++++++++---------
 addons/point_of_sale/report/pos_lines.rml     |  16 +-
 .../report/pos_payment_report.py              |  12 +-
 .../report/pos_payment_report.rml             |   4 +-
 .../report/pos_payment_report_date.py         |  12 +-
 .../report/pos_payment_report_date.rml        |  16 +-
 .../report/pos_payment_report_user.py         |   6 +-
 .../report/pos_payment_report_user.rml        |  13 +-
 .../point_of_sale/report/pos_sales_user.rml   |  26 +--
 .../report/pos_sales_user_today.rml           |  26 ++-
 .../pos_sales_user_today_current_user.rml     |  19 +-
 .../report/pos_users_product.rml              |  64 +++---
 13 files changed, 220 insertions(+), 213 deletions(-)

diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index 658e7e958b9..7013ddcfb6f 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Cashbox of the day" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -114,10 +114,10 @@
       <font color="white"> </font>
     </para>
     <para style="terp_header_Centre">Today's Closed Cashbox</para>
-    <para style="terp_header_Centre">
+    <para style="terp_default_Right_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -127,7 +127,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -140,7 +140,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table3">
+    <blockTable colWidths="59.0,101.0,75.0,78.0,104.0,95.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">St.Name</para>
@@ -162,7 +162,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="55.0,95.0,71.0,73.0,98.0,89.0" style="Table4">
+    <blockTable colWidths="59.0,101.0,75.0,78.0,104.0,95.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_General">Total:</para>
@@ -183,16 +183,16 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</u></para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_Bold_8">[[ repeatIn(get_data(user),'statement') ]]</para>
-      <blockTable colWidths="56.0,94.0,71.0,74.0,97.0,90.0" style="Table7">
+      <para style="terp_default_1">[[ repeatIn(get_data(user),'statement') ]]</para>
+      <blockTable colWidths="60.0,99.0,75.0,79.0,103.0,96.0" style="Table7">
         <tr>
           <td>
             <para style="terp_default_Bold_8">[[ statement['statement'] ]]</para>
@@ -207,16 +207,16 @@
             <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
           </td>
           <td>
-            <para style="P1">[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</para>
+            <para style="P1"><u>[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</u></para>
           </td>
           <td>
-            <para style="P1">[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</para>
+            <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</u></para>
           </td>
         </tr>
       </blockTable>
       <section>
-        <para style="Standard">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
-        <blockTable colWidths="94.0,126.0,121.0,3.0,138.0" style="Table5">
+        <para style="terp_default_1">[[ repeatIn(get_lines(statement),'line_ids') ]]</para>
+        <blockTable colWidths="99.0,134.0,129.0,3.0,147.0" style="Table5">
           <tr>
             <td>
               <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -240,7 +240,7 @@
             </td>
           </tr>
         </blockTable>
-        <para style="Standard">
+        <para style="terp_default_1">
           <font color="white"> </font>
         </para>
       </section>
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 5f68c7869f0..4c538f3b15e 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Detail of sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -38,23 +38,30 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
+    <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
@@ -64,11 +71,6 @@
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -104,11 +106,12 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="15.0" leading="19" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -147,14 +150,14 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">Details of Sales</para>
     <para style="P4">
       <font color="white"> </font>
     </para>
-    <para style="P4">Details of Sales</para>
-    <para style="P5">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -167,7 +170,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
@@ -180,80 +183,84 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table3">
+    <blockTable colWidths="256.0,256.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Taxes</para>
         </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(gettaxamount(objects).items(),'p') ]]</para>
+      <blockTable colWidths="256.0,256.0" style="Table6">
+        <tr>
+          <td>
+            <para style="P6">[[ p[0] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ p[1] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="256.0,256.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Mode of Payment</para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(getpayments(objects).items(),'t') ]]</para>
+      <blockTable colWidths="256.0,256.0" style="Table9">
+        <tr>
+          <td>
+            <para style="P5">[[ t[0] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="256.0,256.0" style="Table8">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Summary</para>
+        </td>
         <td>
           <para style="P1">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font face="Helvetica" size="6.0">[[ repeatIn(gettaxamount(objects).items(),'p') ]] </font>
-            <font face="Helvetica" size="8.0">[[ p[0] ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ p[1] ]]</para>
-        </td>
-      </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table5">
-      <tr>
-        <td>
-          <para style="P3">Mode of Payment</para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font face="Helvetica" size="6.0">[[ repeatIn(getpayments(objects).items(),'t') ]]</font>
-            <font face="Helvetica" size="9.0">[[ t[0] ]]</font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ '%.2f' % (t[1],) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="241.0,241.0" style="Table8">
-      <tr>
-        <td>
-          <para style="terp_default_Bold_9">Summary</para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table7">
+    <blockTable colWidths="256.0,256.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Sales total</para>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index a62cd04e104..95f02bb5c1c 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Sales lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="36.0" y1="57.0" width="525" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -115,7 +115,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="175.0,175.0,175.0" style="Table3">
+    <blockTable colWidths="171.0,170.0,170.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -128,7 +128,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="175.0,175.0,175.0" style="Table4">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -147,7 +147,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="201.0,82.0,64.0,61.0,51.0,67.0" style="Tableau6">
+    <blockTable colWidths="196.0,78.0,62.0,58.0,56.0,63.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -170,8 +170,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[repeatIn(o.lines,'l')]]</para>
-      <blockTable colWidths="201.0,83.0,64.0,60.0,51.0,67.0" style="Tableau7">
+      <para style="terp_default_1">[[repeatIn(o.lines,'l')]]</para>
+      <blockTable colWidths="195.0,78.0,62.0,58.0,56.0,63.0" style="Tableau7">
         <tr>
           <td>
             <para style="terp_default_9">[ [[l.product_id.code]] ] [[l.product_id.name]]</para>
@@ -194,7 +194,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="87.0,87.0,88.0,117.0,70.0,76.0" style="Table1">
+    <blockTable colWidths="84.0,85.0,86.0,114.0,68.0,74.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -284,4 +284,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index dc5653551a2..f679e230107 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -38,17 +38,17 @@ class pos_payment_report(report_sxw.rml_parse):
         sql = """ select id from pos_order where id = %d"""%(obj.id)
         self.cr.execute(sql)
         if self.cr.fetchone():
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                                  "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  and pu.id=pt.uom_id " \
                                  "and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date and po.id=%d"%(obj.id))
             data=self.cr.dictfetchall()
         else :
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                                  "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                                 "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu  " \
+                                 "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id  " \
                                  "and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
             data=self.cr.dictfetchall()
 
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 01fcdf355e1..2d25c740d77 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -175,10 +175,10 @@
       <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+            <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
index 362ff569f72..823fb3ce95e 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.py
@@ -38,17 +38,17 @@ class pos_payment_report_date(report_sxw.rml_parse):
         dt2 = form['date_end'] + ' 23:59:59'
         data={}
         if form['user_id']:
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                              "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
+                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
                              "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s and po.user_id IN %s " \
                              ,(dt1,dt2,tuple(form['user_id'])))
         else:
-            self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+            self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                              "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                             "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
+                             "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  and pu.id=pt.uom_id " \
                              "and po.state IN ('paid','invoiced') and po.date_order  >= %s and po.date_order <= %s" \
                              ,(dt1,dt2))
         data=self.cr.dictfetchall()
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 35e605d0bff..23c3f950d81 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -102,7 +102,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -112,7 +112,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -128,7 +128,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table3">
+    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -149,13 +149,13 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table6">
+      <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+            <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
@@ -169,7 +169,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="256.0,59.0,42.0,61.0,64.0" style="Table5">
+    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table5">
       <tr>
         <td>
           <para style="Table Contents">
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index 1a982457895..37b129f68f2 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -35,10 +35,10 @@ class pos_payment_report_user(report_sxw.rml_parse):
     def __pos_payment_user__(self,form):
         data={}
         ids = form['user_id']
-        sql = "select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+        sql = "select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
                          "(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0)) as total  " \
-                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt " \
-                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id  " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu " \
+                         "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
                          "and po.state in ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date " \
                          "and po.user_id IN %s"
         self.cr.execute (sql, (tuple(ids), ))
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 4779fad9e6b..18ed5b73d84 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -59,8 +59,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -103,8 +102,8 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P2">Payment By User </para>
-    <para style="P2">
+    <para style="P1">Payment By User </para>
+    <para style="P1">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="241.0,241.0" style="Table1">
@@ -153,14 +152,14 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
+      <para style="terp_default_1">[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]</para>
       <blockTable colWidths="241.0,55.0,61.0,61.0,64.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+            <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index 5a98c092a3a..d2fefc379fd 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Sales Report" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -41,7 +41,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -54,8 +54,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -98,11 +97,11 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P3">Sales Report</para>
-    <para style="P3">
+    <para style="P2">Sales Report</para>
+    <para style="P2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -112,7 +111,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -128,7 +127,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
+    <blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -148,8 +147,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P2">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table5">
+      <para style="terp_default_1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
@@ -168,12 +167,9 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 9f1bc6eb14b..6e633d375d8 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Todays Sales By User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -53,10 +53,8 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -99,11 +97,11 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="P2">Today's Sales By User</para>
-    <para style="P2">
+    <para style="P1">Today's Sales By User</para>
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="256.0,256.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -113,7 +111,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table2">
+    <blockTable colWidths="256.0,256.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -129,7 +127,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="141.0,111.0,92.0,61.0,77.0" style="Table3">
+    <blockTable colWidths="150.0,118.0,97.0,64.0,82.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -138,7 +136,7 @@
           <para style="terp_tblheader_Details_Centre">Date Order</para>
         </td>
         <td>
-          <para style="P3">User</para>
+          <para style="P2">User</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Right">State</para>
@@ -149,8 +147,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
-      <blockTable colWidths="141.0,111.0,92.0,60.0,78.0" style="Table5">
+      <para style="terp_default_1">[[ repeatIn(get_data(data['form']), 'line_ids')]]</para>
+      <blockTable colWidths="150.0,118.0,97.0,64.0,83.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_8">[[ line_ids['pos'] ]]</para>
@@ -169,7 +167,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_8">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index c4d046ad9f8..7a94f5d6632 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Todays Sales By Current User" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -65,8 +65,7 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -109,11 +108,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">Today's Sales By Current User</para>
+    <para style="P2">Today's Sales By Current User</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table1">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -126,7 +125,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table2">
+    <blockTable colWidths="170.0,170.0,170.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ company.name ]]</para>
@@ -145,7 +144,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table3">
+    <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Name</para>
@@ -162,8 +161,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="P2">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
-      <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table6">
+      <para style="terp_default_1">[[ repeatIn(get_data_current_user(user), 'line_ids')]]</para>
+      <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ line_ids['name'] ]]</para>
@@ -180,7 +179,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="282.0,72.0,65.0,63.0" style="Table5">
+    <blockTable colWidths="299.0,76.0,69.0,67.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index d5c7d6a9996..ae15e6478e7 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="User's Product'" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="User's Product" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -57,9 +57,19 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -71,8 +81,8 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -118,7 +128,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">User's Product</para>
+    <para style="P2">User's Product</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -169,13 +179,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="239.0,80.0,163.0" style="Table3">
+    <blockTable colWidths="161.0,161.0,161.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -184,25 +188,29 @@
           <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Amount </para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="239.0,80.0,163.0" style="Table4">
-      <tr>
-        <td>
-          <para style="P2">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
-          <para style="P2">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-          <para style="terp_default_9">[[ line_ids['name'] ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_General_Right">Amount</para>
         </td>
       </tr>
     </blockTable>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
+      <section>
+        <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
+        <blockTable colWidths="161.0,161.0,161.0" style="Table6">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ formatLang(line_ids['qty']) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
     <blockTable colWidths="319.0,80.0,83.0" style="Table5">
       <tr>
         <td>

From 02f8005ad476eed38eb50ead73eb4d26b2292787 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 9 Oct 2010 12:12:39 +0000
Subject: [PATCH 503/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101009121239-ksnhjucoz9ual2u8
---
 bin/addons/base/i18n/nl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index ab6a784be15..2e2f548afde 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-10-06 14:56+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-08 06:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 18c3f9511d2022c72fe73120c9410171b065e1ba Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:09:42 +0200
Subject: [PATCH 504/632] useability

bzr revid: fp@fp-laptop-20101010190942-d5wo2tilixnzj7yx
---
 bin/addons/base/ir/ir_model.py               | 1 +
 bin/addons/base/res/partner/partner_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 5410cba10a6..247f020c7d6 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -239,6 +239,7 @@ class ir_model_access(osv.osv):
         grouparr  = group.split('.')
         if not grouparr:
             return False
+        print grouparr
 
         cr.execute("select 1 from res_groups_users_rel where uid=%s and gid IN (select res_id from ir_model_data where module=%s and name=%s)", (uid, grouparr[0], grouparr[1],))
         return bool(cr.fetchone())
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index fcf007deb0f..0837807e0b2 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -250,7 +250,7 @@
                     <group col="6" colspan="4">
                         <group colspan="5" col="6">
                             <field name="name" select="1"/>
-                            <field name="ref"/>
+                            <field name="ref" groups="base.group_extended"/>
                             <field domain="[('domain', '=', 'partner')]" name="title" size="0" groups="base.group_extended" widget="selection"/>
                             <field name="lang"/>
                         </group>

From 4c1a9e61399655f34652dea50ee46a5bd5b5e6e1 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:33:54 +0200
Subject: [PATCH 505/632] fix

bzr revid: fp@fp-laptop-20101010193354-1azqu1646j4z6of7
---
 bin/addons/base/module/wizard/base_module_configuration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_configuration.py b/bin/addons/base/module/wizard/base_module_configuration.py
index 345ed9a9797..866b22905e0 100644
--- a/bin/addons/base/module/wizard/base_module_configuration.py
+++ b/bin/addons/base/module/wizard/base_module_configuration.py
@@ -27,7 +27,7 @@ class base_module_configuration(osv.osv_memory):
     _name = "base.module.configuration"
 
     def start(self, cr, uid, ids, context=None):
-        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')])
+        todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', '|', ('restart','=','always'), ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')])
         if not todo_ids:
             # When there is no wizard todo it will display message
             data_obj = self.pool.get('ir.model.data')

From ce3a5813b9a9e76a968715ccd782ea2b468565ee Mon Sep 17 00:00:00 2001
From: "AMP(Open ERP)" <>
Date: Mon, 11 Oct 2010 10:58:31 +0530
Subject: [PATCH 506/632] [ADD] Added a shortcut for Reconfigure and Customer

bzr revid: vir@tinyerp.com-20101011052831-srj5hjhctj5llqnh
---
 .../base/module/wizard/base_module_configuration_view.xml   | 6 ++++++
 bin/addons/base/res/partner/partner_view.xml                | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index e5ad8f720bd..2d0b31b7126 100644
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -38,6 +38,12 @@
             <field name="key">action</field>
             <field name="model">ir.actions.todo</field>
         </record>
+        <record id="ir_ui_view_sc_configuration" model="ir.ui.view_sc">
+            <field name="name">Reconfigure</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="menu_view_base_module_configuration"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 0837807e0b2..e1eac247a08 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -586,7 +586,7 @@
             />
 
         <record id="ir_ui_view_sc_partner0" model="ir.ui.view_sc">
-            <field name="name">Address Book</field>
+            <field name="name">Customers</field>
             <field name="resource">ir.ui.menu</field>
             <field name="user_id" ref="base.user_root"/>
              <field name="res_id" ref="menu_partner_form"/>

From 1cb3e4e0992f91685e3e40ccc01c8621b557502b Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 12:19:48 +0530
Subject: [PATCH 507/632] [REF] base: Refactored Code

bzr revid: ach@tinyerp.com-20101011064948-ust4ovsiy9tyjs85
---
 bin/addons/base/ir/ir_model.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 247f020c7d6..4e974abc9fa 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -239,8 +239,6 @@ class ir_model_access(osv.osv):
         grouparr  = group.split('.')
         if not grouparr:
             return False
-        print grouparr
-
         cr.execute("select 1 from res_groups_users_rel where uid=%s and gid IN (select res_id from ir_model_data where module=%s and name=%s)", (uid, grouparr[0], grouparr[1],))
         return bool(cr.fetchone())
 

From 890f23281a0ca4fb54d4cceea405ae7c7c6d10b1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Oct 2010 18:01:30 +0200
Subject: [PATCH 508/632] [IMP] useability

bzr revid: fp@tinyerp.com-20101009160130-scig3mrbr64pj09d
---
 bin/addons/base/base_update.xml   | 2 +-
 bin/addons/base/res/bank_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index e89106bb8f3..a397b39cba2 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -322,7 +322,7 @@
                 </form>
                 <xpath expr="//label[@string='description']"
                      position="attributes">
-                <attribute name="string">OpenERP allows you to select between a simplified and extended interface. If you use OpenERP for the first time we strongly advise you to select the simplified interface. You can always switch later from the user preferences.</attribute>
+                <attribute name="string">If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences.</attribute>
               </xpath>
               <xpath expr='//separator[@string="title"]' position='attributes'>
                     <attribute name='string'>Configure Your Interface</attribute>
diff --git a/bin/addons/base/res/bank_view.xml b/bin/addons/base/res/bank_view.xml
index feb7088168e..c6e6b063456 100644
--- a/bin/addons/base/res/bank_view.xml
+++ b/bin/addons/base/res/bank_view.xml
@@ -45,7 +45,7 @@
         </record>
 
         <record id="action_res_bank_form" model="ir.actions.act_window">
-            <field name="name">Bank List</field>
+            <field name="name">Banks</field>
             <field name="res_model">res.bank</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From 256bca359d74a134f94d4e37f7cadf0d87448b53 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Oct 2010 18:01:43 +0200
Subject: [PATCH 509/632] [IMP] better useability

bzr revid: fp@tinyerp.com-20101009160143-rrcfgoyudey22zv4
---
 addons/account/account.py                     |  12 +-
 addons/account/account_invoice_view.xml       |  14 +-
 addons/account/account_menuitem.xml           |  44 +--
 addons/account/account_report.xml             |   1 +
 addons/account/account_view.xml               |  52 ++--
 addons/account/account_wizard.xml             |   2 +-
 addons/account/invoice.py                     |   4 +-
 addons/account/partner.py                     |  16 +-
 addons/account/partner_view.xml               |   6 +-
 .../process/customer_invoice_process.xml      |   2 -
 .../process/supplier_invoice_process.xml      |   2 -
 ...count_analytic_inverted_balance_report.xml |  74 ++---
 .../report/account_aged_partner_balance.py    |   2 +
 .../account_analytic_entries_report_view.xml  |   5 +-
 .../report/account_entries_report_view.xml    |   5 +-
 .../account/report/account_invoice_report.py  |   2 +-
 .../report/account_invoice_report_view.xml    |   6 +-
 .../account/report/account_print_invoice.rml  |   2 +-
 addons/account/security/account_security.xml  | 141 +---------
 .../wizard/account_move_journal_view.xml      |  23 +-
 .../account/wizard/account_reconcile_view.xml |   3 +-
 .../account_report_balance_sheet_view.xml     |   1 +
 .../account_report_general_ledger_view.xml    |   1 +
 .../account_report_partner_ledger_view.xml    |   1 +
 .../account/wizard/account_tax_chart_view.xml |   7 +-
 addons/account_accountant/__openerp__.py      |  13 +-
 .../account_accountant/account_security.xml   |   6 -
 .../security/account_security.xml             |  10 +
 .../voucher_payment_receipt_view.xml          |   4 +-
 .../voucher_sales_purchase_view.xml           |  18 +-
 .../analytic/security/analytic_security.xml   |   6 +-
 addons/auction/auction_demo.xml               | 252 +++++++++---------
 addons/auction/auction_view.xml               |  92 +++----
 addons/base_setup/base_setup_installer.xml    |  29 +-
 addons/base_setup/installer.py                |  21 +-
 addons/product/product.py                     |   6 +-
 addons/product/product_view.xml               |  13 +-
 addons/purchase/purchase_view.xml             |  10 +-
 addons/stock/product_view.xml                 |  13 +-
 39 files changed, 389 insertions(+), 532 deletions(-)
 delete mode 100644 addons/account_accountant/account_security.xml
 create mode 100644 addons/account_accountant/security/account_security.xml

diff --git a/addons/account/account.py b/addons/account/account.py
index 8ff9d35086e..b0271a4fee1 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2473,14 +2473,14 @@ class account_tax_template(osv.osv):
 
 account_tax_template()
 
-# Fiscal Mapping Templates
+# Fiscal Position Templates
 
 class account_fiscal_position_template(osv.osv):
     _name = 'account.fiscal.position.template'
-    _description = 'Template for Fiscal Mapping'
+    _description = 'Template for Fiscal Position'
 
     _columns = {
-        'name': fields.char('Fiscal Mapping Template', size=64, translate=True, required=True),
+        'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
         'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
@@ -2490,11 +2490,11 @@ account_fiscal_position_template()
 
 class account_fiscal_position_tax_template(osv.osv):
     _name = 'account.fiscal.position.tax.template'
-    _description = 'Template Tax Fiscal Mapping'
+    _description = 'Template Tax Fiscal Position'
     _rec_name = 'position_id'
 
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
         'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
     }
@@ -2860,4 +2860,4 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
 account_bank_accounts_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 734b99e81f3..ebf58bab11d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -40,7 +40,7 @@
                     <field name="quantity"/>
                     <field name="uos_id"/>
                     <field name="price_unit"/>
-                    <field name="discount"/>
+                    <field name="discount" groups="base.group_extended"/>
                     <field name="price_subtotal"/>
                 </tree>
             </field>
@@ -58,13 +58,11 @@
                             <field name="uos_id"  widget="selection" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                             <field name="quantity"/>
                             <field name="price_unit"/>
-                            <field name="discount"/>
+                            <field name="discount" groups="base.group_extended"/>
                             <field colspan="4" name="name"/>
-                            <field colspan="4" name="origin" groups="base.group_extended"/>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <newline/>
-                            <field name="price_subtotal"/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                             <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
@@ -156,7 +154,7 @@
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
-                        <field string="Vendor" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
+                        <field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -452,7 +450,7 @@
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
-            <field name="name">Vendor Invoices</field>
+            <field name="name">Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -460,7 +458,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Proposal for vendor invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
+            <field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -491,7 +489,7 @@
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
-            <field name="name">Vendor Refunds</field>
+            <field name="name">Supplier Refunds</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index fac1a1eec4d..dde71f4efc1 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,47 +2,49 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
-        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,group_account_invoice"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"
+            groups="group_account_user,group_account_manager,group_account_invoice"/>
+        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
+        <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
+            groups="group_account_user"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
         <!-- This menu is used in account_code module -->
         <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
-        <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="group_account_manager,group_account_user"/>
-        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="group_account_manager"/>
-        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" groups="group_account_manager"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="group_account_manager"/>
+        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="group_account_manager"/>
-        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4"
-        groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/>
 
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager" sequence="25"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager" sequence="25"/>
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
-        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
+        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
 
         <menuitem
-        parent="account.menu_finance_legal_statement"
-        id="final_accounting_reports"
-        name="Accounting Reports"/>
+            parent="account.menu_finance_legal_statement"
+            id="final_accounting_reports"
+            name="Accounting Reports"/>
 
         <menuitem
-        parent="account.menu_finance_legal_statement"
-        id="menu_journals_report"
-        name="Journals"/>
+            parent="account.menu_finance_legal_statement"
+            id="menu_journals_report"
+            groups="group_account_user"
+            name="Journals"/>
 
     </data>
 </openerp>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 907ff01b832..c9f7cc6cf66 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -45,6 +45,7 @@
         <menuitem
             id="menu_tax_report"
             name="Taxes"
+            groups="group_account_user"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
         <report id="account_account_balance_landscape"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e7e1c055c32..36ee5255523 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -347,10 +347,10 @@
             <field name="arch" type="xml">
                 <tree string="Search Account Journal">
                     <group>
-                    <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Customer Journals" icon="terp-sale"/>
-                    <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Vendor Journals" icon="terp-purchase"/>
-                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity Journals" icon="terp-dolar"/>
-                    <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Global Journals" icon="terp-stock"/>
+                    <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-sale"/>
+                    <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
+                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+                    <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <separator orientation="vertical"/>
                     <field name="code"/>
                     <field name="name"/>
@@ -899,13 +899,6 @@
             <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
         </record>
 
-        <!--
-        <menuitem
-            action="action_tax_code_tree"
-            id="menu_action_tax_code_tree"
-            parent="menu_finance_charts"
-            sequence="12"/> --> <!-- move to wizard -->
-
         <!--
     Entries lines
     -->
@@ -1389,6 +1382,7 @@
             action="action_move_journal_line"
             id="menu_action_move_journal_line_form"
             parent="account.menu_finance_entries"
+            groups="group_account_user"
             sequence="5"/>
 
         <record id="action_move_line_form" model="ir.actions.act_window">
@@ -1428,8 +1422,6 @@
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
 
-        <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
-
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -1502,8 +1494,8 @@
 
 
         <menuitem
-                name="Manual Reconcilication" icon="STOCK_EXECUTE"
-                action="action_account_manual_reconcile"
+             name="Manual Reconcilication" icon="STOCK_EXECUTE"
+             action="action_account_manual_reconcile"
              id="menu_manual_reconcile"
              parent="account.periodical_processing_reconciliation"/>
 
@@ -1655,7 +1647,9 @@
             <field name="view_mode">tree,form,search</field>
             <field name="search_view_id" ref="view_model_search"/>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc" groups="base.group_extended"/>
+        <menuitem
+            action="action_model_form" id="menu_action_model_form" sequence="5"
+            parent="account.menu_configuration_misc" groups="base.group_extended"/>
 
         <!--
             # Payment Terms
@@ -1741,7 +1735,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
+        <menuitem action="action_payment_term_form"
+            id="menu_action_payment_term_form" parent="menu_configuration_misc"
+            groups="group_account_manager"/>
 
         <!--
         # Account Subscriptions
@@ -1853,7 +1849,11 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_subscription_search"/>
         </record>
-        <menuitem name="Define Recurring Entries" action="action_subscription_form" id="menu_action_subscription_form" sequence="1" parent="account.menu_finance_recurrent_entries"/>
+        <menuitem
+            name="Define Recurring Entries" action="action_subscription_form"
+            groups="base.group_extended"
+            id="menu_action_subscription_form" sequence="1"
+            parent="account.menu_finance_recurrent_entries"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -2075,7 +2075,6 @@
             <field name="view_mode">tree,form,search</field>
         </record>
 
-
         <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
 
         <!-- Chart of Accounts Templates -->
@@ -2368,7 +2367,9 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem name="New Company Financial Setting" parent="account.account_template_folder" action="account.action_account_configuration_installer" id="menu_wizard"/>
+        <menuitem name="New Company Financial Setting" parent="account.account_template_folder"
+            groups="group_account_manager"
+            action="account.action_account_configuration_installer" id="menu_wizard"/>
 
         <record id="account_account_graph" model="ir.ui.view">
             <field name="name">account.account.graph</field>
@@ -2382,14 +2383,14 @@
             </field>
          </record>
 
-         <!-- Fiscal Mapping Templates -->
+         <!-- Fiscal Position Templates -->
 
         <record id="view_account_position_template_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Mapping Template">
+                <form string="Fiscal Position Template">
                     <field name="name" select="1"/>
                     <field name="chart_template_id"/>
                     <newline/>
@@ -2421,14 +2422,14 @@
             <field name="model">account.fiscal.position.template</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscal Mapping">
+                <tree string="Fiscal Position">
                     <field name="name"/>
                 </tree>
             </field>
         </record>
 
         <record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Mapping Templates</field>
+            <field name="name">Fiscal Position Templates</field>
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -2606,7 +2607,8 @@
             <field name="view_id" ref="account_cash_statement_graph"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
-        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
+            groups="group_account_user"/>
 
     </data>
 </openerp>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 639dc2dc111..0e48dfc7b66 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
+        <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 79978c0bbaf..3879d3af32a 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -315,7 +315,7 @@ class account_invoice(osv.osv):
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True, states={'draft':[('readonly',False)]})
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
     }
     _defaults = {
         'type': _get_type,
@@ -353,7 +353,7 @@ class account_invoice(osv.osv):
             nodes = doc.xpath("//field[@name='partner_id']")
             partner_string = 'Customer'
             if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
-                partner_string = 'Vendor'
+                partner_string = _('Supplier')
             for node in nodes:
                 node.set('string', partner_string)
             res['arch'] = etree.tostring(doc)
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 536976d1e39..9f4fdf82abd 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -25,9 +25,9 @@ import ir
 
 class account_fiscal_position(osv.osv):
     _name = 'account.fiscal.position'
-    _description = 'Fiscal Mapping'
+    _description = 'Fiscal Position'
     _columns = {
-        'name': fields.char('Fiscal Mapping', size=64, translate=True, required=True),
+        'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
         'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
@@ -64,10 +64,10 @@ account_fiscal_position()
 
 class account_fiscal_position_tax(osv.osv):
     _name = 'account.fiscal.position.tax'
-    _description = 'Taxes Fiscal Mapping'
+    _description = 'Taxes Fiscal Position'
     _rec_name = 'position_id'
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
         'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
@@ -76,10 +76,10 @@ account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
     _name = 'account.fiscal.position.account'
-    _description = 'Accounts Fiscal Mapping'
+    _description = 'Accounts Fiscal Position'
     _rec_name = 'position_id'
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
         'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
@@ -172,10 +172,10 @@ class res_partner(osv.osv):
             'account.fiscal.position',
             type='many2one',
             relation='account.fiscal.position',
-            string="Fiscal Mapping",
+            string="Fiscal Position",
             method=True,
             view_load=True,
-            help="The fiscal Mapping will determine taxes and the accounts used for the partner.",
+            help="The fiscal position will determine taxes and the accounts used for the partner.",
         ),
         'property_payment_term': fields.property(
             'account.payment.term',
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ca489acd9bd..da33d680d95 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.fiscal.position</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Mapping">
+                <form string="Fiscal Position">
                     <field name="name" select="1"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <separator string="Mapping" colspan="4"/>
@@ -42,7 +42,7 @@
             <field name="model">account.fiscal.position</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscal Mapping">
+                <tree string="Fiscal Position">
                     <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
@@ -50,7 +50,7 @@
         </record>
 
         <record id="action_account_fiscal_position_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Mappings</field>
+            <field name="name">Fiscal Positions</field>
             <field name="res_model">account.fiscal.position</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index b34dca0dbb9..ca013f48be7 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -83,7 +83,6 @@
         </record>
 
         <record id="process_node_reconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
@@ -105,7 +104,6 @@
         </record>
 
         <record id="process_node_accountingstatemententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 8635b083d72..6f5526623df 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -72,7 +72,6 @@
         </record>
 
         <record id="process_node_supplierpaymentorder0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment Order&quot;&quot;&quot;" name="name"/>
@@ -83,7 +82,6 @@
         </record>
 
         <record id="process_node_supplierreconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index e989f766d7b..114c75f40af 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -2,44 +2,44 @@
 <openerp>
     <data>
 
-		<record id="account_analytic_invert_balance_view" model="ir.ui.view">
-			<field name="name">Account Analytic Inverted Balance</field>
-			<field name="model">account.analytic.inverted.balance</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Select Period">
-					<group colspan="4" col="6">
-						<field name="date1"/>
-						<field name="date2"/>
-					</group>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        <record id="account_analytic_invert_balance_view" model="ir.ui.view">
+            <field name="name">Account Analytic Inverted Balance</field>
+            <field name="model">account.analytic.inverted.balance</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Period">
+                    <group colspan="4" col="6">
+                        <field name="date1"/>
+                        <field name="date2"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
-			<field name="name">Inverted Analytic Balance</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.analytic.inverted.balance</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_analytic_invert_balance_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
+            <field name="name">Inverted Analytic Balance</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.inverted.balance</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_invert_balance_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_analytic_invert_balance_values">
-			<field name="model_id" ref="analytic.model_account_analytic_account" />
-			<field name="object" eval="1" />
-			<field name="name">Account Analytic Inverted Balance</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
-			<field name="key">action</field>
-			<field name="model">account.analytic.account</field>
-		</record>
+        <record model="ir.values" id="account_analytic_invert_balance_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="object" eval="1" />
+            <field name="name">Account Analytic Inverted Balance</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 5a1b8ac868b..22b04e05f39 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -79,6 +79,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
         #
         # Build a string like (1,2,3) for easy use in SQL query
         partner_ids = [x['id'] for x in partners]
+        if not partner_ids:
+            return []
         # This dictionary will store the debit-credit for all partners, using partner_id as key.
         move_state = ['draft','posted']
         if self.target_move == 'posted':
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index a131400948b..34d23826e80 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -108,7 +108,10 @@
         <field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
     </record>
 
-    <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/>
+    <menuitem action="action_analytic_entries_report" 
+        id="menu_action_analytic_entries_report"
+        groups="analytic.group_analytic_accounting"
+        parent="account.menu_finance_statistic_report_statement" sequence="4"/>
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 081328d89fb..a80fb3c3233 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -117,6 +117,9 @@
         <field name="context">{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}</field>
         <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>
-    <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
+    <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all"
+        parent="account.menu_finance_statistic_report_statement"
+        groups="group_account_manager"
+        sequence="2"/>
 </data>
 </openerp>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 39a1709d503..125edb0d992 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -39,7 +39,7 @@ class account_invoice_report(osv.osv):
         'uom_name': fields.char('Default UoM', size=128, readonly=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True),
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 12f8b23e550..ef5a9173fd6 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -78,14 +78,14 @@
                             domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
                             help="Customer Invoices And Refunds"/>
                     <filter icon="terp-purchase"
-                            string="Vendor"
+                            string="supplier"
                             separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
-                            help="Vendor Invoices And Refunds"/>
+                            help="Supplier Invoices And Refunds"/>
                    <separator orientation="vertical"/>
                    <filter icon="terp-dolar" string="Invoice"
                             domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
-                            help="Customer And Vendor Invoices"/>
+                            help="Customer And Supplier Invoices"/>
                    <filter icon="terp-dolar_ok!"
                             string="Refund"
                             separator="1"
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 173cbd1e6c4..c6ff4015ea6 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -362,7 +362,7 @@
     <blockTable colWidths="120.0,410.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Fiscal Mapping Remark : </para>
+          <para style="terp_default_Bold_9">Fiscal Position: </para>
         </td>
         <td>
           <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f6d4ec3d88e..24265065b25 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -5,150 +5,13 @@
         <field name="name">Accounting / Invoice</field>
     </record>
 
-    <record id="group_account_user" model="res.groups">
+    <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
         <field name="name">Accounting / Accountant</field>
     </record>
-
-    <record id="group_account_manager" model="res.groups">
+    <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
         <field name="name">Accounting / Manager</field>
     </record>
 
-    <record id="menu_finance_reporting" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_legal_statement" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_receivables" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice'),ref('group_account_manager'),ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_payables" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice'), ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_charts" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_eaction_account_moves_sale" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_eaction_account_moves_purchase" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree1" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree3" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree4" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_bank_and_cash" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_account_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_entries" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_move_journal_line_form" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_eaction_account_moves_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_dashboard_acc" model="ir.ui.menu">
-        <field eval="[(6, 0, [ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="final_accounting_reports" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_journals_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_tax_code_tree" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_periodical_processing" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_general_ledger" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_general_Balance_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_account_bs_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_account_pl_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_tax_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="next_id_22" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_account_invoice_report_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_account_entries_report_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_statistic_report_statement" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_generic_reporting" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <!--record id="menu_finance_configuration" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]"  name="groups_id"/>
-    </record-->
-
-    <record id="menu_finance_entries" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <!--record id="menu_analytic_accounting" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record-->
-
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
         <field ref="model_account_move" name="model_id"/>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 5f5d404139a..da59388eb91 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -21,17 +21,8 @@
             <field name="context">{'journal_type':'sale','view_mode':False}</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
-
-<!--        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
-<!--            <field name="name">Journal Refund Items</field>-->
-<!--            <field name="res_model">account.move.journal</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
-<!--            <field name="context">{'journal_type':'purchase_refund'}</field>-->
-<!--            <field name="target">new</field>-->
-<!--        </record>-->
-<!--        <menuitem action="action_account_moves_purchase_refund" sequence="5" id="menu_eaction_account_moves_purchase_refund" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>-->
+        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
+            parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
@@ -48,16 +39,6 @@
             sequence="16"
             groups="group_account_user,group_account_manager"/>
 
-<!--        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
-<!--            <field name="name">Journal Refund Items</field>-->
-<!--            <field name="res_model">account.move.journal</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
-<!--            <field name="context">{'journal_type':'sale_refund'}</field>-->
-<!--            <field name="target">new</field>-->
-<!--        </record>-->
-<!--        <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>-->
-
         <record id="action_account_moves_bank" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.journal</field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index a80ffbc05cd..38ed195820b 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -58,8 +58,7 @@
                     <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
                     <field name="date_p"/>
                     <field name="comment"/>
-                    <separator string="Analytic" colspan="4"/>
-                    <field name="analytic_id"/>
+                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index f1c5ef35de9..68a757c6f9b 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -30,6 +30,7 @@
        <menuitem icon="STOCK_PRINT"
             name="Balance Sheet"
             action="action_account_bs_report"
+            groups="group_account_user"
             id="menu_account_bs_report"
             parent="final_accounting_reports"/>
 
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index b251252851c..5a6707f82de 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -56,6 +56,7 @@
             name="General Ledger"
             parent="account.final_accounting_reports"
             action="action_account_general_ledger_menu"
+            groups="group_account_manager"
             id="menu_general_ledger"
            />
 
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 33f8e765387..c1504f6d3f5 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -34,6 +34,7 @@
         <menuitem icon="STOCK_PRINT"
             name="Partner Ledger"
             action="action_account_partner_ledger"
+            groups="group_account_manager"
             id="menu_account_partner_ledger"
             parent="account.next_id_22"/>
 
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index f60ad394857..4174285d64d 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -34,12 +34,13 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-			icon="STOCK_INDENT"
+        <menuitem
+            icon="STOCK_INDENT"
             action="action_account_tax_chart"
             id="menu_action_tax_code_tree"
             parent="menu_finance_charts"
+            groups="group_account_user"
             sequence="12"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index e7aa4f1bbca..af1264d562c 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -23,19 +23,18 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
-    "description": """Account Accountant: This module makes the account as an Invoicing system but not an
-accounting one.
+    "description": """
+Give access to the admin user to all accounting features like the journal
+items and the chart of accounts.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     "depends" : ["account"],
     'update_xml': [
-        'account_security.xml',
-    ],
-    'demo_xml': [
-    ],
-    'test': [
+        'security/account_security.xml',
     ],
+    'demo_xml': [ ],
+    'test': [ ],
     'installable': True,
     'active': False,
     'certificate': '',
diff --git a/addons/account_accountant/account_security.xml b/addons/account_accountant/account_security.xml
deleted file mode 100644
index 429508ebabc..00000000000
--- a/addons/account_accountant/account_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
new file mode 100644
index 00000000000..9daabddfef8
--- /dev/null
+++ b/addons/account_accountant/security/account_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="base.user_admin" model="res.users">
+            <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 1e717a07a33..0d0bee6232c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -257,7 +257,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Payment">
+                <form string="Customer Payment">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" string="Customer"/>
                         <field name="journal_id"
@@ -334,7 +334,7 @@
         </record>
 
         <record id="action_vendor_receipt" model="ir.actions.act_window">
-            <field name="name">Sales Payment</field>
+            <field name="name">Customer Payment</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 576bf5fa5c7..c5a2b3215c2 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
         </record>
 
         <record id="act_pay_voucher" model="ir.actions.act_window">
-            <field name="name">Sales Payment</field>
+            <field name="name">Customer Payment</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
@@ -111,7 +111,7 @@
                                     <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
-                                    <field name="account_analytic_id" groups="base.group_extended"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -153,7 +153,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Sales Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
@@ -186,6 +186,7 @@
         <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
             action="action_sale_receipt"
             parent="account.menu_finance_receivables"
+            groups="base.group_extended"
             sequence="10"/>
 
         <!--  Purchase Vouchers -->
@@ -203,9 +204,9 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Vendor Bills">
+                <form string="Supplier Voucher">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
                         <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
                         <field name="number"/>
                         <field name="name" colspan="4"/>
@@ -221,7 +222,7 @@
                                     <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
                                     <field name="amount"/>
-                                    <field name="account_analytic_id" groups="base.group_extended"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -263,7 +264,7 @@
             </field>
         </record>
         <record id="action_purchase_receipt" model="ir.actions.act_window">
-            <field name="name">Vendor Bills</field>
+            <field name="name">Supplier Vouchers</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field>
@@ -285,7 +286,8 @@
         </record>
 
         <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
-        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
+            action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"
+            groups="base.group_extended"/>
 
     </data>
 </openerp>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 6147ee3e158..2eeda3aa370 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -7,9 +7,7 @@
         <field eval="True" name="global"/>
         <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
     </record>
-    
-    <record id="group_analytic_accounting" model="res.groups">
-        <field name="name">Analytic Accounting</field>
+    <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
+        <field name="name">Useability / Analytic Accounting</field>
     </record>
-    
 </data></openerp>
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index a26e5355cde..da4989756f9 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -10,93 +10,93 @@
     </record>
 
     <record model="account.account" id="auction_income_view">
-		<field name="name">Auction Adjudications</field>
-		<field name="code">A0</field>
-		<field name="type">view</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="0">
-			<value search="[('type','=','view')]" model="account.account"/>
-		</field>
-		<field name="user_type" ref="account.account_type_root"/>
-	</record>
+        <field name="name">Auction Adjudications</field>
+        <field name="code">A0</field>
+        <field name="type">view</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="0">
+            <value search="[('type','=','view')]" model="account.account"/>
+        </field>
+        <field name="user_type" ref="account.account_type_root"/>
+    </record>
 
     <record model="account.account" id="auction_expense_view">
-		<field name="name">Auction Adjudication Expenses</field>
-		<field name="code">A1</field>
-		<field name="type">view</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="0">
-			<value search="[('type','=','view')]" model="account.account"/>
-		</field>
-		<field name="user_type" ref="account.account_type_expense"/>
-	</record>
+        <field name="name">Auction Adjudication Expenses</field>
+        <field name="code">A1</field>
+        <field name="type">view</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="0">
+            <value search="[('type','=','view')]" model="account.account"/>
+        </field>
+        <field name="user_type" ref="account.account_type_expense"/>
+    </record>
 
-	<record model="account.account" id="auction_income">
-		<field name="name">Auction Adjudications</field>
-		<field name="code">A7x*</field>
+    <record model="account.account" id="auction_income">
+        <field name="name">Auction Adjudications</field>
+        <field name="code">A7x*</field>
         <field name="user_type" ref="account.account_type_income"/> 
-		<field name="type">receivable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_income_view"/>
-	</record>
+        <field name="type">receivable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_income_view"/>
+    </record>
 
-	<record model="account.account" id="auction_expense">
-		<field name="name">Auction Adjudication Expenses</field>
-		<field name="code">A6x*</field>
-		<field name="user_type" ref="account.account_type_expense"/>
-		<field name="type">payable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_expense_view"/>
-	</record>
+    <record model="account.account" id="auction_expense">
+        <field name="name">Auction Adjudication Expenses</field>
+        <field name="code">A6x*</field>
+        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="type">payable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_expense_view"/>
+    </record>
 
-	<record model="account.account" id="auction_income_costs">
-		<field name="name">Auction Buyer Costs</field>
-		<field name="code">A8x*</field>
-		<field name="type">payable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_income_view"/>
-		<field name="user_type" ref="account.account_type_tax"/>
-	</record>
-	<record model="account.account" id="auction_expense_costs">
-		<field name="name">Auction Seller Costs</field>
-		<field name="code">A9x*</field>
-		<field name="type">receivable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_expense_view"/>
-		<field name="user_type" ref="account.account_type_tax"/>
-	</record>
+    <record model="account.account" id="auction_income_costs">
+        <field name="name">Auction Buyer Costs</field>
+        <field name="code">A8x*</field>
+        <field name="type">payable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_income_view"/>
+        <field name="user_type" ref="account.account_type_tax"/>
+    </record>
+    <record model="account.account" id="auction_expense_costs">
+        <field name="name">Auction Seller Costs</field>
+        <field name="code">A9x*</field>
+        <field name="type">receivable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_expense_view"/>
+        <field name="user_type" ref="account.account_type_tax"/>
+    </record>
 
-	<record model="account.tax" id="tax_buyer_author">
-		<field name="name">Author rights (4%)</field>
-		<field name="type">percent</field>
-		<field name="applicable_type">code</field>
-		<field name="amount">0.04</field>
-		<field name="domain">sabam</field>
-		<field name="account_collected_id" ref="auction_income_costs"/>
-		<field name="account_paid_id" ref="auction_income_costs"/>
-		<field name="python_applicable">result = (price_unit&gt;=1250)</field>
-	</record>
-	<record model="account.tax" id="tax_buyer">
-		<field name="name">Buyer Costs (20%)</field>
-		<field name="type">percent</field>
-		<field name="amount">0.20</field>
-		<field name="domain">auction</field>
-		<field name="account_collected_id" ref="auction_income_costs"/>
-		<field name="account_paid_id" ref="auction_income_costs"/>
-	</record>
-	<record model="account.tax" id="tax_seller">
-		<field name="name">Seller Costs (12%)</field>
-		<field name="type">percent</field>
-		<field name="amount">-0.12</field>
-		<field name="domain">auction</field>
-		<field name="account_collected_id" ref="auction_expense_costs"/>
-		<field name="account_paid_id" ref="auction_expense_costs"/>
-	</record>
-	<!--demo data for the product-->
-	<record id="product.product_product_pc2" model="product.product">
-		<field name="list_price">770.0</field>
-		<field name="standard_price">700.0</field>
-	</record>
+    <record model="account.tax" id="tax_buyer_author">
+        <field name="name">Author rights (4%)</field>
+        <field name="type">percent</field>
+        <field name="applicable_type">code</field>
+        <field name="amount">0.04</field>
+        <field name="domain">sabam</field>
+        <field name="account_collected_id" ref="auction_income_costs"/>
+        <field name="account_paid_id" ref="auction_income_costs"/>
+        <field name="python_applicable">result = (price_unit&gt;=1250)</field>
+    </record>
+    <record model="account.tax" id="tax_buyer">
+        <field name="name">Buyer Costs (20%)</field>
+        <field name="type">percent</field>
+        <field name="amount">0.20</field>
+        <field name="domain">auction</field>
+        <field name="account_collected_id" ref="auction_income_costs"/>
+        <field name="account_paid_id" ref="auction_income_costs"/>
+    </record>
+    <record model="account.tax" id="tax_seller">
+        <field name="name">Seller Costs (12%)</field>
+        <field name="type">percent</field>
+        <field name="amount">-0.12</field>
+        <field name="domain">auction</field>
+        <field name="account_collected_id" ref="auction_expense_costs"/>
+        <field name="account_paid_id" ref="auction_expense_costs"/>
+    </record>
+    <!--demo data for the product-->
+    <record id="product.product_product_pc2" model="product.product">
+        <field name="list_price">770.0</field>
+        <field name="standard_price">700.0</field>
+    </record>
 
 
     <!--demo data for the partner-->
@@ -106,39 +106,39 @@
     </record>
 
     <record id="res_partner_unknown_address_1" model="res.partner.address">
-	    <field name="city">Bruxelles1</field>
-	    <field name="name">Benoit Mortie1r1</field>
-	    <field name="zip">1030</field>
-	    <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
-	    <field name="email">info@opensides.be</field>
-	    <field name="phone">(+32)2 211 34 83</field>
-	    <field name="street">Rue des Palais 44, bte 33</field>
-	    <field name="type">default</field>
-	    <field name="partner_id" ref="partner_record1"/>
-	</record>
+        <field name="city">Bruxelles1</field>
+        <field name="name">Benoit Mortie1r1</field>
+        <field name="zip">1030</field>
+        <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
+        <field name="email">info@opensides.be</field>
+        <field name="phone">(+32)2 211 34 83</field>
+        <field name="street">Rue des Palais 44, bte 33</field>
+        <field name="type">default</field>
+        <field name="partner_id" ref="partner_record1"/>
+    </record>
 
-	<record id="res_partner_unknown_address_2" model="res.partner.address">
-	    <field name="city">Avignon CEDEX 091</field>
-	    <field name="name">Laurent Jacot1</field>
-	    <field name="zip">84911</field>
-	    <field name="country_id" model="res.country" search="[('name','=','France')]"/>
-	    <field name="email">contact@tecsas.fr</field>
-	    <field name="phone">(+33)4.32.74.10.57</field>
-	    <field name="street">85 rue du traite de Rome</field>
-	    <field name="type">default</field>
-	    <field name="partner_id" ref="partner_record1"/>
-	</record>
+    <record id="res_partner_unknown_address_2" model="res.partner.address">
+        <field name="city">Avignon CEDEX 091</field>
+        <field name="name">Laurent Jacot1</field>
+        <field name="zip">84911</field>
+        <field name="country_id" model="res.country" search="[('name','=','France')]"/>
+        <field name="email">contact@tecsas.fr</field>
+        <field name="phone">(+33)4.32.74.10.57</field>
+        <field name="street">85 rue du traite de Rome</field>
+        <field name="type">default</field>
+        <field name="partner_id" ref="partner_record1"/>
+    </record>
 
-	<record id="res_partner_unknown_address_3" model="res.partner.address">
-	    <field name="city">Louvain-la-Neuve</field>
-	    <field name="name">Thomas Passot</field>
-	    <field name="zip">1348</field>
-	    <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
-	    <field name="email">info@mediapole.net</field>
-	    <field name="phone">(+32).10.45.17.73</field>
-	    <field name="street">Rue de l'Angelique, 1</field>
-	    <field name="partner_id" ref="partner_record1"/>
-	</record>
+    <record id="res_partner_unknown_address_3" model="res.partner.address">
+        <field name="city">Louvain-la-Neuve</field>
+        <field name="name">Thomas Passot</field>
+        <field name="zip">1348</field>
+        <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
+        <field name="email">info@mediapole.net</field>
+        <field name="phone">(+32).10.45.17.73</field>
+        <field name="street">Rue de l'Angelique, 1</field>
+        <field name="partner_id" ref="partner_record1"/>
+    </record>
 
         <!-- demo data for the auction_artist object-->
 
@@ -331,33 +331,33 @@
     <!-- start == demo data for the auction_deposit-->
 
     <record model="auction.deposit" id="auction_deposit_1">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_2">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_3">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_4">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_5">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.lots" id="auction_deposit_1_lot_1">
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 3c8cb5c0278..1cda8ceba60 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -14,8 +14,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Artists">
-	            <field name="name"/>
-	            <field name="birth_death_dates"/>
+                <field name="name"/>
+                <field name="birth_death_dates"/>
             </tree>
         </field>
     </record>
@@ -27,10 +27,10 @@
             <form string="Artists">
                 <separator string="Author/Artist" colspan="4"/>
                 <group colspan="4" col="6">
-	                <field name="name" colspan="4" string="Name"/>
-	                <newline/>
-	                <field name="pseudo"/>
-	                <field name="birth_death_dates"/>
+                    <field name="name" colspan="4" string="Name"/>
+                    <newline/>
+                    <field name="pseudo"/>
+                    <field name="birth_death_dates"/>
                 </group>
                 <separator string="Biography" colspan="4"/>
                 <field name="biography" nolabel="1" colspan="4"/>
@@ -109,15 +109,15 @@
                     <page string="Auction Dates">
                         <group colspan="4" col="4">
                             <group colspan="2" col="2">
-		                        <separator string="Exposition Dates" colspan="4"/>
-		                        <field name="expo1"/>
-		                        <field name="expo2"/>
-		                    </group>
-		                    <group colspan="2" col="2">
-				                <separator string="Auction Dates" colspan="4"/>
-		                        <field name="auction1" select="1"/>
-		                        <field name="auction2" select="1"/>
-		                    </group>
+                                <separator string="Exposition Dates" colspan="4"/>
+                                <field name="expo1"/>
+                                <field name="expo2"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Auction Dates" colspan="4"/>
+                                <field name="auction1" select="1"/>
+                                <field name="auction2" select="1"/>
+                            </group>
                         </group>
                         <separator string="" colspan="4"/>
                         <field name="state"/>
@@ -126,16 +126,16 @@
                     <page string="Accounting" >
                         <group colspan="4" col="4">
                             <group colspan="2" col="2">
-		                        <separator string="Accounting" colspan="4"/>
-		                        <field name="acc_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-		                        <field name="acc_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-	                        </group>
-	                        <group colspan="2" col="2">
-		                        <separator string="Analytic" colspan="4"/>
-		                        <field name="journal_id"/>
-		                        <field name="journal_seller_id"/>
-		                        <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
-		                    </group>
+                                <separator string="Accounting" colspan="4"/>
+                                <field name="acc_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="acc_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Analytic" colspan="4"/>
+                                <field name="journal_id"/>
+                                <field name="journal_seller_id"/>
+                                <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                            </group>
                         </group>
                     </page>
                     <page string="Commissions">
@@ -157,14 +157,14 @@
                                 <field name="buyer_invoice_history" nolabel="1" widget="one2many_list"
                                         height="400">
                                     <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
-					                    <field name="date_invoice"/>
-					                    <field name="number"/>
-					                    <field name="partner_id" groups="base.group_user"/>
-					                    <field name="name"/>
-					                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-					                    <field name="user_id"/>
-					                    <field name="date_due"/>
-					                    <field name="origin"/>
+                                        <field name="date_invoice"/>
+                                        <field name="number"/>
+                                        <field name="partner_id" groups="base.group_user"/>
+                                        <field name="name"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                        <field name="user_id"/>
+                                        <field name="date_due"/>
+                                        <field name="origin"/>
                                         <field name="state"/>
                                     </tree>
                                 </field>
@@ -509,14 +509,14 @@
         <field name="arch" type="xml">
             <form string="Deposit Border Form">
                 <group colspan="4" col="6">
-	               <field name="name" string="Reference"/>
-	               <field name="date_dep"/>
-	               <field name="partner_id"/>
-	               <newline/>
-	               <field name="method"/>
-	               <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-	               <field name="transfer"/>
-	            </group>
+                   <field name="name" string="Reference"/>
+                   <field name="date_dep"/>
+                   <field name="partner_id"/>
+                   <newline/>
+                   <field name="method"/>
+                   <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                   <field name="transfer"/>
+                </group>
                <notebook colspan="4">
                 <page string="General Information">
                  <field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
@@ -691,11 +691,11 @@
         <field name="arch" type="xml">
             <form string="Bids">
                 <group colspan="4" col="6">
-	                <field name="name"/>
-	                <field name="auction_id"/>
-	                <field name="contact_tel"/>
-	                <newline/>
-	                <field name="partner_id" on_change="onchange_contact(partner_id)" colspan="4"/>
+                    <field name="name"/>
+                    <field name="auction_id"/>
+                    <field name="contact_tel"/>
+                    <newline/>
+                    <field name="partner_id" on_change="onchange_contact(partner_id)" colspan="4"/>
                 </group>
                 <field name="bid_lines" colspan="4" nolabel="1">
                     <tree string="Bids Lines" editable="bottom">
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 041feb6d05c..13906abe6ba 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -25,17 +25,24 @@
           </separator>
             
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <separator string="Install Specific Industry Sector Applications" colspan="4"/>
-            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="account_voucher" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="account_accountant" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="marketing" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <separator string="Install Specific Industry Applications" colspan="4"/>
+            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
           </group>
         </data>
       </field>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index f415447e5fb..be0dac906f2 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -27,8 +27,7 @@ class base_setup_installer(osv.osv_memory):
     _install_if = {
         ('sale','crm'): ['sale_crm'],
         ('sale','project'): ['project_mrp'],
-        ('sale',):['account_accountant']
-        }
+    }
     _columns = {
         # Generic modules
         'crm':fields.boolean('Customer Relationship Management',
@@ -51,9 +50,10 @@ class base_setup_installer(osv.osv_memory):
         'mrp':fields.boolean('Manufacturing',
             help="Helps you manage your manufacturing processes and generate "
                  "reports on those processes."),
-        'account':fields.boolean('Financial & Accounting',
-            help="Helps you handle your accounting needs, as well as create "
-                 "and track your budgets."),
+        'account_voucher':fields.boolean('Invoicing',
+            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
+        'account_accountant':fields.boolean('Accounting & Finance',
+            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
         'purchase':fields.boolean('Purchase Management',
             help="Helps you manage your purchase-related processes such as "
                  "requests for quotations, supplier invoices, etc..."),
@@ -95,16 +95,7 @@ class base_setup_installer(osv.osv_memory):
         return None
 
     def _if_misc_tools(self, cr, uid, ids, context=None):
-        interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view
-        if interface == 'simple' or interface =='extended' :
-            return ['profile_tools']
-        return None
-
-    def _if_account(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['account_voucher']
-        return None
+        return ['profile_tools']
 
     def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
         value = {}
diff --git a/addons/product/product.py b/addons/product/product.py
index 6c1125268a9..80318895f2c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -247,7 +247,11 @@ class product_template(osv.osv):
         'warranty': fields.float('Warranty (months)'),
         'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
-        'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
+        'state': fields.selection([('',''),
+            ('draft', 'In Development'),
+            ('sellable','Normal'),
+            ('end','End of Lifecycle'),
+            ('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
         'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
         'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7e9ae7ce45e..924ad89cd10 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -110,7 +110,7 @@
                             <group colspan="2" col="2" name="uom">
                                 <separator string="Unit of Measure" colspan="2"/>
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" widget="selection"/>
-                                <field name="uom_po_id" widget="selection"/>
+                                <field name="uom_po_id" widget="selection" groups="base.group_extended"/>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">
@@ -147,13 +147,11 @@
                             <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <newline/>
-                            <field name="price_margin" groups="base.group_extended"/>
-                            <field name="price_extra" groups="base.group_extended"/>
+                            <field name="price_margin" groups="group_product_variant"/>
+                            <field name="price_extra" groups="group_product_variant"/>
                             <newline/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
-                            <field groups="base.group_extended" name="seller_id"/>
-                            <newline/>
                             <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
@@ -462,7 +460,6 @@
                     <field name="product_code" groups="base.group_extended"/>
                     <field name="min_qty"/>
                     <field name="product_uom" widget="selection"/>
-                    <field name="qty"/>
                     <field name="delay"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
@@ -487,7 +484,7 @@
                     <field name="sequence" string="Seq"/>
                     <field name="name"/>
                     <field name="delay"/>
-                    <field name="qty"/>
+                    <field name="min_qty"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
@@ -580,7 +577,7 @@
                             <group colspan="2" col="2" name="uom">
                                 <separator string="UOM" colspan="2"/>
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                <field name="uom_po_id"/>
+                                <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c85088c9b53..1cf357f227c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -270,7 +270,7 @@
                             <newline/>
                             <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
-           				<page string="Notes">
+                           <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
@@ -310,8 +310,8 @@
                 <form string="Purchase Order Line">
                     <notebook colspan="4">
                         <page string="Order Line">
-                           	<separator colspan="4" string="General Information"/>
-                         	<field name="order_id"/>
+                               <separator colspan="4" string="General Information"/>
+                             <field name="order_id"/>
                             <field name="product_id" readonly="1" />
                             <field name="product_qty" readonly="1" />
                             <field name="product_uom" readonly="1"/>
@@ -332,7 +332,7 @@
                             <newline/>
                             <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
-         				<page string="Notes">
+                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
@@ -349,7 +349,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                		<group>
+                        <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
                         </group>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ef9b833ec32..fea019a12ab 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,9 +60,10 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
-                    <group col="4" colspan="2">
-                        <field name="standard_price" readonly="True"/>
-                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
+                    <label string="Cost Price:" align="1.0" colspan="1"/>
+                    <group col="2" colspan="1">
+                        <field name="standard_price" nolabel="1" attrs="{'readonly':[('valuation','=','real_time')]}"/>
+                        <button name="%(action_view_change_standard_price)d" string="Update" type="action" icon="gtk-execute" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/>
                     </group>
                 </field>
             </field>
@@ -76,8 +77,8 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <field name="property_account_expense" position="after">
-                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/>
+                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/>
                 </field>
             </field>
         </record>
@@ -128,7 +129,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="cost_method" position="after">
-                    <field name="valuation"/>
+                    <field name="valuation" groups="base.group_extended"/>
                 </field>
             </field>
         </record>

From a6d5f625cc69bd8e06146b4b99af78d4c62266c4 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 10 Oct 2010 04:56:04 +0000
Subject: [PATCH 510/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101010045604-7muwhvxees9ja5ed
---
 addons/account/i18n/ar.po                 |   6 +-
 addons/account_analytic_plans/i18n/mn.po  |   6 +-
 addons/base_calendar/i18n/nl.po           |   6 +-
 addons/crm/i18n/nl.po                     |   6 +-
 addons/crm_claim/i18n/nl.po               |   6 +-
 addons/marketing/i18n/ru.po               | 124 +++
 addons/marketing_campaign/i18n/ru.po      | 935 ++++++++++++++++++++++
 addons/mrp_jit/i18n/kab.po                |   4 +-
 addons/project/i18n/eu.po                 |   6 +-
 addons/project_retro_planning/i18n/kab.po |   4 +-
 10 files changed, 1081 insertions(+), 22 deletions(-)
 create mode 100644 addons/marketing/i18n/ru.po
 create mode 100644 addons/marketing_campaign/i18n/ru.po

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 93e9f9a81ff..e86d4b5b06a 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-08 21:43+0000\n"
-"Last-Translator: Hamza Nizam <Unknown>\n"
+"PO-Revision-Date: 2010-10-09 14:32+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index db1f0696490..8031d4b6bca 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_analytic_plans/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-08 11:24+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-09 14:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 36433e6ca48..c431225ff57 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-10-08 12:13+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-09 14:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index d91cd46c9fd..5d7e5b0856b 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-08 11:38+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-09 15:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index e6794aa1fda..9429ed442e5 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:07+0000\n"
-"PO-Revision-Date: 2010-10-08 12:56+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-09 14:10+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
new file mode 100644
index 00000000000..2ec46996a11
--- /dev/null
+++ b/addons/marketing/i18n/ru.po
@@ -0,0 +1,124 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 07:04+0000\n"
+"PO-Revision-Date: 2010-10-09 18:11+0000\n"
+"Last-Translator: Anatoly Rudnev <Unknown>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: marketing
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Некорректный формат XML для просмотра архитектуры!"
+
+#. module: marketing
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
+#. module: marketing
+#: field:marketing.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "title"
+msgstr "заголовок"
+
+#. module: marketing
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
+msgstr "Автоматизированные рассылки"
+
+#. module: marketing
+#: field:marketing.installer,config_logo:0
+msgid "Image"
+msgstr "Изображение"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid ""
+"Helps you to manage marketing campaigns and automate actions and "
+"communication steps."
+msgstr ""
+"Помогает Вам настроить маркетинговые кампании и автоматизировать действия  и "
+"этапы взамодействия"
+
+#. module: marketing
+#: help:marketing.installer,marketing_campaign_mailchimp:0
+msgid ""
+"This modules integrate mailchimp.com's service with OpenERP to automate mass "
+"mailings."
+msgstr ""
+"Этот модуль интегрирует в OpenERP сервисы mailchimp.com для автоматизации "
+"почтовых рассылок"
+
+#. module: marketing
+#: model:ir.module.module,description:marketing.module_meta_information
+msgid "Menu for Marketing"
+msgstr ""
+
+#. module: marketing
+#: help:marketing.installer,email_template:0
+msgid ""
+"Helps you to design templates of emails and integrate them in your different "
+"processes."
+msgstr ""
+"Помогает разработать шаблоны сообщений электронной почты и интегрировать их "
+"в ваши процессы."
+
+#. module: marketing
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation within partners and design questionaires."
+msgstr ""
+
+#. module: marketing
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: marketing
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Маркетинг"
+
+#. module: marketing
+#: field:marketing.installer,crm_profiling:0
+msgid "Profiling Tools"
+msgstr "Средства профилирования"
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign:0
+msgid "Marketing Campaigns"
+msgstr "Маркетинговые кампании"
+
+#. module: marketing
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr ""
+
+#. module: marketing
+#: field:marketing.installer,marketing_campaign_mailchimp:0
+msgid "Mailchimp Integration"
+msgstr "Интеграция с сервисом MailChimp"
+
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr "Установка модулей маркетинга"
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
new file mode 100644
index 00000000000..3806439682b
--- /dev/null
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -0,0 +1,935 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 07:09+0000\n"
+"PO-Revision-Date: 2010-10-09 18:35+0000\n"
+"Last-Translator: Anatoly Rudnev <Unknown>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+"Текущий шаг для этого элемента не имеет доступных для предварительного "
+"просмотра отчетов иили шаблонов электронной почты"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Время"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "Группировать по .."
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr "Активатор"
+
+#. module: marketing_campaign
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr "Редактор кампаний"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Today"
+msgstr "Сегодня"
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Object"
+msgstr "Объект"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "Сделать черновиком"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr "Следующие действия"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "Синхронизация"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr "Этот год"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself left this field empty."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "No preview"
+msgstr "Без предпросмотра"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr "Исходящее перемещение"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "Сброс"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"Describe type of action to be performed on the Activity.Eg : Send email,Send "
+"paper.."
+msgstr ""
+"Опишите тип действия которое необходимо выполнить. Например: Отправить "
+"электронную почту, отправить буклет ..."
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "Год (а)"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr "Сгенереированные отчеты будут сохранены в этой папке"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "Автоматически"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Activity Definition"
+msgstr "Определение действия"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Keep as cancelled when condition not met"
+msgstr "Оставить как отмененное если условие не выполнено."
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "Кампания"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr "Сегмент"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Workitem creation mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr "Месяц (ы)"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign hasn't any starting activity nor any activity with a signal and "
+"no previous activity."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "Партнёр"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "If record created after last sync"
+msgstr "Если запись сделана после последней синхронизации"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Create After Sync"
+msgstr "Создать После Синхронизации"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Dates"
+msgstr "Даты"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines when new workitems should be created for records matching a "
+"segment."
+msgstr ""
+"Определяет, должен ли рабочий элемент создаваться для записи соответствующей "
+"сегменту"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "Статус"
+
+#. module: marketing_campaign
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid ""
+"\n"
+"Allows you to setup leads automation through marketing campaigns. The "
+"campaigns\n"
+"are dynamic and multi-channels. The process:\n"
+"* Design marketing campaigns that incluces mail templates, reports to "
+"print,\n"
+"  miscelleanous actions, etc.\n"
+"* Define segments that are selections of target people\n"
+"* Launch your campaign to automate communications.\n"
+"\n"
+"If you need demo data, you can install the module "
+"marketing_campaign_crm_demo.\n"
+"    "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - object: the object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign cannot be started: an email account is missing in the email "
+"activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Latest Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launching Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Status"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Run Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for the campaign (used for campaign analysis), see also variable "
+"cost on activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the model on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
+msgid "marketing_campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are done"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is not approved in the "
+"email activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Modified after Sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Paper"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem have to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:0
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "If record modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po
index cabc118afb8..0b97e9c4c2b 100644
--- a/addons/mrp_jit/i18n/kab.po
+++ b/addons/mrp_jit/i18n/kab.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-09 09:33+0000\n"
+"PO-Revision-Date: 2010-10-09 14:11+0000\n"
 "Last-Translator: yugurten <yugurten1@hotmail.fr>\n"
 "Language-Team: Kabyle <kab@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: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 7bb7f43723c..efa64da581c 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-09 12:10+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) <Unknown>\n"
+"PO-Revision-Date: 2010-10-09 16:08+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Basque <eu@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: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project_retro_planning/i18n/kab.po b/addons/project_retro_planning/i18n/kab.po
index 770cad5b13f..a890f540a01 100644
--- a/addons/project_retro_planning/i18n/kab.po
+++ b/addons/project_retro_planning/i18n/kab.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-09 09:40+0000\n"
+"PO-Revision-Date: 2010-10-09 14:25+0000\n"
 "Last-Translator: yugurten <yugurten1@hotmail.fr>\n"
 "Language-Team: Kabyle <kab@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: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning

From 8cb8b0af2ba5e2a6bf2cde8caee559a47bfebdd9 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 19:32:39 +0200
Subject: [PATCH 511/632] [IMP] useability improvmeents misc

bzr revid: fp@fp-laptop-20101010173239-4563xgh24q2jt0lt
---
 addons/account/account_installer.xml          |  14 +-
 addons/account/account_invoice_view.xml       |  23 ++--
 addons/account/installer.py                   |   2 +-
 addons/account/invoice.py                     |   2 +-
 addons/account/partner.py                     |   2 +-
 addons/account/partner_view.xml               |   2 +-
 .../report/account_invoice_report_view.xml    |   2 +-
 addons/account/report/account_report.py       |   2 +-
 .../voucher_payment_receipt_view.xml          |   4 +-
 .../voucher_sales_purchase_view.xml           |   4 +-
 addons/base_setup/base_setup_todo.xml         |   2 +-
 addons/base_setup/installer.py                |   6 +-
 addons/base_setup/todo.py                     |   4 +-
 addons/crm/crm_meeting_view.xml               |  11 +-
 addons/crm/crm_opportunity_view.xml           |   6 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  |   2 +-
 .../wizard/crm_lead_to_opportunity_view.xml   |   1 -
 addons/crm/wizard/crm_lead_to_partner.py      |  13 +-
 addons/product/partner_view.xml               |   2 +-
 addons/product/product.py                     |   5 +
 addons/product/product_data.xml               |   4 +
 addons/product/product_demo.xml               |   9 +-
 addons/product/product_view.xml               |  10 +-
 addons/purchase/__openerp__.py                |   2 +-
 addons/purchase/purchase_view.xml             |  46 ++++---
 addons/purchase/purchase_workflow.xml         |   2 +-
 addons/purchase/stock_view.xml                |   3 +-
 .../wizard/purchase_order_group_view.xml      |  37 +++---
 addons/sale/sale.py                           |   4 +-
 addons/sale/sale_view.xml                     |  17 +--
 addons/sale_crm/wizard/crm_make_sale.py       |   4 -
 addons/sale_crm/wizard/crm_make_sale_view.xml |   4 +-
 addons/stock/stock.py                         |   8 ++
 addons/stock/stock_view.xml                   | 123 +++++++++---------
 .../stock/wizard/stock_partial_move_view.xml  |   2 +-
 .../wizard/stock_partial_picking_view.xml     |   2 +-
 36 files changed, 203 insertions(+), 183 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index a3570fae79a..511dcba87bb 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -26,32 +26,32 @@
                 <group colspan="8">
                     <group colspan="4" height="450" width="600">
                         <field name="charts"/>
-                            <group colspan="4">
+                            <group colspan="4" groups="base.group_extended">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                                 <field name="company_id" colspan="4" widget="selection" groups="base.group_multi_company"/>
                                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>
                             </group>
+                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+                                <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
+                                <field name="purchase_tax" groups="base.group_extended"/>
+                            </group>
                             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
                                 <separator col="4" colspan="4" string="Bank and Cost Account"/>
                                 <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
                                     <form string="">
                                         <field name="acc_name"/>
                                         <field name="account_type"/>
-                                        <field name="currency_id" widget="selection"/>
+                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
                                     </form>
                                     <tree editable="bottom" string="">
                                         <field name="acc_name"/>
                                         <field name="account_type"/>
-                                        <field name="currency_id" widget="selection"/>
+                                        <field name="currency_id" widget="selection" groups="base.group_extended"/>
                                     </tree>
                                 </field>
                             </group>
-                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
-                                <field name="purchase_tax" colspan="2" />
-                            </group>
                         </group>
                     </group>
                 </data>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ebf58bab11d..cf5bff246c4 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -36,7 +36,7 @@
             <field name="arch" type="xml">
                 <tree string="Invoice Line">
                     <field name="name"/>
-                    <field name="account_id" groups="base.group_user"/>
+                    <field name="account_id" groups="account.group_account_user"/>
                     <field name="quantity"/>
                     <field name="uos_id"/>
                     <field name="price_unit"/>
@@ -60,7 +60,7 @@
                             <field name="price_unit"/>
                             <field name="discount" groups="base.group_extended"/>
                             <field colspan="4" name="name"/>
-                            <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
+                            <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <newline/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -83,7 +83,7 @@
                     <field name="sequence"/>
                     <field name="manual"/>
                     <field name="name"/>
-                    <field name="account_id" groups="base.group_user"/>
+                    <field name="account_id" groups="base.group_account_user"/>
                     <field name="base"/>
                     <field name="amount"/>
                 </tree>
@@ -98,7 +98,7 @@
                 <form string="Manual Invoice Taxes">
                     <field name="name"/>
                     <field name="sequence"/>
-                    <field name="account_id" groups="base.group_user"/>
+                    <field name="account_id"/>
                     <field name="manual"/>
                     <field name="amount"/>
                     <field name="base" readonly="0"/>
@@ -234,14 +234,14 @@
                         <page string="Payments" groups="base.group_extended">
                             <field name="payment_ids" colspan="4" nolabel="1" >
                                 <tree string="Payments">
-                                    <field name="date"/>
+                                    <field name="date" string="Payment Date"/>
                                     <field name="ref"/>
-                                    <field name="name"/>
+                                    <field name="name" groups="base.group_extended"/>
                                     <field name="journal_id"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_extended"/>
+                                    <field name="currency_id" groups="base.group_extended"/>
                                 </tree>
                             </field>
                         </page>
@@ -354,9 +354,9 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
+                        <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                        <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter name="invoices" icon="terp-camera_test" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
@@ -450,7 +450,6 @@
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
-            <field name="name">Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index cf0049efa54..7371012b417 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -61,7 +61,7 @@ class account_installer(osv.osv_memory):
         'date_stop': fields.date('End Date', required=True),
         'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
                                   'Periods', required=True),
-        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
+        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts',required=True),
         'sale_tax':fields.float('Sale Tax(%)'),
         'purchase_tax':fields.float('Purchase Tax(%)'),
         'company_id': fields.many2one('res.company', 'Company'),
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 3879d3af32a..0c83814c15d 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -251,7 +251,7 @@ class account_invoice(osv.osv):
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
             \n* The \'Paid\' state is set automatically when invoice is paid.\
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
-        'date_invoice': fields.date('Date Invoiced', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
+        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
         'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]},
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 9f4fdf82abd..d32a8750c9e 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -187,7 +187,7 @@ class res_partner(osv.osv):
             help="This payment term will be used instead of the default one for the current partner"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
-        'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
+        'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
     }
 res_partner()
 
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index da33d680d95..890e477a726 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -143,7 +143,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="credit_limit" position="after">
-                    <field name="last_reconciliation_date"/>
+                    <field name="last_reconciliation_date" groups="base.group_extended"/>
                 </field>
             </field>
         </record>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index ef5a9173fd6..a2ea227d707 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -94,7 +94,7 @@
                    <separator orientation="vertical"/>
                    <field name="partner_id"/>
                    <field name="user_id" />
-                   <field name="date" string="Date Invoiced"/>
+                   <field name="date" string="Invoice Date"/>
                    <field name="categ_id" />
                 </group>
                 <newline/>
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 1136300f065..dd8e0a2ce4e 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -165,7 +165,7 @@ class report_invoice_created(osv.osv):
         'amount_untaxed': fields.float('Untaxed', readonly=True),
         'amount_total': fields.float('Total', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
-        'date_invoice': fields.date('Date Invoiced', readonly=True),
+        'date_invoice': fields.date('Invoice Date', readonly=True),
         'date_due': fields.date('Due Date', readonly=True),
         'residual': fields.float('Residual', readonly=True),
         'state': fields.selection([
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0d0bee6232c..8169cac31e3 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -219,7 +219,7 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
@@ -326,7 +326,7 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index c5a2b3215c2..7bc64a825ae 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -152,7 +152,7 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -256,7 +256,7 @@
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                        <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
+                        <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 56c205b16c9..9d0c41c196c 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -66,7 +66,7 @@
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
-        <field name="sequence">3</field>
+        <field name="sequence">1</field>
         <field name="restart">always</field>
     </record>
   </data>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index be0dac906f2..e23f1171752 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -45,8 +45,7 @@ class base_setup_installer(osv.osv_memory):
             help="Lets you install addons geared towards sharing knowledge "
                  "with and between your employees."),
         'stock':fields.boolean('Warehouse Management',
-            help="Helps you manage your stocks and stocks locations, as well "
-                 "as the flow of stock between warehouses."),
+            help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
         'mrp':fields.boolean('Manufacturing',
             help="Helps you manage your manufacturing processes and generate "
                  "reports on those processes."),
@@ -84,9 +83,6 @@ class base_setup_installer(osv.osv_memory):
                  "applications selected to help you manage your auctions "
                  "as well as the business processes around them."),
         }
-    _defaults = {
-        'crm': True,
-        }
 
     def _if_knowledge(self, cr, uid, ids, context=None):
         if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 7be56f9eabe..ae16f260876 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -104,8 +104,8 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''')
 We suggest you to put bank information here:
 IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
         'logo':fields.binary('Logo'),
-        'account_no':fields.char('Account No', size=64),
-        'website': fields.char('Company Website', size=64, help="Exemple: http://openerp.com"),
+        'account_no':fields.char('Bank Account No', size=64),
+        'website': fields.char('Company Website', size=64, help="Example: http://openerp.com"),
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 98b311592b7..aa8b6cc4820 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -130,8 +130,11 @@
                     <separator string="Description" colspan="4" />
                     <field name="description" nolabel="1" colspan="4" />
                     <separator colspan="4"/>
-                    <group col="8" colspan="4">
+                    <group col="8" colspan="4" groups="base.group_extended">
                         <field name="state" />
+                        <button name="case_cancel" string="Cancel"
+                            states="draft,open" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
@@ -141,9 +144,6 @@
                         <button name="case_open" string="Confirm"
                             states="draft" type="object"
                             icon="gtk-go-forward" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open" type="object"
-                            icon="gtk-cancel" />
                     </group>
                     </page>
                     <page string="Invitation Detail">
@@ -241,7 +241,7 @@
                 <field name="location" />
                 <field name="categ_id" string="Meeting Type"/>
                 <field name="class" string="Privacy"/>
-                <field name="state"/>
+                <field name="state" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="show_as" invisible="1" string="Show time as"/>
                 <button name="case_reset" string="Reset to Unconfirmed"
@@ -303,6 +303,7 @@
                        <group col="12" colspan="4">
                            <filter icon="terp-check" name="current" string="Current"
                                 domain="[('state','in',('draft', 'open'))]"
+				groups="base.group_extended"
                                 help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 8f70560f367..315cd206687 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -74,6 +74,9 @@
                             <separator colspan="4"/>
                             <group col="10" colspan="4">
                                 <field name="state"/>
+                                <button name="case_cancel" string="Cancel"
+                                    states="draft" type="object"
+                                    icon="gtk-close" />
                                 <button name="case_reset" string="Reset to Draft"
                                     states="done,cancel" type="object"
                                     icon="gtk-convert" />
@@ -87,9 +90,6 @@
                                     states="open,pending" type="object"
                                     groups="base.group_extended"
                                     icon="gtk-go-up" />
-                                <button name="case_cancel" string="Cancel"
-                                    states="draft" type="object"
-                                    icon="gtk-close" />
                                 <button name="case_mark_lost" string="Mark Lost"
                                     states="open,pending" type="object"
                                     icon="gtk-cancel" />
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index d94169c2dd1..c34bedf15a2 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -156,7 +156,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'), 
+        'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner'), ('no','Do not create a partner')], 'Action'), 
     }
     
     def default_get(self, cr, uid, fields, context=None):
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 55196f0688e..bc3c0ebbf46 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -54,7 +54,6 @@
                 <separator string="" colspan="4" />
                 <group col="4" colspan="4">
                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
                     <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
                 </group>
             </form>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index aeb5b2db673..b0b20243030 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -171,12 +171,13 @@ class crm_lead2partner(osv.osv_memory):
 
                 partner_ids.append(partner_id)
 
-                vals = {}
-                if partner_id:
-                    vals.update({'partner_id': partner_id})
-                if contact_id:
-                    vals.update({'partner_address_id': contact_id})
-                lead_obj.write(cr, uid, [lead.id], vals)
+                if data.action<>'no':
+                    vals = {}
+                    if partner_id:
+                        vals.update({'partner_id': partner_id})
+                    if contact_id:
+                        vals.update({'partner_address_id': contact_id})
+                    lead_obj.write(cr, uid, [lead.id], vals)
         return partner_ids
 
     def make_partner(self, cr, uid, ids, context=None):
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 6b756eb8d7f..51d012b8577 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <newline/>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Sales Properties" colspan="2"/>
                         <field name="property_product_pricelist"/>
                     </group>
diff --git a/addons/product/product.py b/addons/product/product.py
index 80318895f2c..fd5d97de13a 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -289,10 +289,15 @@ class product_template(osv.osv):
                 return {'value': {'uom_po_id': uom_id}}
         return False
 
+    def _get_categ(self, cursor, user, context={}):
+        md = self.pool.get('ir.model.data')
+        return md._get_id(cr, uid, 'product', 'cat0') or False
+
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
         'type': lambda *a: 'product',
         'list_price': lambda *a: 1,
+        'categ_id': _get_categ,
         'cost_method': lambda *a: 'standard',
         'supply_method': lambda *a: 'buy',
         'standard_price': lambda *a: 1,
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 05a57126402..2052221cf78 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -4,6 +4,10 @@
         <!--
 	Resource: product.uom.categ
 	-->
+        <record id="cat0" model="product.category">
+            <field name="name">All products</field>
+        </record>
+
         <record id="product_uom_categ_unit" model="product.uom.categ">
             <field name="name">Unit</field>
         </record>
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index cbc1f4d458a..92d0df088ef 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -5,17 +5,12 @@
     Resource: product.category 
     -->
         
-        <record id="cat0" model="product.category">
-            <field name="parent_id" ref="null"/>
-            <field name="name">All products</field>
-            <field name="type">view</field>
-        </record>
         <record id="cat1" model="product.category">
-            <field name="parent_id" ref="cat0"/>
+            <field name="parent_id" ref="product.cat0"/>
             <field name="name">Sellable</field>
         </record>
         <record id="cat2" model="product.category">
-            <field name="parent_id" ref="cat0"/>
+            <field name="parent_id" ref="product.cat0"/>
             <field name="name">Private</field>
         </record>
         <record id="product_category_3" model="product.category">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 924ad89cd10..8f2e5efe649 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -89,7 +89,7 @@
                             <group colspan="2" col="2">
                                 <separator string="Procurement" colspan="2"/>
                                 <field name="type"/>
-                                <field name="procure_method"/>
+                                <field name="procure_method" groups="base.group_extended"/>
                                 <field name="supply_method"/>
                             </group>
 
@@ -147,8 +147,8 @@
                             <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <newline/>
-                            <field name="price_margin" groups="group_product_variant"/>
-                            <field name="price_extra" groups="group_product_variant"/>
+                            <field name="price_margin" groups="product.group_product_variant"/>
+                            <field name="price_extra" groups="product.group_product_variant"/>
                             <newline/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
@@ -304,9 +304,7 @@
                 <tree string="Units of Measure">
                     <field name="name"/>
                     <field name="category_id"/>
-                    <field name="uom_type"/>
                     <field name="factor"/>
-                    <field name="rounding"/>
                 </tree>
             </field>
         </record>
@@ -556,7 +554,7 @@
                             <group colspan="2" col="2">
                                 <separator string="Procurement" colspan="2"/>
                                 <field name="type"/>
-                                <field name="procure_method"/>
+                                <field name="procure_method" groups="base.group_extended"/>
                                 <field name="supply_method"/>
                             </group>
 
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 7af6dbceff0..58b049e130e 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -46,8 +46,8 @@
         'wizard/purchase_order_group_view.xml',
         'wizard/purchase_installer.xml',
         'wizard/purchase_line_invoice_view.xml',
-        'purchase_view.xml',
         'purchase_report.xml',
+        'purchase_view.xml',
         'stock_view.xml',
         'partner_view.xml',
         'process/purchase_process.xml',
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1cf357f227c..a9996202b20 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -35,19 +35,32 @@
             action="base.action_partner_supplier_form" sequence="1"/>
 
           <!--Inventory control-->
-      <menuitem id="menu_procurement_management_inventory" name="Inventory Control"
+      <menuitem id="menu_procurement_management_inventory" name="Receive Products"
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
-            name="Incoming Shipments" sequence="9"/>
+            name="Incoming Shipments" sequence="9"
+	    groups="base.group_extended"/>
       <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
             parent="menu_procurement_management_inventory" sequence="11"/>
 
      <!--Invoice control-->
      <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
           parent="base.menu_purchase_root" sequence="6"/>
+
+    <record id="action_invoice_pending" model="ir.actions.act_window">
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,calendar,graph</field>
+        <field eval="False" name="view_id"/>
+        <field name="domain">[('type','=','in_invoice')]</field>
+        <field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
+        <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+            <field name="help">This is the list of supplier invoice you are waiting for. You can select invoices and validate them once you have received the invoice and checked his data.</field>
+    </record>
+
      <menuitem name="Supplier Invoices to Receive"
           id="menu_procurement_management_pending_invoice"
-          action="account.action_invoice_tree_pending_invoice"
+          action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
           sequence="13"/>
 
@@ -100,13 +113,13 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}"/>
                             <field name="partner_address_id"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
-                                <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
+                                <tree string="Purchase Order Lines">
                                     <field name="date_planned"/>
                                     <field name="name"/>
                                     <field name="product_qty"/>
@@ -124,15 +137,16 @@
                             </group>
                             <group col="11" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
-                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                                <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
-
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
+                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-go-forward"/>
+                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
+                                <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
+				<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices" groups="base.group_extended">
@@ -200,7 +214,7 @@
             <field name="model">purchase.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('approved','done');blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                <tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
                     <field name="name" string="Reference"/>
                     <field name="date_order" string="Order Date"/>
                     <field name="partner_id"/>
@@ -222,7 +236,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_draft': 1,'search_default_create_uid':uid}</field>
+            <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.</field>
@@ -287,7 +301,7 @@
             <field name="model">purchase.order.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
+                <tree string="Purchase Order Lines">
                     <field name="order_id"/>
                     <field name="name"/>
                     <field name="date_planned" widget="date" width="135"/>
@@ -367,14 +381,14 @@
         <act_window
             context="{'search_default_partner_id': [active_id]}"
             id="act_res_partner_2_purchase_order"
-            name="Purchase orders"
+            name="Purchase Orders"
             res_model="purchase.order"
             src_model="res.partner"/>
 
         <act_window
             context="{'search_default_product_id': [active_id]}"
             id="action_purchase_line_product_tree"
-            name="Product purchases"
+            name="Purchases"
             res_model="purchase.order.line"
             src_model="product.product"
             groups="base.group_extended"/>
@@ -406,7 +420,7 @@
             id="menu_purchase_line_order_draft"
             groups="base.group_extended"
             parent="menu_procurement_management_invoice"
-            sequence="12"/>
+            sequence="72"/>
 
         <!--
             Procurements
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 3ab41d7e6bf..aea6fa2b2ac 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -103,7 +103,7 @@
         <record id="trans_confirmed_router" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_router"/>
-            <field name="signal">purchase_approve</field>
+            <!-- <field name="signal">purchase_approve</field> removed from simplification/useability -->
         </record>
         <record id="trans_router_picking" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 2b741536d3b..d5a645b4b98 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -17,8 +17,9 @@
         <act_window
             domain="[('purchase_id', '=', active_id)]"
             id="act_purchase_order_2_stock_picking"
-            name="Picking"
+            name="Receptions"
             res_model="stock.picking"
+	    groups="base.group_extended"
             src_model="purchase.order"
             context="{'contact_display': 'partner'}" />
        
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index cec987bc5ea..fe04af1a32b 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_purchase_order_group" model="ir.ui.view">
+        <record id="view_purchase_order_group" model="ir.ui.view">
             <field name="name">Merger Purchase Orders</field>
             <field name="model">purchase.order.group</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge orders">
-        			<separator string="Are you sure you want to merge these orders ?" colspan="4"/>
-       				<newline/>
-    				<label string="
+                    <separator string="Are you sure you want to merge these orders ?" colspan="4"/>
+                       <newline/>
+                    <label string="
 Please note that: &#13; &#13;  
 Orders will only be merged if: &#13;  
 * Purchase Orders are in draft &#13;  
@@ -17,23 +17,24 @@ Orders will only be merged if: &#13;
 * Purchase Orders are have same stock location, same pricelist &#13; &#13;   
 Lines will only be merged if: &#13;  
 * Order lines are exactly the same except for the product,quantity and unit &#13;
-" colspan="4"/>				
-				    <newline/>    				
-        			<separator string="" colspan="4" />
-					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	    <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
-    			</form>
+" colspan="4"/>                
+                    <newline/>                    
+                    <separator string="" colspan="4" />
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
+                </form>
             </field>
-		</record>
+        </record>
 
-         <act_window name="Merge Purchase orders"		    
-		    res_model="purchase.order.group"
-		    src_model="purchase.order"
-		    view_mode="form"
-		    target="new"        
+        <act_window name="Merge Purchase orders"            
+            res_model="purchase.order.group"
+            src_model="purchase.order"
+            view_mode="form"
+            target="new"        
             key2="client_action_multi"    
-		    id="action_view_purchase_order_group"/>	
-		    			
+            groups="base.group_extended"
+            id="action_view_purchase_order_group"/>    
+                        
     </data>
 </openerp>
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6c8bf247b23..70313b03b24 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -250,7 +250,7 @@ class sale_order(osv.osv):
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
         'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
-        'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available Procurement generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
+        'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sale order has been delivered. This field is updated only after the scheduler have been launched !"),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Paid',
@@ -912,7 +912,7 @@ class sale_order_line(osv.osv):
                 else:
                     a = self.pool.get('ir.property').get(cr, uid,
                             'property_account_income_categ', 'product.category',
-                            context=context)
+                            context=context).id
                 uosqty = _get_line_qty(line)
                 uos_id = _get_line_uom(line)
                 pu = 0.0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7d95126cbe5..747414b7e8d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -56,7 +56,7 @@
             <field name="model">sale.order</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar string="Sales orders" color="state" date_start="date_order">
+                <calendar string="Sales Orders" color="state" date_start="date_order">
                     <field name="partner_id"/>
                     <field name="amount_total"/>
                 </calendar>
@@ -67,7 +67,7 @@
             <field name="model">sale.order</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Sales orders" type="bar">
+                <graph string="Sales Orders" type="bar">
                     <field name="partner_id"/>
                     <field name="amount_total" operator="+"/>
                 </graph>
@@ -79,7 +79,7 @@
             <field name="model">sale.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sales orders" colors="grey:state=='done'">
+                <tree string="Sales Orders" colors="grey:state=='done'">
                     <field name="name"/>
                     <field name="date_order"/>
                     <field name="partner_id"/>
@@ -98,7 +98,7 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales order">
+                <form string="Sales Order">
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
@@ -181,7 +181,7 @@
                                         </page>
                                     </notebook>
                                 </form>
-                                <tree string="Sales order lines">
+                                <tree string="Sales Order Lines">
                                     <field colspan="4" name="name"/>
                                     <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
@@ -344,7 +344,7 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="model">sale.order.line</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Sales order lines">
+                <graph string="Sales Order Lines">
                     <field name="product_id"/>
                     <field name="price_subtotal" operator="+"/>
                 </graph>
@@ -356,7 +356,7 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="model">sale.order.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sales order lines">
+                <tree string="Sales Order Lines">
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
@@ -517,7 +517,8 @@ to your configuration: from the sales order, from the pickings, etc.
         src_model="product.product"
         groups="base.group_extended"/>
 
-        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
+        <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"
+		groups="base.group_extended"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <!-- configartion view -->
 
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 933200d1883..057e8469431 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -54,10 +54,6 @@ class crm_make_sale(osv.osv_memory):
     def view_init(self, cr, uid, fields_list, context=None):
         if context is None:
             context = {}
-        if context.get('active_ids', False) and context['active_ids']:
-            for line in self.pool.get('crm.lead').browse(cr, uid, context['active_ids']):
-                if not line.section_id:
-                    raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.'))
         return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
 
     def makeOrder(self, cr, uid, ids, context=None):
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index ed0b9ef780e..d73a2cee1ef 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -8,12 +8,10 @@
           <field name="model">crm.make.sale</field>
           <field name="type">form</field>
           <field name="arch" type="xml">
-            <form string="Create a Sale Order" >
+            <form string="Convert to Quotation" >
                 <group colspan="4">
                     <field name="partner_id" required="1"/>
                     <field name="shop_id" required="1" widget="selection"/>
-                    <field name="analytic_account" domain="[('type','=','normal')]"
-                        groups="base.group_extended"/>
                     <field name="close"/>
                 </group>
                 <newline/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f5c4ebd41e3..ae0f712f6b5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1881,6 +1881,14 @@ class stock_move(osv.osv):
         move_obj = self.pool.get('account.move')
         if context is None:
             context = {}
+
+        todo = []
+        for move in self.browse(cr, uid, ids):
+            if move.state=="draft":
+                todo.append(move.id)
+        if todo:
+            self.action_confirm(cr, uid, todo, context=context)
+
         for move in self.browse(cr, uid, ids):
             if move.picking_id:
                 picking_ids.append(move.picking_id.id)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 84670ab514b..e0a1d61cd47 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -172,7 +172,7 @@
                             context="{'type': 'move_history_ids','field': ''}" colspan="2"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Stock Moves">
+                        <page string="Inventory Moves">
                             <field colspan="2" name="move_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -287,7 +287,7 @@
                         <page string="Revisions">
                             <field colspan="2" name="revisions" nolabel="1"/>
                         </page>
-                        <page string="Stock Moves">
+                        <page string="Inventory Moves">
                             <field colspan="2" name="move_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -348,7 +348,7 @@
         # Lot composition (history)
         #
         <record id="stock_move_tree" model="ir.ui.view">
-            <field name="name">Stock Moves</field>
+            <field name="name">Inventory Moves</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
@@ -373,7 +373,7 @@
         </record>
 
         <record id="stock_move_tree2" model="ir.ui.view">
-            <field name="name">Stock Moves</field>
+            <field name="name">Inventory Moves</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>
@@ -624,7 +624,7 @@
                     <notebook colspan="4">
                         <page string="Products">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                <tree colors="grey:scrapped == True" string="Inventory Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -660,7 +660,7 @@
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
-                                <form string="Stock Moves">
+                                <form string="Inventory Moves">
                                     <group colspan="2" col="4">
                                         <separator colspan="4" string="Move Information"/>
                                         <field name="name" invisible="1" colspan="4"/>
@@ -717,7 +717,7 @@
                             </field>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object" icon="gtk-apply"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
@@ -810,7 +810,7 @@
                     <notebook colspan="4">
                         <page string="Products">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
+                                <tree colors="grey:scrapped == True" string="Inventory Moves">
                                     <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -845,7 +845,7 @@
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
-                                <form string="Stock Moves">
+                                <form string="Inventory Moves">
                                     <group colspan="2" col="4">
                                         <separator colspan="2" string="Move Information"/>
                                         <field name="name" invisible="1" colspan="4"/>
@@ -1029,7 +1029,7 @@
                     <notebook colspan="4">
                         <page string="Products">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
-                                <tree colors="grey:scrapped==True" string="Stock Moves">
+                                <tree colors="grey:scrapped==True" string="Inventory Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
@@ -1060,7 +1060,7 @@
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
                                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                                 </tree>
-                                <form string="Stock Moves">
+                                <form string="Inventory Moves">
                                     <group colspan="2" col="4">
                                         <separator colspan="4" string="Move Information"/>
                                         <field name="name" invisible="1" colspan="4" />
@@ -1242,7 +1242,7 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}" >
-                                <tree colors="grey:scrapped==True" string="Stock Moves">
+                                <tree colors="grey:scrapped==True" string="Inventory Moves">
                                     <field name="product_id" readonly="1"/>
                                     <field name="product_qty" readonly="1"/>
                                     <field name="product_uom" string="UoM" readonly="1"/>
@@ -1271,7 +1271,7 @@
                                     <field name="location_dest_id"/>
                                     <field name="state"/>
                                 </tree>
-                                <form string="Stock Moves">
+                                <form string="Inventory Moves">
                                     <group colspan="2" col="4">
                                         <separator colspan="4" string="Move Information"/>
                                         <field name="name" invisible="1" colspan="4"/>
@@ -1516,33 +1516,35 @@
             <field name="type">form</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Stock Moves">
-                    <group colspan="2" col="4">
-                        <separator colspan="4" string="Move Information"/>
-                        <field name="name" colspan="4"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
+                <form string="Inventory Moves">
+                    <group colspan="4" col="7">
+                        <separator colspan="7" string="Move Information"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)"/>
+                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                        <field name="product_uom" string="Unit Of Measure" widget="selection"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
-                        <field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
-                        <field name="product_uos" groups="product.product_uos" colspan="4"/>
+			<newline/>
+                        <field name="name" string="Reason"/>
+                        <field name="product_uos_qty" groups="product.product_uos"/>
+                        <field name="product_uos" groups="product.product_uos"/>
+			<newline/>
+                        <field name="location_id"/>
+                        <field name="location_dest_id"/>
                     </group>
 
                     <group colspan="2" col="2">
                         <separator string="Locations &amp; Picking" colspan="2" />
-                        <field name="location_id" widget="selection"/>
-                        <field name="location_dest_id" widget="selection"/>
-                        <field name="picking_id"/>
                         <field name="address_id" context="{'contact_display':'partner'}"/>
+                        <field name="picking_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
 
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
-                        <field name="date"/>
+                        <field name="date" groups="base.group_extended"/>
                         <field name="date_planned"/>
                         <field name="date_expected"/>
                         <field name="priority"/>
@@ -1568,7 +1570,7 @@
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="4" colspan="2">
-                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
@@ -1583,7 +1585,7 @@
             <field name="type">search</field>
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
-                <search string="Stock Moves">
+                <search string="Inventory Moves">
                     <group col="14" colspan="4">
                         <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
@@ -1624,7 +1626,7 @@
         </record>
 
         <record id="action_move_form2" model="ir.actions.act_window">
-            <field name="name">Stock Moves</field>
+            <field name="name">Inventory Moves</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1673,7 +1675,7 @@
                         states="draft,assigned,confirmed,done"/>
                     <field name="date_planned"/>
                     <field name="state"/>
-                    <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                    <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes" groups="base.group_extended"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
                     <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
                 </tree>
@@ -1687,35 +1689,36 @@
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Moves">
-                    <group colspan="2" col="4">
-                        <separator colspan="4" string="Move Information"/>
-                        <field name="name" colspan="4"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)" colspan="4"/>
-                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
+                    <group colspan="4" col="7">
+                        <field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)"/>
+                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                        <field name="product_uom" widget="selection"/>
                         <button name="%(stock.move_scrap)d" groups="base.group_extended"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
                                 states="draft,waiting,confirmed,assigned" colspan="1"/>
-                        <field name="product_uom" widget="selection" colspan="4"/>
-                        <field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
-                        <field name="product_uos" widget="selection" groups="product.product_uos" colspan="4"/>
-                    </group>
-
-                    <group colspan="2" col="2">
-                        <separator string="Locations &amp; Picking" colspan="2" />
-                        <field name="location_id" widget="selection"/>
-                        <field name="location_dest_id" widget="selection"/>
-                        <field name="picking_id"/>
-                        <field name="address_id" context="{'contact_display':'partner'}"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+			<newline/>
+                        <field name="name" string="Reason"/>
+                        <field name="product_uos_qty" groups="product.product_uos"/>
+                        <field name="product_uos" widget="selection" groups="product.product_uos"/>
+			<newline/>
+                        <field name="location_id"/>
+                        <field name="location_dest_id"/>
                     </group>
 
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
-                        <field name="date"/>
+                        <field name="date" groups="base.group_extended"/>
                         <field name="date_planned"/>
                         <field name="date_expected"/>
-                        <field name="priority"/>
+                        <field name="priority" groups="base.group_extended"/>
+                    </group>
+
+                    <group colspan="2" col="2">
+                        <separator string="Locations &amp; Picking" colspan="2" />
+                        <field name="address_id" context="{'contact_display':'partner'}"/>
+                        <field name="picking_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
 
                     <group colspan="2" col="4" groups="base.group_extended">
@@ -1737,11 +1740,11 @@
                     <separator colspan="4"/>
                     <field name="state"/>
                     <group col="5" colspan="2">
-                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+                        <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
-                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                        <button name="action_done" states="draft,confirmed,assigned" string="Done" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -1753,7 +1756,7 @@
             <field name="type">search</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <search string="Stock Moves">
+                <search string="Inventory Moves">
                     <group col="8" colspan="4">
                         <filter icon="terp-go-today" string="Today" domain="[('date_planned','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date_planned','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
@@ -1790,7 +1793,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context">{"search_default_receive":1}</field>
+            <field name="context" eval="'{\'search_default_receive\':1,\'full\':1,\'default_location_dest_id\': '+str(ref('stock.stock_location_stock'))+', \'default_location_id\': '+str(ref('stock.stock_location_suppliers'))+'}'"/>
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
         </record>
 
@@ -1852,7 +1855,7 @@
         <act_window
             context="{'location': active_id, 'search_default_done': 1,'search_default_product_id': [active_id]}"
             id="act_product_stock_move_open"
-            name="Stock Moves"
+            name="Inventory Moves"
             res_model="stock.move"
             src_model="product.product"/>
 
@@ -1867,7 +1870,7 @@
             context="{'location': active_id, 'search_default_future': 1,'search_default_product_id': [active_id]}"
             domain="[('state','in',('waiting','confirmed','assigned'))]"
             id="act_product_stock_move_futur_open"
-            name="Future Stock Moves"
+            name="Future Inventory Moves"
             res_model="stock.move"
             src_model="product.product"
             groups="base.group_extended"/>
@@ -1928,7 +1931,7 @@
 
         <!--  Delivery Product Vs Planned -->
         <record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
-            <field name="name">Delivery Products</field>
+            <field name="name">Delivered Products</field>
             <field name="model">report.delivery.products.planned</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
@@ -1941,7 +1944,7 @@
         </record>
 
         <record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
-            <field name="name">Delivery Products</field>
+            <field name="name">Delivered Products</field>
             <field name="model">report.delivery.products.planned</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
@@ -1954,7 +1957,7 @@
         </record>
 
         <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-            <field name="name">Delivery Products Vs Planned</field>
+            <field name="name">Delivered Products Vs Planned</field>
             <field name="res_model">report.delivery.products.planned</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1998,7 +2001,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context">{"search_default_receive":1}</field>
+            <field name="context" eval="'{\'search_default_receive\':1,\'full\':1,\'default_location_id\': '+str(ref('stock.stock_location_stock'))+', \'default_location_dest_id\': '+str(ref('stock.stock_location_customers'))+'}'"/>
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
         </record>
 
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index a7b4271a5b2..457ddc34ff7 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <act_window name="Delivery Product"
+        <act_window name="Deliver Products"
             res_model="stock.partial.move"
             src_model="stock.move"
             view_mode="form"
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index b399576c83d..4887c1e16d8 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <record id="action_partial_picking" model="ir.actions.act_window">
-            <field name="name">Making Picking</field>
+            <field name="name">Process Picking</field>
             <field name="res_model">stock.partial.picking</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>

From fdc908b2d62ceab04b1da7274ffa94e01e2d5554 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:09:36 +0200
Subject: [PATCH 512/632] [IMP] useability improvements

bzr revid: fp@fp-laptop-20101010190936-wa3gafy2f8pt59ok
---
 addons/account/account_invoice_view.xml         | 11 ++++++-----
 addons/account_voucher/__init__.py              |  3 ++-
 addons/account_voucher/__openerp__.py           |  1 +
 addons/account_voucher/account_voucher_view.xml |  9 ---------
 addons/base_setup/base_setup_todo.xml           |  2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index cf5bff246c4..067053c3e91 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -211,9 +211,9 @@
                                 <group col="6" colspan="4">
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                 </group>
                             </group>
                         </page>
@@ -305,11 +305,10 @@
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
 
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
-                                    <button name="%(account_invoices)d" type='action' string='Print' states='open' icon="gtk-print"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
+                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                 </group>
                             </group>
                         </page>
@@ -513,6 +512,7 @@
             domain="[('account_id.reconcile', '=', True)]"
             context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}"
             id="act_account_invoice_account_move_unreconciled"
+	    groups="base.group_extended"
             name="Items to Reconcile"
             res_model="account.move.line"
             src_model="account.invoice"/>
@@ -520,7 +520,8 @@
         <act_window
             context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
             id="act_account_invoice_account_move_invoice_link"
-            name="Invoice Items "
+            name="Invoice Items"
+	    groups="base.group_extended"
             res_model="account.move.line"
             src_model="account.invoice"/>
 
diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 41f33976c53..2b1478d9fa0 100644
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -20,7 +20,8 @@
 ##############################################################################
 
 import account_voucher
+import invoice
 import report
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 59495eddc5f..683cca2442e 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -47,6 +47,7 @@
         "voucher_payment_receipt_view.xml",
         "voucher_sales_purchase_view.xml",
         "account_voucher_wizard.xml",
+        "account_voucher_pay_invoice.xml",
         "security/account_voucher_security.xml"
     ],
     "test" : [
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index b089825da9b..1ad3edd0760 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -218,14 +218,5 @@
             </field>
         </record>
 
-        <act_window
-            id="act_invoice_voucher_open"
-            name="Pay Invoice"
-            view_mode="form,tree"
-            domain="[('partner_id', '=', partner_id)]"
-            context="{'default_partner_id': partner_id, 'default_amount':residual, 'default_name':name, 'default_state': 'draft', 'invoice_type':type, 'default_type': type in ('out_invoice','out_refund') and 'receipt' or 'payment'}"
-            res_model="account.voucher"
-            src_model="account.invoice"/>
-
     </data>
 </openerp>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 9d0c41c196c..7cd0563aafe 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">always</field>
+        <field name="restart">onskip</field>
     </record>
   </data>
 </openerp>

From 9ee997e7b75c4dfac0440378999aedcd9954da84 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:15:53 +0200
Subject: [PATCH 513/632] add

bzr revid: fp@fp-laptop-20101010191553-0qrlrxx367mmsytt
---
 .../account_voucher_pay_invoice.xml           | 29 ++++++++++
 addons/account_voucher/invoice.py             | 53 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 addons/account_voucher/account_voucher_pay_invoice.xml
 create mode 100644 addons/account_voucher/invoice.py

diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
new file mode 100644
index 00000000000..f4ebf0e3eb1
--- /dev/null
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="view_invoice_customer" model="ir.ui.view">
+            <field name="name">account.invoice.customer.pay</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+            <button name="invoice_open" position="after">
+                <button name="invoice_pay_customer" type="object" string="Payment" states="open" icon="gtk-go-forward"/>
+            </button>
+            </field>
+    </record>
+
+    <record id="view_invoice_supplier" model="ir.ui.view">
+        <field name="name">account.invoice.supplier.pay</field>
+        <field name="model">account.invoice</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="account.invoice_supplier_form"/>
+        <field name="arch" type="xml">
+            <button name="invoice_open" position="after">
+                <button name="invoice_pay_customer" type="object" string="Pay Invoice" states="open" icon="gtk-go-forward"/>
+            </button>
+        </field>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
new file mode 100644
index 00000000000..694a165f354
--- /dev/null
+++ b/addons/account_voucher/invoice.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+from tools.translate import _
+
+class invoice(osv.osv):
+    _inherit = 'account.invoice'
+    def invoice_pay_customer(self, cr, uid, ids, context={}):
+        print context
+        if not ids: return []
+        inv = self.browse(cr, uid, ids[0], context=context)
+        return {
+            'name':_("Pay Invoice"),
+            'view_mode': 'form',
+            'view_id': False,
+            'view_type': 'form',
+            'res_model': 'account.voucher',
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'new',
+            'domain': '[]',
+            'context': {
+                'default_partner_id': inv.partner_id.id,
+                'default_amount': inv.residual,
+                'default_name':inv.name,
+                'close_after_process': True,
+                'invoice_type':inv.type,
+                'invoice_id':inv.id,
+                'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
+            }
+        }
+
+invoice()

From 56e1d1784b52fe7d3eab8bf5db21901d2c53d53a Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:30:31 +0200
Subject: [PATCH 514/632] fix

bzr revid: fp@fp-laptop-20101010193031-rdigl91djqkdiy9w
---
 addons/account/account_installer.xml    |  2 +-
 addons/account/account_invoice_view.xml |  2 +-
 addons/product/product.py               | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 511dcba87bb..2b736a514c3 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -38,7 +38,7 @@
                                 <field name="purchase_tax" groups="base.group_extended"/>
                             </group>
                             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-                                <separator col="4" colspan="4" string="Bank and Cost Account"/>
+                                <separator col="4" colspan="4" string="Bank and Cash Accounts"/>
                                 <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
                                     <form string="">
                                         <field name="acc_name"/>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 067053c3e91..49c3e1fa5cf 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -55,7 +55,7 @@
                     <notebook>
                         <page string="Line">
                             <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
-                            <field name="uos_id"  widget="selection" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
+                            <field name="uos_id"  on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                             <field name="quantity"/>
                             <field name="price_unit"/>
                             <field name="discount" groups="base.group_extended"/>
diff --git a/addons/product/product.py b/addons/product/product.py
index fd5d97de13a..fdf08e78d60 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -276,9 +276,12 @@ class product_template(osv.osv):
         return res and res[0] or False
 
     def _default_category(self, cr, uid, context={}):
+        print '_default_categ', context
         if 'categ_id' in context and context['categ_id']:
             return context['categ_id']
-        return False
+        md = self.pool.get('ir.model.data')
+        res = md.get_object_reference(cr, uid, 'product', 'cat0') or False
+        return res and res[1] or False
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
         if uom_id and uom_po_id:
@@ -289,15 +292,10 @@ class product_template(osv.osv):
                 return {'value': {'uom_po_id': uom_id}}
         return False
 
-    def _get_categ(self, cursor, user, context={}):
-        md = self.pool.get('ir.model.data')
-        return md._get_id(cr, uid, 'product', 'cat0') or False
-
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
         'type': lambda *a: 'product',
         'list_price': lambda *a: 1,
-        'categ_id': _get_categ,
         'cost_method': lambda *a: 'standard',
         'supply_method': lambda *a: 'buy',
         'standard_price': lambda *a: 1,

From c11bbdb64b9fb90c52fe85c256da2c880465057d Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:36:30 +0200
Subject: [PATCH 515/632] rmeoved_print

bzr revid: fp@fp-laptop-20101010193630-vowjm74h9f55ixel
---
 addons/account_voucher/invoice.py | 1 -
 addons/product/product.py         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 694a165f354..a2cf45391fb 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -26,7 +26,6 @@ from tools.translate import _
 class invoice(osv.osv):
     _inherit = 'account.invoice'
     def invoice_pay_customer(self, cr, uid, ids, context={}):
-        print context
         if not ids: return []
         inv = self.browse(cr, uid, ids[0], context=context)
         return {
diff --git a/addons/product/product.py b/addons/product/product.py
index fdf08e78d60..09732a9bff3 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -276,7 +276,6 @@ class product_template(osv.osv):
         return res and res[0] or False
 
     def _default_category(self, cr, uid, context={}):
-        print '_default_categ', context
         if 'categ_id' in context and context['categ_id']:
             return context['categ_id']
         md = self.pool.get('ir.model.data')

From b103f989dbae49ebc677569acb89552e118d50a4 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 21:48:41 +0200
Subject: [PATCH 516/632] fix

bzr revid: fp@fp-laptop-20101010194841-wcmfw8c955iqu6ng
---
 addons/account/installer.py                  | 2 --
 addons/account/partner.py                    | 5 -----
 addons/crm/report/crm_phonecall_report.py    | 3 ---
 addons/crm/wizard/crm_lead_to_opportunity.py | 2 --
 addons/crm/wizard/crm_lead_to_partner.py     | 1 -
 5 files changed, 13 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 7371012b417..60251a673ae 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -241,7 +241,6 @@ class account_installer(osv.osv_memory):
 
                 view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here?
                 view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
-                ref_acc_bank = obj_multi.bank_account_view_id
 
                 cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
                 cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id']
@@ -445,7 +444,6 @@ class account_installer(osv.osv_memory):
         # Bank Journals
         view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
         view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name?
-        ref_acc_bank = obj_multi.bank_account_view_id
 
 
         #create the properties
diff --git a/addons/account/partner.py b/addons/account/partner.py
index d32a8750c9e..8b0f1057c52 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -21,7 +21,6 @@
 from operator import itemgetter
 
 from osv import fields, osv
-import ir
 
 class account_fiscal_position(osv.osv):
     _name = 'account.fiscal.position'
@@ -102,10 +101,6 @@ class res_partner(osv.osv):
                       GROUP BY l.partner_id, a.type
                       """,
                    (tuple(ids),))
-        tinvert = {
-            'credit': 'receivable',
-            'debit': 'payable'
-        }
         maps = {'receivable':'credit', 'payable':'debit' }
         res = {}
         for id in ids:
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 9502c39ad06..0e4fb4a7df5 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -140,7 +140,4 @@ class crm_phonecall_report(osv.osv):
                 from
                     crm_phonecall c
             )""")
-
 crm_phonecall_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index c34bedf15a2..7046034afaf 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -56,7 +56,6 @@ class crm_lead2opportunity(osv.osv_memory):
 
         lead_obj = self.pool.get('crm.lead')
         data_obj = self.pool.get('ir.model.data')
-        model_obj = self.pool.get('ir.model')
 
         # Get Opportunity views
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
@@ -209,7 +208,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         
         partner_ids = self._create_partner(cr, uid, ids, context)
         mod_obj = self.pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
         value = {}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index b0b20243030..229850c6855 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -67,7 +67,6 @@ class crm_lead2partner(osv.osv_memory):
         lead_obj = self.pool.get('crm.lead')
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('active_ids', [])
         partner_id = False
 
         data = context and context.get('active_ids', []) or []

From af5b3ef4e62f1ebef04003e5c25c48b7fa1ee2b1 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Sun, 10 Oct 2010 22:04:38 +0200
Subject: [PATCH 517/632] fix

bzr revid: fp@fp-laptop-20101010200438-rvs58uh9wvpio978
---
 addons/account/account_invoice_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 49c3e1fa5cf..e72bd584f9d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,7 +146,7 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form string="Supplier invoice">
+                <form string="Supplier Invoice">
                     <group col="8" colspan="4">
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <field name="number" readonly="1"/>
@@ -449,6 +449,7 @@
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
+            <field name="name">Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>

From 9e8be15fd5887201694d9b45df04bf17834eef68 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 11 Oct 2010 04:45:33 +0000
Subject: [PATCH 518/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101011044533-mu3e6rmywz6ilyi7
---
 addons/account/i18n/de.po             |  27 +++---
 addons/account/i18n/mn.po             | 128 +++++++++++++-------------
 addons/analytic/i18n/de.po            |  10 +-
 addons/claim_from_delivery/i18n/de.po |  60 ++++++++++++
 addons/crm/i18n/nl.po                 |   8 +-
 addons/decimal_precision/i18n/de.po   |  30 +++---
 addons/hr_payroll/i18n/de.po          |  54 +++++------
 addons/marketing/i18n/ru.po           |   6 +-
 addons/marketing_campaign/i18n/ru.po  |   6 +-
 addons/purchase/i18n/de.po            |   8 +-
 addons/resource/i18n/de.po            |   9 +-
 addons/wiki_faq/i18n/de.po            |   8 +-
 addons/wiki_quality_manual/i18n/de.po |   8 +-
 addons/wiki_sale_faq/i18n/de.po       |  22 +++--
 14 files changed, 228 insertions(+), 156 deletions(-)
 create mode 100644 addons/claim_from_delivery/i18n/de.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index c31fc1b5cf8..2f8b6aad6ae 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-10 10:37+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -630,7 +630,7 @@ msgstr "(frei lassen um aktuelle Einstellung zu verwenden)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Konten Steuer Umschlüsselung"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1030,7 +1030,7 @@ msgstr "Nettosumme:"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Steuer Umschlüsselung"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1052,7 +1052,7 @@ msgstr "(Sub-)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Steuern Umschlüsselung"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1141,7 +1141,7 @@ msgstr "Neues Analytisches Konto"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Steuer Umschlüsselung Vorlagen"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1173,7 +1173,7 @@ msgstr "optionaler Betrag in anderer Währung"
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Mapping Template"
-msgstr ""
+msgstr "Steuer Umschlüsselung Vorlage"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1244,7 +1244,7 @@ msgstr "Betriebl. Währung"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Konten Steuerumschlüsselung Vorlagen"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1828,6 +1828,7 @@ msgid ""
 "The fiscal mapping will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Die Steuerumschlüsselung legt Steuern und Konten für diesen PArtner fest."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2102,7 +2103,7 @@ msgstr "Prozess Abrechnung von Kundenaufträgen"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Steuer Umschlüsselung Anmerkung:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3701,7 +3702,7 @@ msgstr "Sequenzer"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Mapping"
-msgstr ""
+msgstr "Steuerumschlüsselung Vorlage"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3808,7 +3809,7 @@ msgstr "Entwurf Rechnungen"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Mapping"
-msgstr ""
+msgstr "Steuer Umschlüsselung Vorlage"
 
 #. module: account
 #: rml:account.invoice:0
@@ -6007,7 +6008,7 @@ msgstr "Zahlungsbedingung"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Steuer Umschlüsselung"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 8103e44a07c..ae02ec22007 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 08:55+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 04:27+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4537,22 +4537,22 @@ msgstr "Төлөв байдал"
 #: model:process.node,name:account.process_node_accountingentries0
 #: model:process.node,name:account.process_node_supplieraccountingentries0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Дансны бичилт"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Авлагын данс болон төлбөр"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "General Ledger -"
-msgstr ""
+msgstr "Ерөнхий дэвтэр"
 
 #. module: account
 #: field:report.hr.timesheet.invoice.journal,quantity:0
 msgid "Quantities"
-msgstr ""
+msgstr "Тоо хэмжээ"
 
 #. module: account
 #: field:account.analytic.account,date_start:0
@@ -4579,7 +4579,7 @@ msgstr "Бичигдсэн журналын бичилтийн тоо"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Valid Entries"
-msgstr ""
+msgstr "Хүчинтэй бичилт"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_use_model
@@ -4605,7 +4605,7 @@ msgstr "Огноогоор"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr ""
+msgstr "Нийлүүлэгчид бүцааж төлөх"
 
 #. module: account
 #: help:account.model.line,date:0
@@ -4615,7 +4615,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.invoice.refund,init,modify_invoice:0
 msgid "Modify Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл засварлах"
 
 #. module: account
 #: view:res.partner:0
@@ -4699,7 +4699,7 @@ msgstr "Компани"
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Crebit"
-msgstr ""
+msgstr "Орлого"
 
 #. module: account
 #: selection:account.subscription,state:0
@@ -4733,7 +4733,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -4756,23 +4756,23 @@ msgstr ""
 #. module: account
 #: xsl:account.transfer:0
 msgid "Change"
-msgstr ""
+msgstr "Солих"
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Дүрс"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
-msgstr ""
+msgstr "Журналын мөчлөг"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,credit:0
 #: wizard_field:account.move.line.reconcile,init_partial,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Орлогын хэмжээ"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -4782,7 +4782,7 @@ msgstr "Сарын мөчлөг үүсгэх"
 #. module: account
 #: wizard_button:account.aged.trial.balance,init,print:0
 msgid "Print Aged Trial Balance"
-msgstr ""
+msgstr "Насжилтын баланс хэвлэх"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -4802,7 +4802,7 @@ msgstr "Нэхэмжлэх хаяг"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Credit"
-msgstr ""
+msgstr "Ерөнхий орлого"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -4831,7 +4831,7 @@ msgstr "Төлбөрийн огноо"
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "A/c No."
-msgstr ""
+msgstr "А/к дугаар"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
@@ -4854,17 +4854,17 @@ msgstr "Тулгагдаагүй бичилтийг нээх"
 #: field:account.bank.statement.reconcile,statement_line:0
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Банкны мэдэгдлийн мөр"
 
 #. module: account
 #: wizard_button:account.automatic.reconcile,reconcile,end:0
 msgid "OK"
-msgstr ""
+msgstr "Тийм"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Control Invoice"
-msgstr ""
+msgstr "Нэхэмжлэлийн удирдлага"
 
 #. module: account
 #: selection:account.account,type:0
@@ -4899,12 +4899,12 @@ msgstr "НӨАТ:"
 #: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Нийт:"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
-msgstr ""
+msgstr "Аналитик дансны журнал"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -5533,7 +5533,7 @@ msgstr "Тэнцэл"
 #. module: account
 #: rml:account.invoice:0
 msgid "Refund"
-msgstr ""
+msgstr "Буцааж төлөх"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -5600,7 +5600,7 @@ msgstr "Хаах"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr ""
+msgstr "Шилжүүлэх"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5649,7 +5649,7 @@ msgstr ""
 #: wizard_field:account.analytic.account.chart,init,to_date:0
 #: wizard_field:account.analytic.line,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Хүртэл"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
@@ -5669,7 +5669,7 @@ msgstr ""
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr ""
+msgstr "Хувалдан авалтын журнал"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5769,7 +5769,7 @@ msgstr "Ангилалын код"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #. module: account
 #: field:product.category,property_account_income_categ:0
@@ -5797,7 +5797,7 @@ msgstr "Дансны модел"
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
 msgid "Invoice lines"
-msgstr ""
+msgstr "Нэхэмжлэлийн мөр"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -5807,7 +5807,7 @@ msgstr "Худалдан авагч"
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr ""
+msgstr "Мөчлөгийн төрөл"
 
 #. module: account
 #: view:product.category:0
@@ -5827,7 +5827,7 @@ msgstr "Гүйлгээг эрэмбэлэх"
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr ""
+msgstr "Журнал хэвлэх"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -5840,7 +5840,7 @@ msgstr "Банкны данс"
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models Definition"
-msgstr ""
+msgstr "Модел тодорхойлох"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
@@ -5899,7 +5899,7 @@ msgstr ""
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "Бичилт"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5961,7 +5961,7 @@ msgstr "Бүтээгдэхүүний загвар дээрх зарлагын д
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Debit"
-msgstr ""
+msgstr "Ерөнхий орлого"
 
 #. module: account
 #: field:account.analytic.account,code:0
@@ -5988,12 +5988,12 @@ msgstr "Төлбөрийн нөхцөл"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Санхүүгийн зурагжуулалт"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr ""
+msgstr "Бримтын үйл явц"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
@@ -6049,12 +6049,12 @@ msgstr ""
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Аналитик данс хаах"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "Ноорог нэхэмжлэл"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -6066,33 +6066,33 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Дансны нэхэмжлэл"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Үнийн нэхэмжлэл"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "Насжилтын авлагын данс"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Нягтлан бодохын самбар"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Орлогын данс"
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "Эдийн засгийн үзүүлэлт"
 
 #. module: account
 #: view:board.board:0
@@ -6112,7 +6112,7 @@ msgstr ""
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "Бүх данс"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
@@ -6123,23 +6123,23 @@ msgstr ""
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "Мэдэгдэл"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "Санхүүгийн мөчлөг"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Санхүүгтйн тэнцэл"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "Мөчлөг сонгох"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
@@ -6202,7 +6202,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Нийт:"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@@ -6217,17 +6217,17 @@ msgstr "Мөчлөг сонгох"
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Тайлангийн сонголт"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "Харицуулахгүй"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "Дансыг харуулах"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6243,7 +6243,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Жил:"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6301,7 +6301,7 @@ msgstr ""
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Сарын хязгаарлалт"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
@@ -6316,12 +6316,12 @@ msgstr ""
 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Нийт хэмжээ"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Дансны төрлөөр"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
@@ -6331,12 +6331,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Авлагын данс"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Хязгаар"
 
 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
@@ -6346,7 +6346,7 @@ msgstr ""
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Санхүүгийн тайлан-Тайлан"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
@@ -6357,18 +6357,18 @@ msgstr ""
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Жилийн долоо хоног"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Үүсгэх огноо"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Насжилтын авлага"
 
 #. module: account
 #: view:report.invoice.created:0
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 8b1b7f71017..36f8cbaaa2d 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-08-23 06:40+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"PO-Revision-Date: 2010-10-10 10:41+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -50,7 +50,7 @@ msgstr "Definiert die zu zählende Menge"
 #. module: analytic
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Die zugeöhrige Währung, wenn abweichend von der Wirmenwährung."
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -108,7 +108,7 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Kontoart"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
new file mode 100644
index 00000000000..48352c2b978
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/de.po
@@ -0,0 +1,60 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 12:02+0000\n"
+"PO-Revision-Date: 2010-10-10 10:45+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Reklamation"
+
+#. module: claim_from_delivery
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehler in xml Ansicht."
+
+#. module: claim_from_delivery
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen haben !"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Erzeuge Reklamation von Lieferauftrag\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Reklamation von Lieferung"
+
+#. module: claim_from_delivery
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Fehler in Modul für Aktion"
+
+#. module: claim_from_delivery
+#: model:ir.model,name:claim_from_delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Packliste"
+
+#. module: claim_from_delivery
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Partner"
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 5d7e5b0856b..e21b5fdf4d9 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-09 15:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-10 08:54+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-10 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1434,7 +1434,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr "Fasen"
+msgstr "Fases"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index c4837bc8a4a..b306e019bb5 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -8,46 +8,47 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:24+0000\n"
-"PO-Revision-Date: 2010-09-19 15:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-10 10:48+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
 msgid "Digits"
-msgstr ""
+msgstr "Stellen"
 
 #. module: decimal_precision
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Fehler in xml Ansicht."
 
 #. module: decimal_precision
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen haben !"
 
 #. module: decimal_precision
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
 #. module: decimal_precision
 #: view:decimal.precision:0
 msgid "Decimal Precision"
-msgstr ""
+msgstr "Nachkommastellen"
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
 #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
 msgid "Decimal Accuracy Definitions"
-msgstr ""
+msgstr "Dezimal Genauigkeit Definition"
 
 #. module: decimal_precision
 #: model:ir.module.module,description:decimal_precision.module_meta_information
@@ -59,23 +60,28 @@ msgid ""
 "\n"
 "The decimal precision is configured per company.\n"
 msgstr ""
+"\n"
+"Dieses Module ermöglicht die Definition der Anzahl der Decimalstellen für "
+"verschiende Bereiche\n"
+"Finanz, Verkauf, EInkauf ....\n"
+"Diese Konfiguration wird je Firma eingestellt.\n"
 
 #. module: decimal_precision
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
 
 #. module: decimal_precision
 #: field:decimal.precision,name:0
 msgid "Usage"
-msgstr ""
+msgstr "Verwendung"
 
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Dezimalstellen Konfiguration"
 
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 66f14526514..0f7cee2b8d1 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -8,46 +8,46 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 13:16+0000\n"
-"PO-Revision-Date: 2010-10-05 13:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-10 11:08+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
 #: rml:employees.salary:0
 msgid "E-mail Address"
-msgstr ""
+msgstr "E-Mail Addresse"
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "(Based on type Payroll will calculate basic salary)"
-msgstr ""
+msgstr "(anhängig vom Typ wird der Grundgehalt berechnet)"
 
 #. module: hr_payroll
 #: field:hr.payroll.register,net:0
 #: field:hr.payslip,net:0
 msgid "Net Salary"
-msgstr ""
+msgstr "Netto Lohn"
 
 #. module: hr_payroll
 #: field:hr.payslip,working_days:0
 msgid "Working Days"
-msgstr ""
+msgstr "Arbeitstage"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "New Slip"
-msgstr ""
+msgstr "Neue Abrechnung"
 
 #. module: hr_payroll
 #: rml:payroll.advice:0
 msgid "Axis Bank"
-msgstr ""
+msgstr "Axis Bank"
 
 #. module: hr_payroll
 #: field:hr.employee,esp_account:0
@@ -57,7 +57,7 @@ msgstr ""
 #. module: hr_payroll
 #: help:hr.employee,analytic_account:0
 msgid "Analytic Account for Salary Analysis"
-msgstr ""
+msgstr "Analytishes Konto für Personalkosten Analyse"
 
 #. module: hr_payroll
 #: rml:employees.salary:0
@@ -67,18 +67,18 @@ msgstr ""
 #. module: hr_payroll
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
 #. module: hr_payroll
 #: rml:employees.salary:0
 #: rml:salary.structure:0
 msgid "Department"
-msgstr ""
+msgstr "Abteilung"
 
 #. module: hr_payroll
 #: rml:employees.salary:0
 msgid "Deductions:"
-msgstr ""
+msgstr "Abzüge:"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,gratuity:0
@@ -88,28 +88,28 @@ msgstr ""
 #. module: hr_payroll
 #: rml:payslip.pdf:0
 msgid "Employee No"
-msgstr ""
+msgstr "Mitarbetier Nr."
 
 #. module: hr_payroll
 #: rml:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
-msgstr ""
+msgstr "Bezüge Auszahlungsevidenz"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Paid ? "
-msgstr ""
+msgstr "Bezahlt "
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
 msgid "Year Salary Report"
-msgstr ""
+msgstr "Jährliches Lohnkonto"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Paid Salary"
-msgstr ""
+msgstr "Bezahlter Lohn"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,flag:0
@@ -121,7 +121,7 @@ msgstr ""
 #: field:hr.payslip,company_id:0
 #: wizard_field:payroll.analysis,init,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Unternehmen"
 
 #. module: hr_payroll
 #: help:hr.employee,employee_account:0
@@ -131,48 +131,48 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Letter Details"
-msgstr ""
+msgstr "Brief Details"
 
 #. module: hr_payroll
 #: rml:hr.payroll.register.sheet:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Setze auf Entwurf"
 
 #. module: hr_payroll
 #: rml:payroll.advice:0
 msgid "The Manager"
-msgstr ""
+msgstr "Der Vorgesetzte"
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Half-Pay Holiday"
-msgstr ""
+msgstr "Teilvergüteter (50%) Feiertag"
 
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
-msgstr ""
+msgstr "Andere"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,slip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
 #: rml:payslip.pdf:0
 msgid "Pay Slip"
-msgstr ""
+msgstr "Lohnzettel"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Calculations Rules"
-msgstr ""
+msgstr "Rechenregeln"
 
 #. module: hr_payroll
 #: model:ir.module.module,description:hr_payroll.module_meta_information
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
index 2ec46996a11..e0e0b256623 100644
--- a/addons/marketing/i18n/ru.po
+++ b/addons/marketing/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 07:04+0000\n"
-"PO-Revision-Date: 2010-10-09 18:11+0000\n"
-"Last-Translator: Anatoly Rudnev <Unknown>\n"
+"PO-Revision-Date: 2010-10-10 07:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
index 3806439682b..bbcc17a7e60 100644
--- a/addons/marketing_campaign/i18n/ru.po
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 07:09+0000\n"
-"PO-Revision-Date: 2010-10-09 18:35+0000\n"
-"Last-Translator: Anatoly Rudnev <Unknown>\n"
+"PO-Revision-Date: 2010-10-10 07:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-10 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 7f2b499bf51..32a041b8393 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:22+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"PO-Revision-Date: 2010-10-10 10:52+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -948,4 +948,4 @@ msgstr "In Bearbeitung"
 #: code:addons/purchase/purchase.py:0
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
-msgstr ""
+msgstr "Einkaufsaufträge mit dem Status %s können nicht gelöscht werden"
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 951474e7385..60a08660213 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-08-23 06:41+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"PO-Revision-Date: 2010-10-10 10:52+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -212,6 +212,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Wenn das Aktiv Feld auf Falsch gesetzt wird, wird die Ressource versteckt "
+"ohne sie zu löschen"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -243,6 +245,7 @@ msgstr "Ressourcen Kalender"
 #: help:resource.resource,user_id:0
 msgid "Related user name for the resource to manage its access."
 msgstr ""
+"Der mit der Ressource verbunden Benutzer für die Zugriffsberechtigung"
 
 #. module: resource
 #: help:resource.resource,calendar_id:0
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
index bacf06ac713..24579de9728 100644
--- a/addons/wiki_faq/i18n/de.po
+++ b/addons/wiki_faq/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 11:42+0000\n"
-"PO-Revision-Date: 2010-10-05 13:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-10 10:53+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq
@@ -27,4 +27,4 @@ msgstr ""
 #. module: wiki_faq
 #: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
 msgid "Document Management - Wiki - FAQ"
-msgstr ""
+msgstr "Dokument Management - Wiki - F&A"
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
index 64a35b43a8e..c0925029a28 100644
--- a/addons/wiki_quality_manual/i18n/de.po
+++ b/addons/wiki_quality_manual/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 11:48+0000\n"
-"PO-Revision-Date: 2010-10-05 13:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-10 10:54+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual
@@ -27,4 +27,4 @@ msgstr ""
 #. module: wiki_quality_manual
 #: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
 msgid "Document Management - Wiki - Quality Manual"
-msgstr ""
+msgstr "Dokument Management - Wiki - Qualitätssicherungs Handbuch"
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index 8d74476d08f..bb66a8e23a4 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 11:54+0000\n"
-"PO-Revision-Date: 2010-10-05 13:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-10 10:55+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq
@@ -22,27 +22,27 @@ msgstr ""
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
 msgid "Documents"
-msgstr ""
+msgstr "Dokumente"
 
 #. module: wiki_sale_faq
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
 
 #. module: wiki_sale_faq
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
 
 #. module: wiki_sale_faq
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
 msgid "FAQ"
-msgstr ""
+msgstr "Häufig gestellte Fragen"
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
 msgid "Wiki Pages"
-msgstr ""
+msgstr "Wiki Seiten"
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,description:wiki_sale_faq.module_meta_information
@@ -50,13 +50,15 @@ msgid ""
 "This module provides a wiki FAQ Template\n"
 "    "
 msgstr ""
+"Dieses Modul bitete eine Wiki F&A Vorlage\n"
+"    "
 
 #. module: wiki_sale_faq
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
 msgid "Wiki -Sale - FAQ"
-msgstr ""
+msgstr "Wiki -Verkauf - F&A"

From 576cd19e3bf314e669e5c9f02724e92d519ab557 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 11 Oct 2010 11:11:24 +0530
Subject: [PATCH 519/632] [FIX] Account : Typo fix

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

bzr revid: jvo@tinyerp.com-20101011054124-5rh9fyid8dq7jq13
---
 addons/account/project/report/analytic_journal.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/report/analytic_journal.rml b/addons/account/project/report/analytic_journal.rml
index 7b55c6ad212..47775ea9253 100644
--- a/addons/account/project/report/analytic_journal.rml
+++ b/addons/account/project/report/analytic_journal.rml
@@ -280,7 +280,7 @@
               <para style="terp_default_9">[[ move_a.code ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ move_a.name ]] asgfas</para>
+              <para style="terp_default_9">[[ move_a.name ]] </para>
             </td>
             <td>
               <para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>

From 10a1939f6903f86b78a948529cde740bf53892eb Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Mon, 11 Oct 2010 11:15:00 +0530
Subject: [PATCH 520/632] [FIx] Hr_payroll_account : Typo fix

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

bzr revid: jvo@tinyerp.com-20101011054500-r6aw3313kxubxkn1
---
 addons/hr_payroll_account/__openerp__.py        | 2 +-
 addons/hr_payroll_account/hr_payroll_account.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 8cdfe0593e4..5dec5dc4fb8 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Human Resources',
     'description': """Generic Payroll system Integrated with Accountings
-    * Expanse Encoding
+    * Expense Encoding
     * Payment Encoding
     * Company Contribution Management
     """,
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index f5a6897bf1d..87b76895e1a 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -162,7 +162,7 @@ class hr_payslip(osv.osv):
             for line in slip.line_ids:
                 if line.type == 'otherpay' and line.expanse_id.invoice_id:
                     if not line.expanse_id.invoice_id.move_id:
-                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
+                        raise osv.except_osv(_('Warning !'), _('Please Confirm all Expense Invoice appear for Reimbursement'))
                     invids = [line.expanse_id.invoice_id.id]
                     amount = line.total
                     acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
@@ -487,7 +487,7 @@ class account_move_link_slip(osv.osv):
     _description = 'Account Move Link to Pay Slip'
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=False),
-        'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
+        'move_id':fields.many2one('account.move', 'Expense Entries', required=False, readonly=True),
         'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
         'sequence': fields.integer('Sequence'),
     }

From 685489a172033e4a53a2ff76854646f777f48e9d Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 11 Oct 2010 11:21:53 +0530
Subject: [PATCH 521/632] [REF] account

bzr revid: vth@tinyerp.com-20101011055153-h8hygvtjqkxc8004
---
 addons/account/account.py                     |  2 +-
 addons/account/account_move_line.py           | 14 +++++-----
 addons/account/invoice.py                     | 26 +++++++++----------
 addons/account/partner.py                     |  6 ++---
 addons/account/project/report/cost_ledger.py  |  4 +--
 .../project/report/quantity_cost_ledger.py    |  2 +-
 addons/account/report/account_balance.py      |  2 +-
 .../report/account_balance_landscape.py       |  4 +--
 .../account/report/account_central_journal.py |  2 +-
 .../account/report/account_entries_report.py  |  2 +-
 .../account/report/account_general_ledger.py  |  6 ++---
 addons/account/report/account_journal.py      |  8 +++---
 .../account/report/account_partner_balance.py |  6 ++---
 .../account/report/account_print_overdue.py   | 16 ++++++------
 addons/account/report/rml_parse.py            |  8 +++---
 addons/account/sequence.py                    |  4 +--
 .../account/wizard/account_change_currency.py |  4 +--
 .../wizard/account_fiscalyear_close.py        |  4 +--
 addons/account/wizard/account_move_journal.py |  2 +-
 addons/project/project.py                     | 10 +++----
 20 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 9176a2eec64..8ff9d35086e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2722,7 +2722,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
-        data = obj_pool.browse(cr, uid, data_id[0])
+        data = obj_data.browse(cr, uid, data_id[0])
         view_id_cash = data.res_id
 
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index ba6f4110ec1..d9b78795998 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -349,7 +349,7 @@ class account_move_line(osv.osv):
         return res
 
     def name_get(self, cr, uid, ids, context={}):
-        if not len(ids):
+        if not ids:
             return []
         result = []
         for line in self.browse(cr, uid, ids, context):
@@ -363,18 +363,18 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
 
-        if not len(args):
+        if not args:
             return []
         where = ' and '.join(map(lambda x: '(abs(sum(debit-credit))'+x[1]+str(x[2])+')',args))
         cursor.execute('select id, sum(debit-credit) from account_move_line \
                      group by id, debit, credit having '+where)
         res = cursor.fetchall()
-        if not len(res):
+        if not res:
             return [('id', '=', '0')]
         return [('id', 'in', [x[0] for x in res])]
 
     def _invoice_search(self, cursor, user, obj, name, args, context):
-        if not len(args):
+        if not args:
             return []
         invoice_obj = self.pool.get('account.invoice')
 
@@ -407,7 +407,7 @@ class account_move_line(osv.osv):
                     qu2 += x[2]
                 else:
                     qu1.append(' (False)')
-        if len(qu1):
+        if qu1:
             qu1 = ' AND' + ' AND'.join(qu1)
         else:
             qu1 = ''
@@ -415,7 +415,7 @@ class account_move_line(osv.osv):
                 'FROM account_move_line l, account_invoice i ' \
                 'WHERE l.move_id = i.move_id ' + qu1, qu2)
         res = cursor.fetchall()
-        if not len(res):
+        if not res:
             return [('id', '=', '0')]
         return [('id', 'in', [x[0] for x in res])]
 
@@ -989,7 +989,7 @@ class account_move_line(osv.osv):
         part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
         unlink_ids += rec_ids
         unlink_ids += part_rec_ids
-        if len(unlink_ids):
+        if unlink_ids:
             obj_move_rec.unlink(cr, uid, unlink_ids)
         return True
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 79978c0bbaf..36b1c38d5f3 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -302,7 +302,7 @@ class account_invoice(osv.osv):
             }, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
-        'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
+        'move_lines':fields.function(_get_lines, method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
         'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
@@ -585,7 +585,7 @@ class account_invoice(osv.osv):
             else:
                 val['currency_id'] = company.currency_id.id
 
-        return {'value' : val, 'domain': dom }
+        return {'value': val, 'domain': dom }
 
     # go from canceled state to draft state
     def action_cancel_draft(self, cr, uid, ids, *args):
@@ -898,7 +898,7 @@ class account_invoice(osv.osv):
                     'name': name,
                     'price': total,
                     'account_id': acc_id,
-                    'date_maturity' : inv.date_due or False,
+                    'date_maturity': inv.date_due or False,
                     'amount_currency': diff_currency_p \
                             and total_currency or False,
                     'currency_id': diff_currency_p \
@@ -909,7 +909,7 @@ class account_invoice(osv.osv):
             date = inv.date_invoice or time.strftime('%Y-%m-%d')
             part = inv.partner_id.id
 
-            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context={})) ,iml)
+            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context={})),iml)
 
             line = self.group_lines(cr, uid, iml, line, inv)
 
@@ -932,7 +932,7 @@ class account_invoice(osv.osv):
             period_id = inv.period_id and inv.period_id.id or False
             if not period_id:
                 period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))])
-                if len(period_ids):
+                if period_ids:
                     period_id = period_ids[0]
             if period_id:
                 move['period_id'] = period_id
@@ -1018,7 +1018,7 @@ class account_invoice(osv.osv):
                 account_move_obj.unlink(cr, uid, [i['move_id'][0]])
             if i['payment_ids']:
                 account_move_line_obj = self.pool.get('account.move.line')
-                pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
+                pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
                 for move_line in pay_ids:
                     if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
                         raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
@@ -1043,7 +1043,7 @@ class account_invoice(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
         types = {
                 'out_invoice': 'CI: ',
@@ -1103,7 +1103,7 @@ class account_invoice(osv.osv):
             else:
                 refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')])
 
-            if not date :
+            if not date:
                 date = time.strftime('%Y-%m-%d')
             invoice.update({
                 'type': type_dict[invoice['type']],
@@ -1114,11 +1114,11 @@ class account_invoice(osv.osv):
                 'tax_line': tax_lines,
                 'journal_id': refund_journal_ids
             })
-            if period_id :
+            if period_id:
                 invoice.update({
                     'period_id': period_id,
                 })
-            if description :
+            if description:
                 invoice.update({
                     'name': description,
                 })
@@ -1406,7 +1406,7 @@ class account_invoice_line(osv.osv):
         result['uos_id'] = res.uom_id.id or uom or False
         if result['uos_id']:
             res2 = res.uom_id.category_id.id
-            if res2 :
+            if res2:
                 domain = {'uos_id':[('category_id','=',res2 )]}
 
         result['categ_id'] = res.categ_id.id
@@ -1537,8 +1537,8 @@ class account_invoice_tax(osv.osv):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
         'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
-        'factor_base' : fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
-        'factor_tax' : fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
+        'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
+        'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
     }
 
     def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False):
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 536976d1e39..61f722bc462 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -52,7 +52,7 @@ class account_fiscal_position(osv.osv):
         return result
 
     def map_account(self, cr, uid, fposition_id, account_id, context={}):
-        if not fposition_id :
+        if not fposition_id:
             return account_id
         for pos in fposition_id.account_ids:
             if pos.account_src_id.id == account_id:
@@ -116,7 +116,7 @@ class res_partner(osv.osv):
         return res
 
     def _asset_difference_search(self, cr, uid, obj, name, type, args, context=None):
-        if not len(args):
+        if not args:
             return []
         having_values = tuple(map(itemgetter(2), args))
         where = ' AND '.join(
@@ -133,7 +133,7 @@ class res_partner(osv.osv):
                     'GROUP BY partner_id HAVING '+where),
                    (type,) + having_values)
         res = cr.fetchall()
-        if not len(res):
+        if not res:
             return [('id','=','0')]
         return [('id','in',map(itemgetter(0), res))]
 
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index c711eeb2b30..225a85d2ee1 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -91,14 +91,14 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
 
     def _sum_debit(self, accounts, date1, date2):
         ids = map(lambda x: x.id, accounts)
-        if not len(ids):
+        if not ids:
             return 0.0
         self.cr.execute("SELECT sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount>0", (tuple(ids), date1, date2,))
         return self.cr.fetchone()[0] or 0.0
 
     def _sum_credit(self, accounts, date1, date2):
         ids = map(lambda x: x.id, accounts)
-        if not len(ids):
+        if not ids:
             return 0.0
         self.cr.execute("SELECT -sum(amount) FROM account_analytic_line WHERE account_id IN %s AND date>=%s AND date<=%s AND amount<0", (tuple(ids),date1, date2,))
         return self.cr.fetchone()[0] or 0.0
diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py
index c593d05566e..4d874fe50ee 100644
--- a/addons/account/project/report/quantity_cost_ledger.py
+++ b/addons/account/project/report/quantity_cost_ledger.py
@@ -102,7 +102,7 @@ class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
 
     def _sum_quantity(self, accounts, date1, date2, journals):
         ids = map(lambda x: x.id, accounts)
-        if not len(ids):
+        if not ids:
             return 0.0
         if not journals:
             self.cr.execute("SELECT sum(unit_amount) \
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 236433819c5..5a6c7700b9d 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -86,7 +86,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
                 self.sum_debit += account_rec['debit']
                 self.sum_credit += account_rec['credit']
                 if disp_acc == 'bal_movement':
-                    if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 :
+                    if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0:
                         self.result_acc.append(res)
                 elif disp_acc == 'bal_solde':
                     if  res['balance'] != 0:
diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py
index 04f7cc8ec7f..6ec7ec7c10e 100644
--- a/addons/account/report/account_balance_landscape.py
+++ b/addons/account/report/account_balance_landscape.py
@@ -139,7 +139,7 @@ class account_balance_landscape(rml_parse.rml_parse):
             ctx['state'] = form['context'].get('state','all')
             tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
 
-            if len(tmp):
+            if tmp:
                 accounts.append(tmp)
 
         merged_accounts=zip(*accounts)
@@ -198,7 +198,7 @@ class account_balance_landscape(rml_parse.rml_parse):
             ctx['state'] = form['context'].get('state','all')
             tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy())
 
-            if len(tmp1):
+            if tmp1:
                 accounts.append(tmp1)
 
         if level==1:   #if parent is called,done is not empty when called again.
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index bf5164253cc..d3693ecb152 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -71,7 +71,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
-        self.cr.execute('SELECT a.currency_id ,a.code, a.name, c.code AS currency_code,l.currency_id ,l.amount_currency ,SUM(debit) AS debit, SUM(credit) AS credit  \
+        self.cr.execute('SELECT a.currency_id ,a.code, a.name, c.code AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit  \
                         from account_move_line l  \
                         LEFT JOIN account_move am ON (l.move_id=am.id) \
                         LEFT JOIN account_account a ON (l.account_id=a.id) \
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index ae0b3e47b04..942ca8c4fb8 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -55,7 +55,7 @@ class account_entries_report(osv.osv):
         'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True),
         'reconcile_id': fields.many2one('account.move.reconcile', readonly=True),
         'partner_id': fields.many2one('res.partner','Partner', readonly=True),
-        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
         'quantity': fields.float('Products Quantity', digits=(16,2), readonly=True),
         'user_type': fields.many2one('account.account.type', 'Account Type', readonly=True),
         'type': fields.selection([
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index f3ec97a592e..b0e3d7a85d9 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -117,15 +117,15 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             sold_account = self._sum_balance_account(child_account)
             self.sold_accounts[child_account.id] = sold_account
             if self.display_account == 'bal_movement':
-                if child_account.type != 'view' and num_entry <> 0 :
+                if child_account.type != 'view' and num_entry <> 0:
                     res.append(child_account)
             elif self.display_account == 'bal_solde':
-                if child_account.type != 'view' and num_entry <> 0 :
+                if child_account.type != 'view' and num_entry <> 0:
                     if ( sold_account <> 0.0):
                         res.append(child_account)
             else:
                 res.append(child_account)
-        if not len(res):
+        if not res:
             return [account]
         return res
 
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 4f6ad99792d..ab7b6211064 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -84,7 +84,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         if self.target_move == 'posted':
             move_state = ['posted']
 
-        self.cr.execute('SELECT SUM(debit) FROM account_move_line l , account_move am '
+        self.cr.execute('SELECT SUM(debit) FROM account_move_line l, account_move am '
                         'WHERE l.move_id=am.id AND am.state IN %s AND l.period_id IN %s AND l.journal_id IN %s ' + self.query_get_clause + ' ',
                         (tuple(move_state), tuple(period_id), tuple(journal_id)))
         return self.cr.fetchone()[0] or 0.0
@@ -121,7 +121,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         if self.target_move == 'posted':
             move_state = ['posted']
 
-        self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + '' ,(tuple(move_state), period_id, tuple(journal_id) ))
+        self.cr.execute('SELECT l.id FROM account_move_line l, account_move am WHERE l.move_id=am.id AND am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' ORDER BY l.'+ self.sort_selection + '',(tuple(move_state), period_id, tuple(journal_id) ))
         ids = map(lambda x: x[0], self.cr.fetchall())
         return obj_mline.browse(self.cr, self.uid, ids)
 
@@ -138,12 +138,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
     def _get_fiscalyear(self, data):
         if data['model'] == 'account.journal.period':
             return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).fiscalyear_id.name
-        return super(journal_print ,self)._get_fiscalyear(data)
+        return super(journal_print, self)._get_fiscalyear(data)
 
     def _get_account(self, data):
         if data['model'] == 'account.journal.period':
             return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name
-        return super(journal_print ,self)._get_account(data)
+        return super(journal_print, self)._get_account(data)
 
     def _display_currency(self, data):
         if data['model'] == 'account.journal.period':
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index 06baa4639eb..c17de597e1c 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -83,7 +83,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         full_account = []
         result_tmp = 0.0
         self.cr.execute(
-            "SELECT p.ref,l.account_id,ac.name AS account_name,ac.code AS code ,p.name, sum(debit) AS debit, sum(credit) AS credit, " \
+            "SELECT p.ref,l.account_id,ac.name AS account_name,ac.code AS code,p.name, sum(debit) AS debit, sum(credit) AS credit, " \
                     "CASE WHEN sum(debit) > sum(credit) " \
                         "THEN sum(debit) - sum(credit) " \
                         "ELSE 0 " \
@@ -254,7 +254,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
                 "JOIN account_move am ON (am.id = l.move_id)" \
                 "WHERE l.account_id IN %s"  \
                     "AND am.state IN %s" \
-                    "AND " + self.query + "" ,
+                    "AND " + self.query + "",
                     (tuple(self.account_ids), tuple(move_state)))
         temp_res = float(self.cr.fetchone()[0] or 0.0)
         return temp_res
@@ -273,7 +273,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
                 "JOIN account_move am ON (am.id = l.move_id)" \
                 "WHERE l.account_id IN %s" \
                     "AND am.state IN %s" \
-                    "AND " + self.query + "" ,
+                    "AND " + self.query + "",
                     (tuple(self.account_ids), tuple(move_state)))
         temp_res = float(self.cr.fetchone()[0] or 0.0)
         return temp_res
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index c59dd56a02f..3e1f0b54de1 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -30,11 +30,11 @@ class Overdue(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(Overdue, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
-            'time' : time,
-            'adr_get' : self._adr_get,
-            'getLines' : self._lines_get,
-            'tel_get' : self._tel_get,
-            'message' : self._message,
+            'time': time,
+            'adr_get': self._adr_get,
+            'getLines': self._lines_get,
+            'tel_get': self._tel_get,
+            'message': self._message,
         })
         self.context = context
     def _adr_get(self, partner, type):
@@ -47,10 +47,10 @@ class Overdue(report_sxw.rml_parse):
                   'name': False,
                   'street': False,
                   'street2': False,
-                  'city' : False,
-                  'zip' : False,
+                  'city': False,
+                  'zip': False,
                   'state_id':False,
-                  'country_id' : False,
+                  'country_id': False,
                  }
         if adr_id:
             result = res_partner_address.read(self.cr, self.uid, [adr_id], context=self.context.copy())
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
index 0c7018ae290..1d3cc629cfa 100644
--- a/addons/account/report/rml_parse.py
+++ b/addons/account/report/rml_parse.py
@@ -34,17 +34,17 @@ class rml_parse(report_sxw.rml_parse):
         self.localcontext.update({
             'comma_me': self.comma_me,
             'format_date': self._get_and_change_date_format_for_swiss,
-            'strip_name' : self._strip_name,
-            'explode_name' : self._explode_name,
+            'strip_name': self._strip_name,
+            'explode_name': self._explode_name,
         })
 
     def comma_me(self,amount):
         #print "#" + str(amount) + "#"
         if not amount:
             amount = 0.0
-        if  type(amount) is float :
+        if  type(amount) is float:
             amount = str('%.2f'%amount)
-        else :
+        else:
             amount = str(amount)
         if (amount == '0'):
              return ' '
diff --git a/addons/account/sequence.py b/addons/account/sequence.py
index b75e7f3e34e..52c1f5df8c4 100644
--- a/addons/account/sequence.py
+++ b/addons/account/sequence.py
@@ -43,13 +43,13 @@ ir_sequence_fiscalyear()
 class ir_sequence(osv.osv):
     _inherit = 'ir.sequence'
     _columns = {
-        'fiscal_ids' : fields.one2many('account.sequence.fiscalyear',
+        'fiscal_ids': fields.one2many('account.sequence.fiscalyear',
             'sequence_main_id', 'Sequences')
     }
     def get_id(self, cr, uid, sequence_id, test='id', context=None):
         if context is None:
             context = {}
-        cr.execute('select id from ir_sequence where ' 
+        cr.execute('select id from ir_sequence where '
                    + test + '=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index 9355691369e..ebc11e1dabf 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -71,8 +71,8 @@ class account_change_currency(osv.osv_memory):
                 if old_rate <= 0:
                     raise osv.except_osv(_('Error'), _('Current currency is not confirured properly !'))
                 new_price = (line.price_unit / old_rate ) * rate
-            obj_inv_line.write(cr, uid, [line.id], {'price_unit' : new_price})
-        obj_inv.write(cr, uid, [invoice.id], {'currency_id' : new_currency}, context=context)
+            obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
+        obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
         return {}
 
 account_change_currency()
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index d6d3b67c10e..e3d115ae30a 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -65,9 +65,9 @@ class account_fiscalyear_close(osv.osv_memory):
             context = {}
         fy_id = data[0]['fy_id']
 
-        cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)" , (str(data[0]['fy2_id']),))
+        cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0]['fy2_id']),))
         fy_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
-        cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)" , (str(fy_id),))
+        cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),))
         fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
 
         period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context)
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index c03176a0536..fc0953b93fa 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -33,7 +33,7 @@ class account_move_journal(osv.osv_memory):
         """
         ids = self.pool.get('account.period').find(cr, uid, context=context)
         period_id = False
-        if len(ids):
+        if ids:
             period_id = ids[0]
         return period_id
 
diff --git a/addons/project/project.py b/addons/project/project.py
index 27bbb2f8c7f..c0f9be5394e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -315,7 +315,7 @@ class project(osv.osv):
             if child_ids:
                 self.setActive(cr, uid, child_ids, value, context=None)
         return True
-    
+
 project()
 
 class users(osv.osv):
@@ -418,7 +418,7 @@ class task(osv.osv):
         'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
-        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
+        'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage',),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
@@ -526,7 +526,7 @@ class task(osv.osv):
         if not project_id: return False
         task = self.browse(cr, uid, project_id, context=context)
         project = task.project_id
-        res = self.do_close(cr, uid, [project_id], context=context) 
+        res = self.do_close(cr, uid, [project_id], context=context)
         if project.warn_manager or project.warn_customer:
            return {
                 'name': _('Send Email after close task'),
@@ -537,7 +537,7 @@ class task(osv.osv):
                 'target': 'new',
                 'nodestroy': True,
                 'context': {'active_id': task.id}
-           } 
+           }
         return res
 
     def do_close(self, cr, uid, ids, context=None):
@@ -678,7 +678,7 @@ class task(osv.osv):
             if types:
                 if not typeid:
                     self.write(cr, uid, task.id, {'type_id': types[0]})
-                elif typeid and typeid in types and types.index(typeid) != len(types)-1 :
+                elif typeid and typeid in types and types.index(typeid) != len(types)-1:
                     index = types.index(typeid)
                     self.write(cr, uid, task.id, {'type_id': types[index+1]})
         return True

From 1b852f4de3a92c43a339116b2899cf9a1bcc73f0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 11 Oct 2010 11:25:09 +0530
Subject: [PATCH 522/632] [Fix]account_accountant : Fix the warining of pylint

bzr revid: sbh@tinyerp.com-20101011055509-j8bzy46nvuksp6p8
---
 addons/account_accountant/security/account_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index 9daabddfef8..4aceb12d266 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="base.user_admin" model="res.users">
-            <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+            <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
     </data>

From d10e1e83afdc3ca4300dd23c6b482337cce7d932 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 11 Oct 2010 11:33:40 +0530
Subject: [PATCH 523/632] [REF] cleaning code of account

bzr revid: ara@tinyerp.com-20101011060340-v55iqbqk378atwnq
---
 addons/account/account_analytic_line.py       | 14 ++++++------
 addons/account/account_cash_statement.py      |  2 +-
 .../report/account_aged_partner_balance.py    | 22 +++++++++----------
 .../report/account_analytic_entries_report.py |  2 +-
 .../account/report/account_central_journal.py |  7 +++---
 .../wizard/account_automatic_reconcile.py     |  2 +-
 .../account/wizard/account_invoice_refund.py  | 22 +++++++++----------
 .../wizard/account_move_line_select.py        |  4 ++--
 addons/account/wizard/account_reconcile.py    |  8 +++----
 addons/account/wizard/account_unreconcile.py  |  2 +-
 10 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index bb13f1a5776..de4948f0bd1 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -31,12 +31,12 @@ class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
     _description = 'Analytic Line'
     _columns = {
-        'product_uom_id' : fields.many2one('product.uom', 'UoM'),
-        'product_id' : fields.many2one('product.product', 'Product'),
-        'general_account_id' : fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
-        'move_id' : fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
-        'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
-        'code' : fields.char('Code', size=8),
+        'product_uom_id': fields.many2one('product.uom', 'UoM'),
+        'product_id': fields.many2one('product.product', 'Product'),
+        'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
+        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
+        'code': fields.char('Code', size=8),
         'ref': fields.char('Ref.', size=64),
         'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
         'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
@@ -88,7 +88,7 @@ class account_analytic_line(osv.osv):
             company_id = j_id.company_id.id
         result = 0.0
         is_purchase = False
-        
+
         if j_id.type <> 'sale':
             a = prod.product_tmpl_id.property_account_expense.id
             if not a:
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 86690b204b9..445072605ed 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -229,7 +229,7 @@ class account_cash_statement(osv.osv):
         'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
-        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then / , its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
+        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
         'user_id':fields.many2one('res.users', 'Responsible', required=False),
     }
     _defaults = {
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 5a1b8ac868b..b15fab65c63 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -71,7 +71,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                     OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND (l.partner_id=res_partner.id)\
                     AND ' + self.query + ' \
-                ORDER BY res_partner.name' , (self.date_from,))
+                ORDER BY res_partner.name', (self.date_from,))
         partners = self.cr.dictfetchall()
         ## mise a 0 du total
         for i in range(7):
@@ -95,7 +95,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                     OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND ' + self.query + '\
                     AND account_account.active\
-                    GROUP BY partner_id ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
+                    GROUP BY partner_id ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids), self.date_from))
         t = self.cr.fetchall()
         for i in t:
             totals[i[0]] = i[1]
@@ -130,7 +130,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                         OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
                         AND account_account.active\
-                        GROUP BY l.partner_id' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from))
+                        GROUP BY l.partner_id', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, tuple(partner_ids), self.date_from))
             t = self.cr.fetchall()
             for i in t:
                 future_past[i[0]] = i[1]
@@ -139,7 +139,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
         # Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
         history = []
         for i in range(5):
-            args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids) ,self.date_from,)
+            args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids),self.date_from,)
             dates_query = '(COALESCE(l.date_maturity,l.date)'
             if form[str(i)]['start'] and form[str(i)]['stop']:
                 dates_query += ' BETWEEN %s AND %s)'
@@ -152,7 +152,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                 args_list += (form[str(i)]['stop'],)
 
             self.cr.execute('SELECT l.partner_id, SUM(l.debit-l.credit)\
-                    FROM account_move_line AS l, account_account , account_move am \
+                    FROM account_move_line AS l, account_account, account_move am \
                     WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
                         AND (am.state IN %s)\
                         AND (account_account.type IN %s)\
@@ -162,7 +162,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                         AND '+ self.query + '\
                         AND account_account.active\
                         AND ' + dates_query + '\
-                    GROUP BY l.partner_id' , args_list)
+                    GROUP BY l.partner_id', args_list)
             t = self.cr.fetchall()
             d = {}
             for i in t:
@@ -227,7 +227,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
             self.total_account.append(0)
         totals = {}
         self.cr.execute('SELECT SUM(l.debit-l.credit) \
-                    FROM account_move_line AS l, account_account , account_move am \
+                    FROM account_move_line AS l, account_account, account_move am \
                     WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
                     AND (am.state IN %s)\
                     AND (l.partner_id IS NULL)\
@@ -235,7 +235,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                     AND ((l.reconcile_id IS NULL) \
                     OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND ' + self.query + '\
-                    AND account_account.active ' ,(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from))
+                    AND account_account.active ',(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from))
         t = self.cr.fetchall()
         for i in t:
             totals['Unknown Partner'] = i[0]
@@ -266,7 +266,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                         AND ((l.reconcile_id IS NULL)\
                         OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                         AND '+ self.query + '\
-                        AND account_account.active ' , (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
+                        AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
             t = self.cr.fetchall()
             for i in t:
                 future_past['Unknown Partner'] = i[0]
@@ -286,7 +286,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                 args_list += (form[str(i)]['stop'],)
 
             self.cr.execute('SELECT SUM(l.debit-l.credit)\
-                    FROM account_move_line AS l, account_account , account_move am \
+                    FROM account_move_line AS l, account_account, account_move am \
                     WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)\
                         AND (am.state IN %s)\
                         AND (account_account.type IN %s)\
@@ -296,7 +296,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
                         AND '+ self.query + '\
                         AND account_account.active\
                         AND ' + dates_query + '\
-                    GROUP BY l.partner_id' , args_list)
+                    GROUP BY l.partner_id', args_list)
             t = self.cr.fetchall()
             d = {}
             for i in t:
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index aa0c5b3ba99..a53e19721dd 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -33,7 +33,7 @@ class analytic_entries_report(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'user_id' : fields.many2one('res.users', 'User',readonly=True),
+        'user_id': fields.many2one('res.users', 'User',readonly=True),
         'name': fields.char('Description', size=64, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index d3693ecb152..35f1e666c6f 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -71,11 +71,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
+
         self.cr.execute('SELECT a.currency_id ,a.code, a.name, c.code AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit  \
                         from account_move_line l  \
                         LEFT JOIN account_move am ON (l.move_id=am.id) \
                         LEFT JOIN account_account a ON (l.account_id=a.id) \
-                        LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.code , a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
+                        LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.code, a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
         return self.cr.dictfetchall()
 
     def _set_get_account_currency_code(self, account_id):
@@ -91,12 +92,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
     def _get_account(self, data):
         if data['model'] == 'account.journal.period':
             return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name
-        return super(journal_print ,self)._get_account(data)
+        return super(journal_print,self)._get_account(data)
 
     def _get_fiscalyear(self, data):
         if data['model'] == 'account.journal.period':
             return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).fiscalyear_id.name
-        return super(journal_print ,self)._get_fiscalyear(data)
+        return super(journal_print,self)._get_fiscalyear(data)
 
     def _display_currency(self, data):
         if data['model'] == 'account.journal.period':
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index 6a1afc45bcf..5939437ce1d 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -170,7 +170,7 @@ class account_automatic_reconcile(osv.osv_memory):
                     "AND reconcile_id IS NULL",
                     (account_id, partner_id))
                 line_ids = [id for (id,) in cr.fetchall()]
-                if len(line_ids):
+                if line_ids:
                     reconciled += len(line_ids)
                     if allow_write_off:
                         move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index c7e75f205f8..29d67859ca5 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -100,7 +100,7 @@ class account_invoice_refund(osv.osv_memory):
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if inv.reconciled and mode in ('cancel', 'modify'):
                     raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
-                if form['period'] :
+                if form['period']:
                     period = form['period']
                 else:
                     period = inv.period_id and inv.period_id.id or False
@@ -108,9 +108,9 @@ class account_invoice_refund(osv.osv_memory):
                 if not journal_id:
                     journal_id = inv.journal_id.id
 
-                if form['date'] :
+                if form['date']:
                     date = form['date']
-                    if not form['period'] :
+                    if not form['period']:
                             cr.execute("select name from ir_model_fields \
                                             where model = 'account.period' \
                                             and name = 'company_id'")
@@ -128,7 +128,7 @@ class account_invoice_refund(osv.osv_memory):
                                 period = res[0]
                 else:
                     date = inv.date_invoice
-                if form['description'] :
+                if form['description']:
                     description = form['description']
                 else:
                     description = inv.name
@@ -147,18 +147,18 @@ class account_invoice_refund(osv.osv_memory):
                 if mode in ('cancel', 'modify'):
                     movelines = inv.move_id.line_id
                     to_reconcile_ids = {}
-                    for line in movelines :
-                        if line.account_id.id == inv.account_id.id :
+                    for line in movelines:
+                        if line.account_id.id == inv.account_id.id:
                             to_reconcile_ids[line.account_id.id] = [line.id]
-                        if type(line.reconcile_id) != osv.orm.browse_null :
+                        if type(line.reconcile_id) != osv.orm.browse_null:
                             reconcile_obj.unlink(cr, uid, line.reconcile_id.id)
                     wf_service.trg_validate(uid, 'account.invoice', \
                                         refund.id, 'invoice_open', cr)
                     refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
-                    for tmpline in  refund.move_id.line_id :
-                        if tmpline.account_id.id == inv.account_id.id :
+                    for tmpline in  refund.move_id.line_id:
+                        if tmpline.account_id.id == inv.account_id.id:
                             to_reconcile_ids[tmpline.account_id.id].append(tmpline.id)
-                    for account in to_reconcile_ids :
+                    for account in to_reconcile_ids:
                         account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
                                         writeoff_period_id=period,
                                         writeoff_journal_id = inv.journal_id.id,
@@ -214,7 +214,7 @@ class account_invoice_refund(osv.osv_memory):
             return result
 
     def invoice_refund(self, cr, uid, ids, context=None):
-        data_refund = self.read(cr, uid, ids, [] ,context=context)[0]['filter_refund']
+        data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund']
         return self.compute_refund(cr, uid, ids, data_refund, context=context)
 
 account_invoice_refund()
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 546bb08c754..86345703f6f 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -46,7 +46,7 @@ class account_move_line_select(osv.osv_memory):
         fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids)
 
         period_ids = []
-        if fiscalyears :
+        if fiscalyears:
             for fiscalyear in fiscalyears:
                 for period in fiscalyear.period_ids:
                     period_ids.append(period.id)
@@ -56,7 +56,7 @@ class account_move_line_select(osv.osv_memory):
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id])[0]
         result['context'] = {
-            'fiscalyear': False ,
+            'fiscalyear': False,
             'account_id': context['active_id'],
             'active_id': context['active_id'],
         }
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index c1d9854d014..13fea538532 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -83,7 +83,7 @@ class account_move_line_reconcile(osv.osv_memory):
         data = self.read(cr, uid, ids, context=context)
         date = time.strftime('%Y-%m-%d')
         ids = self.pool.get('account.period').find(cr, uid, dt=date, context=context)
-        if len(ids):
+        if ids:
             period_id = ids[0]
         #stop the reconciliation process by partner (manual reconciliation) only if there is nothing more to reconcile for this partner
         if 'active_ids' in context and context['active_ids']:
@@ -93,10 +93,10 @@ class account_move_line_reconcile(osv.osv_memory):
             credit_ml_ids = account_move_line_obj.search(cr, uid, [('partner_id', '=', partner_id), ('account_id.reconcile', '=', True), ('reconcile_id', '=', False), ('credit', '>', 0)], context=context)
             for ml_id in context['active_ids']:
                 if ml_id in debit_ml_ids:
-                    debit_ml_ids.remove(ml_id) 
+                    debit_ml_ids.remove(ml_id)
                 if ml_id in credit_ml_ids:
                     credit_ml_ids.remove(ml_id)
-            if not (len(debit_ml_ids) and len(credit_ml_ids)):
+            if not debit_ml_ids and credit_ml_ids:
                 context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                                         period_id, journal_id, context=context)
@@ -161,7 +161,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
             date = context['date_p']
 
         ids = self.pool.get('account.period').find(cr, uid, dt=date, context=context)
-        if len(ids):
+        if ids:
             period_id = ids[0]
 
         context.update({'stop_reconcile': True})
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 1e647742f4a..2a77cd8fb66 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -44,7 +44,7 @@ class account_unreconcile_reconcile(osv.osv_memory):
         rec_ids = context['active_ids']
         if context is None:
             context = {}
-        if len(rec_ids):
+        if rec_ids:
             obj_move_reconcile.unlink(cr, uid, rec_ids)
         return {}
 

From e11beeb0cb9f33551aa302ff2e7de9d179ddccad Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 11 Oct 2010 11:37:30 +0530
Subject: [PATCH 524/632] [IMP] mrp: Improved yaml.

bzr revid: uco@tinyerp.com-20101011060730-drfj7fdcvvzdj6x1
---
 addons/mrp/test/mrp_procurement.yml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 7435503bac9..40d22ae817f 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -178,17 +178,7 @@
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
     	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
-  I get the approval from the supplier. So I approve my purchase orders.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    import netsvc
-    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
-    assert purch_ids, _('No Confirmed Purchase Orders found!')
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+
 -
   I confirm purchase order for Buttons.
 -
@@ -198,17 +188,7 @@
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
     	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
-  I get the approval from the supplier. So I approve my purchase orders.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    import netsvc
-    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
-    assert purch_ids, _('No Confirmed Purchase Orders found!')
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+
 -
   I Check incoming shipments for cloth. And receive products.
 -

From 301ff85dca7949d718278f962ffdd9bec835fdfb Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 11 Oct 2010 11:37:52 +0530
Subject: [PATCH 525/632] [IMP] event: code cleaning

bzr revid: psi@tinyerp.co.in-20101011060752-wycy59vnqnb11k2s
---
 addons/event/event.py                         | 62 ++++++++--------
 .../event/report/report_event_registration.py | 70 +++++++++----------
 .../wizard/event_confirm_registration.py      |  6 +-
 addons/event/wizard/event_make_invoice.py     |  7 +-
 .../wizard/partner_event_registration.py      | 23 +++---
 5 files changed, 87 insertions(+), 81 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index fc01ae8bdfc..e2d51474689 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -90,10 +90,10 @@ class event_event(crm.crm_case, osv.osv):
                 #send reminder that will confirm the event for all the people that were already confirmed
                 reg_ids = register_pool.search(cr, uid, [
                                ('event_id', '=', event.id),
-                               ('state', 'not in', ['draft', 'cancel'])])
+                               ('state', 'not in', ['draft', 'cancel'])], context=context)
                 register_pool.mail_user_confirm(cr, uid, reg_ids)
 
-        return self.write(cr, uid, ids, {'state': 'confirm'})
+        return self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
 
     def button_confirm(self, cr, uid, ids, context=None):
         """This Function Confirm Event.
@@ -116,7 +116,7 @@ class event_event(crm.crm_case, osv.osv):
                 unconfirmed_ids.append(event.id)
         if unconfirmed_ids:
             view_id = data_pool._get_id(cr, uid, 'event', 'view_event_confirm')
-            view_data = data_pool.browse(cr, uid, view_id)
+            view_data = data_pool.browse(cr, uid, view_id, context=context)
             view_id = view_data.res_id
             context['event_ids'] = unconfirmed_ids
             return {
@@ -143,7 +143,7 @@ class event_event(crm.crm_case, osv.osv):
         """
         register_pool = self.pool.get('event.registration')
         res = {}
-        for event in self.browse(cr, uid, ids, context):
+        for event in self.browse(cr, uid, ids, context=context):
             res[event.id] = {}
             for field in fields:
                 res[event.id][field] = False
@@ -155,11 +155,11 @@ class event_event(crm.crm_case, osv.osv):
 
             reg_ids = register_pool.search(cr, uid, [
                         ('event_id', '=', event.id),
-                       ('state', 'in', state)])
+                       ('state', 'in', state)], context=context)
 
             number = 0.0
             if reg_ids:
-                cr.execute('select sum(nb_register) from event_registration where id IN %s', (tuple(reg_ids),))
+                cr.execute('SELECT SUM(nb_register) FROM event_registration WHERE id IN %s', (tuple(reg_ids),))
                 number = cr.fetchone()
             if 'register_current' in fields:
                 res[event.id]['register_current'] = number and number[0]
@@ -194,8 +194,8 @@ class event_event(crm.crm_case, osv.osv):
                     register_values['description'] = vals['mail_confirm']
 
                 if register_values:
-                    reg_ids = register_pool.search(cr, uid, [('event_id', '=', event.id)])
-                    register_pool.write(cr, uid, reg_ids, register_values)
+                    reg_ids = register_pool.search(cr, uid, [('event_id', '=', event.id)], context=context)
+                    register_pool.write(cr, uid, reg_ids, register_values, context=context)
         return res
 
     _columns = {
@@ -231,7 +231,7 @@ class event_event(crm.crm_case, osv.osv):
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."),
         'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to", digits_compute=dp.get_precision('Sale Price')),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who are giving speech on event."),
-        'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
+        'speaker_ids': fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
         'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
@@ -239,7 +239,6 @@ class event_event(crm.crm_case, osv.osv):
         'language': fields.char('Language',size=64, readonly=False, states={'done': [('readonly', True)]}),
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
-
     }
 
     _defaults = {
@@ -256,7 +255,7 @@ class event_event(crm.crm_case, osv.osv):
         level = 100
 
         while len(ids):
-            cr.execute('select distinct parent_id from event_event where id IN %s', (tuple(ids),))
+            cr.execute('SELECT DISTINCT parent_id FROM event_event WHERE id IN %s', (tuple(ids),))
             ids = filter(None, map(lambda x: x[0], cr.fetchall()))
             if not level:
                 return False
@@ -359,7 +358,7 @@ class event_registration(osv.osv):
         val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
         val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
 
-        inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
+        inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom=False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
 
         val_invoice['value'].update({
                 'origin': reg.event_product,
@@ -368,7 +367,7 @@ class event_registration(osv.osv):
                 'comment': "",
                 'date_invoice': context.get('date_inv', False)
             })
-        inv_id = inv_pool.create(cr, uid, val_invoice['value'])
+        inv_id = inv_pool.create(cr, uid, val_invoice['value'], context=context)
         inv_pool.button_compute(cr, uid, [inv_id])
         self.history(cr, uid, [reg], _('Invoiced'))
         return inv_id
@@ -469,12 +468,12 @@ class event_registration(osv.osv):
         for registration in self.browse(cr, uid, ids, context=context):
             total_confirmed = registration.event_id.register_current + registration.nb_register
             if total_confirmed <= registration.event_id.register_max or registration.event_id.register_max == 0:
-                self.do_open(cr, uid, [registration.id], context)
+                self.do_open(cr, uid, [registration.id], context=context)
             else:
                 unconfirmed_ids.append(registration.id)
         if unconfirmed_ids:
             view_id = data_pool._get_id(cr, uid, 'event', 'view_event_confirm_registration')
-            view_data = data_pool.browse(cr, uid, view_id)
+            view_data = data_pool.browse(cr, uid, view_id, context=context)
             view_id = view_data.res_id
             context['registration_ids'] = unconfirmed_ids
             return {
@@ -502,10 +501,10 @@ class event_registration(osv.osv):
             if registration.tobe_invoiced and not registration.invoice_id:
                 unclosed_ids.append(registration.id)
             else:
-                self.do_close(cr, uid, [registration.id])
+                self.do_close(cr, uid, [registration.id], context=context)
         if unclosed_ids:
             view_id = data_pool._get_id(cr, uid, 'event', 'view_event_make_invoice')
-            view_data = data_pool.browse(cr, uid, view_id)
+            view_data = data_pool.browse(cr, uid, view_id, context=context)
             view_id = view_data.res_id
             context['active_ids'] = unclosed_ids
             return {
@@ -561,10 +560,10 @@ class event_registration(osv.osv):
                     body = regestration.event_id.mail_confirm
             if subject or body:
                 tools.email_send(src, email_to, subject, body, email_cc = email_cc, openobject_id = regestration.id)
-                self.history(cr, uid, [regestration], subject, history=True, \
-                        email=email_to, details=body, \
-                        subject=subject, email_from=src, \
-                        email_cc=', '.join(email_cc))
+                self.history(cr, uid, [regestration], subject, history = True, \
+                        email = email_to, details = body, \
+                        subject = subject, email_from = src, \
+                        email_cc = ', '.join(email_cc))
 
         return True
 
@@ -620,12 +619,17 @@ class event_registration(osv.osv):
         res_obj = self.pool.get('res.partner')
 
         data_event =  event_obj.browse(cr, uid, event_id)
-        res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False,
-                        'date': data_event.date_begin, 'date_deadline': data_event.date_end, 'description': data_event.note, 'name': data_event.name,
-                        'section_id': data_event.section_id and data_event.section_id.id or False,
+        res = {'value': {'unit_price': False,
+                         'event_product': False,
+                         'user_id': False,
+                         'date': data_event.date_begin,
+                         'date_deadline': data_event.date_end,
+                         'description': data_event.note,
+                         'name': data_event.name,
+                         'section_id': data_event.section_id and data_event.section_id.id or False,
                         }}
         if data_event.user_id.id:
-            res['value'].update({'user_id':data_event.user_id.id})
+            res['value'].update({'user_id': data_event.user_id.id})
         if data_event.product_id:
             pricelist_id = data_event.pricelist_id and data_event.pricelist_id.id or False
             if partner_invoice_id:
@@ -653,7 +657,7 @@ class event_registration(osv.osv):
         data['contact_id'], data['partner_invoice_id'], data['email_from'] = (False, False, False)
         if not part:
             return {'value': data}
-        data['partner_invoice_id']=part
+        data['partner_invoice_id'] = part
         # this calls onchange_partner_invoice_id
         d = self.onchange_partner_invoice_id(cr, uid, ids, event_id, part)
         # this updates the dictionary
@@ -677,8 +681,8 @@ class event_registration(osv.osv):
         @param event_id: Event ID
         @param partner_invoice_id: Partner Invoice ID
         """
-        data={}
-        context={}
+        data = {}
+        context = {}
         event_obj = self.pool.get('event.event')
         prod_obj = self.pool.get('product.product')
         res_obj = self.pool.get('res.partner')
@@ -686,7 +690,7 @@ class event_registration(osv.osv):
         data['unit_price']=False
         if not event_id:
             return {'value': data}
-        data_event =  event_obj.browse(cr, uid, event_id)
+        data_event =  event_obj.browse(cr, uid, event_id, context=context)
         if data_event.product_id:
             data['event_product'] = data_event.product_id.name
             pricelist_id = data_event.pricelist_id and data_event.pricelist_id.id or False
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index f74b7d31567..1aa0af9ee2b 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,7 +23,7 @@ from osv import fields, osv
 import tools
 
 class report_event_registration(osv.osv):
-    
+
     _name = "report.event.registration"
     _description = "Events on registrations and Events on type"
     _auto = False
@@ -31,19 +31,19 @@ class report_event_registration(osv.osv):
     _columns = {
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+        'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),        
-        'event_id': fields.many2one('event.event', 'Event Related', required=True), 
-        'draft_state': fields.integer(' # No of draft Registration.', size=20), 
-        'confirm_state': fields.integer(' # No of Confirm Registration', size=20), 
-        'register_max': fields.integer('Maximum Registrations'), 
-        'nbevent': fields.integer('Number Of Events'), 
+        'day': fields.char('Day', size=128, readonly=True),
+        'event_id': fields.many2one('event.event', 'Event Related', required=True),
+        'draft_state': fields.integer(' # No of draft Registration.', size=20),
+        'confirm_state': fields.integer(' # No of Confirm Registration', size=20),
+        'register_max': fields.integer('Maximum Registrations'),
+        'nbevent': fields.integer('Number Of Events'),
         'type': fields.many2one('event.type', 'Event Type'),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
-        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
-        'speaker_id':fields.many2one('res.partner', 'Speaker', readonly=True),
+        'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
+        'speaker_id': fields.many2one('res.partner', 'Speaker', readonly=True),
     }
     _order = 'date desc'
     def init(self, cr):
@@ -53,32 +53,32 @@ class report_event_registration(osv.osv):
         """
         tools.drop_view_if_exists(cr, 'report_event_registration')
         cr.execute("""
-         create or replace view report_event_registration as (
-                select
-                e.id as id,
-                c.event_id as event_id,
-                e.date_begin as date,
-                e.user_id as user_id,
-                e.main_speaker_id as speaker_id,
-                to_char(e.date_begin, 'YYYY') as year,
-                to_char(e.date_begin, 'MM') as month,
-                to_char(e.date_begin, 'YYYY-MM-DD') as day,
-                count(t.id) as nbevent,
-                t.id as type,
-                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id and t.id=e.type and state in ('draft')) as draft_state,
-                (SELECT sum(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id and t.id=e.type and state in ('open')) as confirm_state,
-                e.register_max as register_max,
-                e.state as state
-                from
+         CREATE OR REPLACE view report_event_registration AS (
+                SELECT
+                e.id AS id,
+                c.event_id AS event_id,
+                e.date_begin AS date,
+                e.user_id AS user_id,
+                e.main_speaker_id AS speaker_id,
+                to_char(e.date_begin, 'YYYY') AS year,
+                to_char(e.date_begin, 'MM') AS month,
+                to_char(e.date_begin, 'YYYY-MM-DD') AS day,
+                count(t.id) AS nbevent,
+                t.id AS type,
+                (SELECT SUM(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id AND t.id=e.type AND state IN ('draft')) AS draft_state,
+                (SELECT SUM(c.nb_register) FROM event_registration  c  WHERE c.event_id=e.id AND t.id=e.type AND state IN ('open')) AS confirm_state,
+                e.register_max AS register_max,
+                e.state AS state
+                FROM
                 event_event e
-                inner join
-                    event_registration c on (e.id=c.event_id)
-                inner join
-                    event_type t on (e.type=t.id)
-               group by
+                INNER JOIN
+                    event_registration c ON (e.id=c.event_id)
+                INNER JOIN
+                    event_type t ON (e.type=t.id)
+               GROUP BY
                     to_char(e.date_begin, 'YYYY'),
                     to_char(e.date_begin, 'MM'),
-                    t.id, e.id, e.date_begin,e.main_speaker_id,
+                    t.id, e.id, e.date_begin, e.main_speaker_id,
                     e.register_max, e.type, e.state, c.event_id, e.user_id,
                     to_char(e.date_begin, 'YYYY-MM-DD')
                 )""")
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
index 92f94474cb8..7b6cd7ee3f3 100644
--- a/addons/event/wizard/event_confirm_registration.py
+++ b/addons/event/wizard/event_confirm_registration.py
@@ -40,6 +40,8 @@ class event_confirm_registration(osv.osv_memory):
         """
         This function gets default values
         """
+        if context is None:
+            context = {}
         registration_pool = self.pool.get('event.registration')
         registration_ids = context.get('registration_ids', [])
         res = super(event_confirm_registration, self).default_get(cr, uid, fields, context=context)
@@ -56,7 +58,9 @@ class event_confirm_registration(osv.osv_memory):
             res.update({'msg': msg})
         return res
 
-    def confirm(self, cr, uid, ids, context):
+    def confirm(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         registration_pool = self.pool.get('event.registration')
         registration_ids = context.get('registration_ids', [])
         registration_pool.do_open(cr, uid, registration_ids, context=context)
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 12ad2cf0d68..f22db18a78a 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 from tools.translate import _
 
@@ -29,7 +30,7 @@ class event_make_invoice(osv.osv_memory):
     _description = "Event Make Invoice"
     _columns = {
         'grouped': fields.boolean('Group the invoices'),
-        'invoice_date':fields.date('Invoice Date'),
+        'invoice_date': fields.date('Invoice Date'),
     }
 
     def view_init(self, cr, uid, fields, context=None):
@@ -61,7 +62,7 @@ class event_make_invoice(osv.osv_memory):
                         _("Registration doesn't have any partner to invoice."))
 
     def default_get(self, cr, uid, fields_list, context=None):
-        return super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
+        return super(event_make_invoice, self).default_get(cr, uid, fields_list, context=context)
 
     def make_invoice(self, cr, uid, ids, context=None):
         reg_obj = self.pool.get('event.registration')
@@ -70,7 +71,7 @@ class event_make_invoice(osv.osv_memory):
         if context is None:
             context = {}
 
-        for data in self.browse(cr, uid, ids):
+        for data in self.browse(cr, uid, ids, context=context):
             res = reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
 
         form_id = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index 00f106ab8ae..33ed6e60cdb 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import wizard
 import netsvc
 import tools
 from osv import fields, osv
@@ -53,7 +52,6 @@ class partner_event_registration(osv.osv_memory):
         value = {}
         res_obj = self.pool.get('res.partner')
         job_obj = self.pool.get('res.partner.job')
-        event_obj = self.pool.get('event.event')
         reg_obj = self.pool.get('event.registration')
         mod_obj = self.pool.get('ir.model.data')
 
@@ -62,9 +60,9 @@ class partner_event_registration(osv.osv_memory):
         contact_id = False
         email = False
         if addr.has_key('default'):
-                job_ids = job_obj.search(cr, uid, [('address_id', '=', addr['default'])])
+                job_ids = job_obj.search(cr, uid, [('address_id', '=', addr['default'])], context=context)
                 if job_ids:
-                    contact = job_obj.browse(cr, uid, job_ids[0])
+                    contact = job_obj.browse(cr, uid, job_ids[0], context=context)
                     if contact:
                         contact_id = contact.contact_id.id
                         email = contact.email
@@ -72,14 +70,13 @@ class partner_event_registration(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'event', 'view_registration_search')
         res = mod_obj.read(cr, uid, result, ['res_id'])
 
-        data_obj = self.pool.get('ir.model.data')
         # Select the view
-        id2 = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
-        id3 = data_obj._get_id(cr, uid, 'event', 'view_event_registration_tree')
+        id2 = mod_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
+        id3 = mod_obj._get_id(cr, uid, 'event', 'view_event_registration_tree')
         if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            id2 = mod_obj.browse(cr, uid, id2, context=context).res_id
         if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            id3 = mod_obj.browse(cr, uid, id3, context=context).res_id
 
         for current in self.browse(cr, uid, ids, context=context):
             for partner in res_obj.browse(cr, uid, record_ids, context=context):
@@ -105,7 +102,7 @@ class partner_event_registration(osv.osv_memory):
                 'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
                 'type': 'ir.actions.act_window',
                 'search_view_id': res['res_id']
-            }
+        }
         return value
 
     def name_get(self, cr, uid, ids, context=None):
@@ -118,7 +115,7 @@ class partner_event_registration(osv.osv_memory):
         res = []
         if not ids:
             return res
-        reads = self.read(cr, uid, ids, ['event_type', 'event_id'], context)
+        reads = self.read(cr, uid, ids, ['event_type', 'event_id'], context=context)
         for record in reads:
             event_id = record['event_id'][1]
             if record['event_type']:
@@ -135,13 +132,13 @@ class partner_event_registration(osv.osv_memory):
             context = {}
         partner_id = context.get('active_id', False)
         if event_id:
-            event = event_obj.browse(cr, uid, event_id)
+            event = event_obj.browse(cr, uid, event_id, context=context)
             pricelist_id = event.pricelist_id and event.pricelist_id.id or False
             if partner_id:
                 partner = partner_obj.browse(cr, uid, partner_id, context=context)
                 pricelist_id = pricelist_id or partner.property_product_pricelist.id
             unit_price = product_obj._product_price(cr, uid, [event.product_id.id], False, False, {'pricelist': pricelist_id})[event.product_id.id]
-                
+
             res['value'] = {
                           'event_type': event.type and event.type.id or False,
                           'start_date': event.date_begin,

From 9bf62c39d7dc92de7b3c8288774721de8047dadb Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Mon, 11 Oct 2010 11:40:58 +0530
Subject: [PATCH 526/632] [FIX][IMP]hr_payroll : Fixed and improved the
 employee detail and year report.

bzr revid: vra@tinyerp.com-20101011061058-djvd4zijs2b9s2rn
---
 .../report/report_employees_detail.py         | 17 +++--
 .../report/report_employees_detail.rml        | 75 +++++++++----------
 .../hr_payroll/report/report_year_report.rml  | 60 +++++++--------
 .../hr_payroll/report/report_year_salary.py   | 16 ++--
 4 files changed, 86 insertions(+), 82 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index f3ecb56aa0b..fe4b0537896 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -48,10 +48,14 @@ class employees_salary_report(rml_parse.rml_parse):
             m = datetime.date(cy, cm, 1).strftime('%b')
             mnth_name.append(m)
             self.mnths.append(str(cm)+'-'+str(cy))
+            
             if cm == 12:
                 cm = 0
                 cy = ly
             cm = cm +1
+        for c in range(0,(12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
         return [mnth_name]
 
     def get_employee(self,form):
@@ -134,11 +138,14 @@ class employees_salary_report(rml_parse.rml_parse):
             category_name = self.pool.get('hr.allounce.deduction.categoty').read(self.cr, self.uid, [category],['name','type'])[0]
             result.append(category_name['name'])
         for mnth in self.mnths:
-            if len(mnth) != 7:
-                mnth = '0' + str(mnth)
-            query = "select id from hr_payslip where employee_id = "+str(emp_id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
-            self.cr.execute(query)
-            payslip_id = self.cr.dictfetchone()
+            if mnth <> 'None':
+                if len(mnth) != 7:
+                    mnth = '0' + str(mnth)
+                query = "select id from hr_payslip where employee_id = "+str(emp_id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
+                self.cr.execute(query)
+                payslip_id = self.cr.dictfetchone()
+            else:
+                payslip_id = False
             if payslip_id:
                 payslip_obj = self.pool.get('hr.payslip').browse(self.cr, self.uid, payslip_id['id'])
                 if not category:
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index e1bd6c3b3c8..b4e577e1f22 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -184,6 +184,20 @@
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -329,46 +343,46 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
-      <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
+      <blockTable colWidths="137.0,64.0,62.0,64.0,68.0,69.0,76.0,71.0,80.0,75.0,79.0,78.0,70.0,70.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Title</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[0] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[1] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[2] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[3] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[4] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[5] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[6] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[7] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[8] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[9] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[10] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Right">Total</para>
@@ -379,9 +393,6 @@
         <font color="white"> </font>
       </para>
       <section>
-        <para style="terp_default_9">
-          <font color="white"> </font>
-        </para>
         <blockTable colWidths="1063.0" style="Table7">
           <tr>
             <td>
@@ -390,8 +401,8 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_allow(),'e1') ]]</para>
-          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
+          <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
+          <blockTable colWidths="138.0,62.0,62.0,64.0,68.0,70.0,75.0,70.0,80.0,75.0,79.0,77.0,71.0,70.0" style="Table6">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e1[0] ]]</para>
@@ -437,9 +448,6 @@
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
         <blockTable colWidths="1063.0" style="Table10">
           <tr>
@@ -449,8 +457,8 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
-          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
+          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
+          <blockTable colWidths="137.0,63.0,62.0,63.0,70.0,69.0,76.0,71.0,79.0,76.0,79.0,77.0,73.0,70.0" style="Table8">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e2[0] ]]</para>
@@ -496,9 +504,6 @@
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
         <blockTable colWidths="1063.0" style="Table11">
           <tr>
@@ -508,8 +513,8 @@
           </tr>
         </blockTable>
         <section>
-          <para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
-          <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
+          <para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
+          <blockTable colWidths="137.0,62.0,64.0,62.0,69.0,70.0,77.0,70.0,78.0,77.0,79.0,77.0,73.0,69.0" style="Table9">
             <tr>
               <td>
                 <para style="terp_default_9">[[ e3[0] ]]</para>
@@ -555,18 +560,9 @@
               </td>
             </tr>
           </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
         </section>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="101.0,73.0,68.0,74.0,70.0,74.0,74.0,73.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
+      <blockTable colWidths="137.0,62.0,64.0,62.0,60.0,78.0,78.0,70.0,78.0,77.0,78.0,77.0,74.0,68.0" style="Table1">
         <tr>
           <td>
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
@@ -616,9 +612,6 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 052af6f4701..527491552aa 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -63,11 +63,24 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -133,58 +146,55 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
       <blockTable colWidths="99.0,73.0,69.0,74.0,71.0,73.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table4">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Name</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[0] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[1] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[2] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[3] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[4] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[5] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[6] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[7] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[8] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[9] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[10] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Right">Total</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_9">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
+        <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
         <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table1">
           <tr>
             <td>
@@ -231,19 +241,10 @@
             </td>
           </tr>
         </blockTable>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
       </section>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="P1">[[ repeatIn(get_months_tol(),'t') ]]</para>
+      <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
       <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,75.0,74.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table6">
         <tr>
           <td>
@@ -294,8 +295,5 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index b23effbeccb..6c830b80941 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -43,6 +43,9 @@ class year_salary_report(rml_parse.rml_parse):
                 cm = 0
                 cy = ly
             cm = cm +1
+        for c in range(0,(12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
         return [mnth_name]
 
     def get_employee(self,form):
@@ -58,11 +61,14 @@ class year_salary_report(rml_parse.rml_parse):
             ls1.append(emp_id.name)
             tol = 0.0
             for mnth in self.mnths:
-                if len(mnth) != 7:
-                    mnth = '0' + str(mnth)
-                query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
-                self.cr.execute(query)
-                sal = self.cr.fetchall()
+                if mnth <> 'None':
+                    if len(mnth) != 7:
+                        mnth = '0' + str(mnth)
+                    query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
+                    self.cr.execute(query)
+                    sal = self.cr.fetchall()
+                else:
+                    sal = [(0.0,)]
                 try:
                     ls1.append(sal[0][0])
                 except:

From 2ce1c306d11b1c43a76afd85e0a6bcc95197f2a5 Mon Sep 17 00:00:00 2001
From: "AMP(Open ERP)" <>
Date: Mon, 11 Oct 2010 11:48:14 +0530
Subject: [PATCH 527/632] [MOD] crm_meeting : change in calendar view and added
 shortcut for meeting. product : shortcut added

bzr revid: vir@tinyerp.com-20101011061814-5hb940uka624jeph
---
 addons/crm/crm_meeting_menu.xml | 2 +-
 addons/crm/crm_meeting_view.xml | 2 +-
 addons/product/product_view.xml | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 7726280a05f..bc4f9ba948c 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -92,7 +92,7 @@
         sequence="1" />
 
     <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
-        <field name="name">Calendar</field>
+        <field name="name">Meetings</field>
         <field name="resource">ir.ui.menu</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aa8b6cc4820..978b6e1a889 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -268,7 +268,7 @@
         <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meetings" date_start="date" color="user_id" date_delay="duration">
+            <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline">
                 <field name="name"/>
                 <field name="partner_id"/>
                 <field name="section_id" widget="selection"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8f2e5efe649..5872e325715 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -632,5 +632,12 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
+        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
+            <field name="name">Products</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="product.menu_products"/>
+        </record>
+
     </data>
 </openerp>

From 6c2c41bbc117be5756ee87eb7e17a75da746c3f6 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 11:55:03 +0530
Subject: [PATCH 528/632] improve

bzr revid: apa@tinyerp.com-20101011062503-u099hf39z69vogjr
---
 addons/account/report/account_central_journal.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index d6e53c4f3c7..7516ae84c1e 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -304,7 +304,7 @@
     </blockTable>
     <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
       <tr>
-        <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+        <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_debit(o.period_id.id, o.journal_id.id)) ]]</para></td>
         <td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)) ]]</para></td>

From cd5994c6a4bc0fe59a9e958dc4270f83411aa00e Mon Sep 17 00:00:00 2001
From: "DBR(Open ERP)" <>
Date: Mon, 11 Oct 2010 11:58:44 +0530
Subject: [PATCH 529/632] [MOD] crm : partner icons are changed in view

bzr revid: vir@tinyerp.com-20101011062844-x1k673b53oqjznvu
---
 addons/crm/crm_lead_view.xml        | 2 +-
 addons/crm/crm_opportunity_view.xml | 2 +-
 addons/crm/crm_phonecall_view.xml   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3d996b990e7..722a17d2931 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -97,7 +97,7 @@
                         <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
                         <button
                             name="%(action_crm_lead2partner)d"
-                            icon="gtk-index" type="action"
+                            icon="terp-partner" type="action"
                             string="Create"
                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
                     </group>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 315cd206687..cc95e9e3a4e 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -49,7 +49,7 @@
                                         on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
                                         colspan="2" />
                                     <button name="%(action_crm_lead2partner)d"
-                                        icon="gtk-index" type="action"
+                                        icon="terp-partner" type="action"
                                         string="Create"
                                         attrs="{'invisible':[('partner_id','!=',False)]}"/>
                                 </group>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index afc6edd5295..595da873115 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -82,7 +82,7 @@
                     <field name="partner_id"
                         on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
-                        icon="gtk-index"
+                        icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
@@ -160,7 +160,7 @@
                     <field name="partner_id"
                         on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
-                        icon="gtk-index"
+                        icon="terp-partner"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />

From 54f0a7dbf5e1c68d551320a2095f25edd5fbd54d Mon Sep 17 00:00:00 2001
From: "JMA(OpenERP)" <>
Date: Mon, 11 Oct 2010 12:01:23 +0530
Subject: [PATCH 530/632] [FIX] Account_accountant : Field name corrected in
 xml reference

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

bzr revid: jvo@tinyerp.com-20101011063123-37yebgjma0885ku0
---
 addons/account_accountant/security/account_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index 9daabddfef8..4aceb12d266 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="base.user_admin" model="res.users">
-            <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+            <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
     </data>

From 9db842ce4b1d6d8569f3f379125dc0bfc5040630 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 11 Oct 2010 12:05:10 +0530
Subject: [PATCH 531/632] [REF] : Corrected errors suggested by buildbot.

bzr revid: uco@tinyerp.com-20101011063510-n73y74z5oulrnkkk
---
 addons/account/report/account_aged_partner_balance.py   | 2 --
 addons/account/report/account_tax_report.py             | 1 -
 addons/account_accountant/security/account_security.xml | 2 +-
 addons/account_voucher/invoice.py                       | 3 +--
 addons/crm/report/crm_phonecall_report.py               | 1 -
 addons/crm/wizard/crm_lead_to_opportunity.py            | 1 -
 addons/sale_crm/wizard/crm_make_sale.py                 | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 22b04e05f39..5936e29fe29 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -62,7 +62,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
     def _get_lines(self, form):
         res = []
-        account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
         self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
                     res_partner.name AS name \
                 FROM res_partner,account_move_line AS l, account_account\
@@ -219,7 +218,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
 
     def _get_lines_with_out_partner(self, form):
         res = []
-        account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index b03aea5c05d..d3fb791bfaa 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -190,7 +190,6 @@ class tax_report(rml_parse.rml_parse):
                 bcl_rup_ind = ind - 1
 
                 while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
-                    tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
                     res_tot = { 'code': accounts[bcl_rup_ind]['code'],
                         'name': '',
                         'debit': 0,
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index 9daabddfef8..4aceb12d266 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record id="base.user_admin" model="res.users">
-            <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+            <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
     </data>
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index a2cf45391fb..7b6d232d702 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-import netsvc
-from osv import fields, osv
+from osv import osv
 from tools.translate import _
 
 class invoice(osv.osv):
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 0e4fb4a7df5..80d973ee0e8 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -47,7 +47,6 @@ class crm_phonecall_report(osv.osv):
             @param context: A standard dictionary for contextual values """
 
         res = {}
-        state_perc = 0.0
         avg_ans = 0.0
 
         for case in self.browse(cr, uid, ids, context):
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 7046034afaf..8c5e13db4c1 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -207,7 +207,6 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             context = {}
         
         partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data')
         value = {}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 057e8469431..597def2c6aa 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from tools.translate import _
-import decimal_precision as dp
 import time
 
 

From aa8e73e66db0df7dd0347e07aa6efae7ece5c7a5 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 11 Oct 2010 12:18:45 +0530
Subject: [PATCH 532/632] [IMP] mrp: Improved yaml.

bzr revid: uco@tinyerp.com-20101011064845-n5rrra6venmkpvpm
---
 addons/mrp/test/mrp_phantom_bom.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 46b1d19244a..08a0bc31c86 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -230,17 +230,6 @@
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
     	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
-  I get the approval from both the suppliers. So I approve my purchase orders.
--
-  !python {model: purchase.order}: |
-    from tools.translate import _
-    import netsvc
-    purch_ids = self.search(cr, uid, [('state','=','confirmed')])
-    assert purch_ids, _('No Confirmed Purchase Orders found!')
-    wf_service = netsvc.LocalService("workflow")
-    for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
 -
   I see two incoming pickings for Orange and Sugar.
 -

From 3d6b88c87e888fd1219c75a0ead7397f1bf7bcd0 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 11 Oct 2010 12:27:03 +0530
Subject: [PATCH 533/632] [FIX] fixed regression on get_module_resource method
 to clean checking of file

bzr revid: hmo@tinyerp.com-20101011065703-96zngxucees6zwx1
---
 bin/addons/__init__.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 7db007b732f..8e75a7d1124 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -270,16 +270,17 @@ def get_module_resource(module, *args):
     @return: absolute path to the resource
     """
     a = get_module_path(module)
+    res = a and opj(a, *args) or False
     if zipfile.is_zipfile( a +'.zip') :
         zip = zipfile.ZipFile( a + ".zip")
-        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
+        files = [opj(a,'/'.join(f.split('/')[1:])) for f in zip.namelist()]
+        if res in files:
+            return res
     else:
-        files = tools.osutil.listdir(a, True)
-    for ar in args:
-        if ar not in files:
-            return False
-    res = a and opj(a, *args) or False
-    return res
+        if os.path.isfile(res):
+            return res
+    
+    return False
 
 
 

From c6d60694dc2cee44f72f4a29e9759b4834c9ec13 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 12:38:19 +0530
Subject: [PATCH 534/632] improve

bzr revid: apa@tinyerp.com-20101011070819-co8p6lneh3nbosvn
---
 .../account/report/account_central_journal.rml | 18 ++++++++----------
 .../account/report/account_general_journal.rml |  2 +-
 .../account/report/account_general_ledger.py   |  2 +-
 .../account/report/account_general_ledger.rml  |  2 +-
 .../account_general_ledger_landscape.rml       |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 7516ae84c1e..1cdf1e8fb20 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -283,7 +283,7 @@
   		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
       </tr>
     </blockTable>
-   <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+   <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_tblheader_Details">A/C No.</para></td>
         <td><para style="terp_tblheader_Details">Account Name</para></td>
@@ -293,7 +293,7 @@
 		<td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -302,7 +302,7 @@
 		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -314,7 +314,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
-      <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@@ -323,19 +323,17 @@
  		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
         </tr>
       </blockTable>
-      <blockTable colWidths="50.0,250.0,70.0,70.0,70.0,50.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit']) ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['credit'])]]</para></td>
-  			<td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
-		  <td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] or '') ]] [[ line['currency_id'] and  line['currency_code'] or '']]</para></td>
+  		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
+		  <td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
         </tr>
       </blockTable>
     </section>
-    <para style="P9">
-      <font color="white"> </font>
-    </para>
+
   </story>
 </document>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 61113212c2d..76ff805352b 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -373,7 +373,7 @@
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['credit']) ]]</para></td>
 		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit'] ) ]] [[ company.currency_id.symbol ]]</para></td>
-          <td><para style="terp_default_Right_9">[[ line['currency_id'] and formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</para></td>
+          <td><para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para></td>
         </tr>
       </blockTable>
       </section>
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 80a7ff44f0e..d9920ba94fd 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -160,7 +160,7 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
         else:
             sql_sort='l.date'
         sql = """
-            SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
+            SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
             m.name AS move_name, m.id AS mmove_id,
             c.symbol AS currency_code,
             i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 7ded26849bd..00e93507c63 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -334,7 +334,7 @@
        <td><para style="P4">[[ formatLang(line['debit']) ]]</para></td>
        <td><para style="P4">[[ formatLang(line['credit']) ]]</para></td>
        <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
-       <td><para style="P4">[[  formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '']]</para></td>
+       <td><para style="P4"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
      </tr>
   </blockTable>
   </section>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index ec205f5e542..4f7205af4ed 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -295,7 +295,7 @@
 			<td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
-			<td><para style="P4_content">[[  formatLang(line['amount_currency'] or '')]] [[  line['currency_code'] or '' ]]</para></td>
+			<td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
 		</tr>
 	  </blockTable>
 

From 15380c03ffe091d71ba4f00da41d87d61829386f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 11 Oct 2010 12:50:26 +0530
Subject: [PATCH 535/632] [REF]

bzr revid: mra@mra-laptop-20101011072026-4m0ehsw20j7stywj
---
 addons/account/account_bank_statement.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index a7b6b66d2c1..0b240663943 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -21,9 +21,7 @@
 
 import time
 
-import netsvc
 from osv import fields, osv
-from tools.misc import currency
 from tools.translate import _
 import decimal_precision as dp
 

From ae663dc16c6689f52271e880e7d7946cb61a9097 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 11 Oct 2010 13:04:19 +0530
Subject: [PATCH 536/632] [IMP] account_voucher: Cleaning

bzr revid: mra@mra-laptop-20101011073419-hp26wqaylubtqay2
---
 addons/account_voucher/account_voucher.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 912a7864862..a69b0a0ce11 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -29,8 +29,9 @@ from tools.translate import _
 
 class account_move_line(osv.osv):
     _inherit = 'account.move.line'
+
     def _unreconciled(self, cr, uid, ids, prop, unknow_none, context):
-        res={}
+        res = {}
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.debit - line.credit
             if line.reconcile_partial_id:
@@ -43,9 +44,11 @@ class account_move_line(osv.osv):
     _columns = {
         'amount_unreconciled': fields.function(_unreconciled, method=True, string='Unreconciled Amount'),
     }
+
 account_move_line()
 
 class account_voucher(osv.osv):
+
     def _get_type(self, cr, uid, ids, context={}):
         return context.get('type', False)
 
@@ -92,7 +95,7 @@ class account_voucher(osv.osv):
         journal_id = context.get('journal_id', False)
         if journal_id:
             journal = journal_pool.browse(cr, uid, journal_id)
-            currency_id = journal.company_id.currency_id.id
+#            currency_id = journal.company_id.currency_id.id
             if journal.currency:
                 return journal.currency.id
         return False
@@ -114,7 +117,7 @@ class account_voucher(osv.osv):
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         if not view_id and context.get('invoice_type',False):
             mod_obj = self.pool.get('ir.model.data')
-            if context.get('invoice_type') in ('out_invoice','out_refund'):
+            if context.get('invoice_type') in ('out_invoice', 'out_refund'):
                 result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
             else:
                 result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_payment_form')

From ca6308e217a7c5a7dd08552d481f60a673095644 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 11 Oct 2010 13:46:40 +0530
Subject: [PATCH 537/632] [IMP] membership:-security improvements for the
 'partner_manager' user

bzr revid: mtr@mtr-20101011081640-qxh628totfv3fwt0
---
 addons/membership/membership_view.xml               | 3 ++-
 addons/membership/report/report_membership_view.xml | 3 ++-
 addons/membership/security/ir.model.access.csv      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index ad9c3bcf772..afa1ee9bebe 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -140,7 +140,8 @@
                   parent="menu_membership"
                   id="menu_membership_products"
                   action="action_membership_products"
-                  sequence="1"/>
+                  sequence="1"
+                  groups="base.group_partner_manager"/>
 
 
         <!-- MEMBERSHIP/CURRENT MEMBERS -->
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index abe8b44bcba..291efee4834 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -116,7 +116,8 @@
 
         <menuitem name="Membership Analysis" parent="base.menu_report_association"
             action="action_report_membership_tree"
-            id="menu_report_membership"/>
+            id="menu_report_membership"
+            groups="base.group_partner_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
index 6cf3eb755c2..f3d91646c44 100644
--- a/addons/membership/security/ir.model.access.csv
+++ b/addons/membership/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,0,0,0
+"access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1
 "access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0
 "access_report_membership","report.membership","model_report_membership","base.group_partner_manager",1,0,0,0

From a0ac32cec0cb5f548226fa734efe76520c23349d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 11 Oct 2010 14:16:22 +0530
Subject: [PATCH 538/632] [REF] account: menu string name updated for cash
 register to cash registers

bzr revid: mra@mra-laptop-20101011084622-l0intwt9fslh4b2r
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e7e1c055c32..dd1011b1c33 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2578,7 +2578,7 @@
             </field>
          </record>
         <record id="action_view_bank_statement_tree" model="ir.actions.act_window">
-            <field name="name">Cash Register</field>
+            <field name="name">Cash Registers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>

From cc49a86ab373b61b427704bb88ba348b8ac71b0c Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Mon, 11 Oct 2010 14:28:23 +0530
Subject: [PATCH 539/632] [IMP] account_budget: improved the budget reports rml
 and sxw.

bzr revid: vra@tinyerp.com-20101011085823-0zgt1j9ip72zd8vv
---
 .../report/analytic_account_budget_report.rml   | 10 +++++-----
 addons/account_budget/report/budget_report.rml  | 17 +++++------------
 .../report/crossovered_budget_report.rml        |  8 ++++----
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/addons/account_budget/report/analytic_account_budget_report.rml b/addons/account_budget/report/analytic_account_budget_report.rml
index ea800685470..10b54482ae7 100644
--- a/addons/account_budget/report/analytic_account_budget_report.rml
+++ b/addons/account_budget/report/analytic_account_budget_report.rml
@@ -128,16 +128,16 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Theoretical Amount </para>
+          <para style="terp_tblheader_General_Right">Theoretical Amt </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Planned Amount</para>
+          <para style="terp_tblheader_General_Right">Planned Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Practical Amount</para>
+          <para style="terp_tblheader_General_Right">Practical Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Perc(%)</para>
+          <para style="terp_tblheader_General_Right">Perc(%)</para>
         </td>
       </tr>
     </blockTable>
@@ -166,7 +166,7 @@
     <blockTable colWidths="202.0,75.0,75.0,78.0,52.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">[[ repeatIn(funct_total(data['form']),'b') ]] Total([[ company.currency_id.code ]]) :</para>
+          <para style="terp_default_Bold_9">[[ repeatIn(funct_total(data['form']),'b') ]] Total:</para>
         </td>
         <td>
           <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo']) ]] [[ company.currency_id.symbol ]]</para>
diff --git a/addons/account_budget/report/budget_report.rml b/addons/account_budget/report/budget_report.rml
index cd12f60108d..577e03af9f4 100644
--- a/addons/account_budget/report/budget_report.rml
+++ b/addons/account_budget/report/budget_report.rml
@@ -161,13 +161,6 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="P10">Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]</para>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
     <para style="P1">
       <font color="white"> </font>
     </para>
@@ -180,19 +173,19 @@
           <para style="P13">A/c No.</para>
         </td>
         <td>
-          <para style="P13">Budget</para>
+          <para style="terp_tblheader_Details_Right">Budget</para>
         </td>
         <td>
-          <para style="P13">Period Budget</para>
+          <para style="terp_tblheader_Details_Right">Period Budget</para>
         </td>
         <td>
-          <para style="P13">Performance</para>
+          <para style="terp_tblheader_Details_Right">Performance</para>
         </td>
         <td>
-          <para style="P13">Spread</para>
+          <para style="terp_tblheader_Details_Right">Spread</para>
         </td>
         <td>
-          <para style="P13">% performance</para>
+          <para style="terp_tblheader_Details_Right">% performance</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml
index e297c8b3ca2..0533042822a 100644
--- a/addons/account_budget/report/crossovered_budget_report.rml
+++ b/addons/account_budget/report/crossovered_budget_report.rml
@@ -127,16 +127,16 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Theoretical Amount</para>
+          <para style="terp_tblheader_Details_Right">Theoretical Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Planned Amount</para>
+          <para style="terp_tblheader_Details_Right">Planned Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Practical Amount</para>
+          <para style="terp_tblheader_Details_Right">Practical Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Perc(%)</para>
+          <para style="terp_tblheader_Details_Right">Perc(%)</para>
         </td>
       </tr>
     </blockTable>

From 23536f523426e69aa9dff5975c05bfdc44058196 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 11 Oct 2010 14:37:18 +0530
Subject: [PATCH 540/632] [FIX] account:

bzr revid: vth@tinyerp.com-20101011090718-xbv7khokdw6u2jrl
---
 addons/account/project/project_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index fd52619fb10..8006a972915 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -182,6 +182,7 @@
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
+                    <field name="user_id" invisible="1" />
                 </tree>
             </field>
         </record>

From fc0bf8f9b5cbf9ddd0ee42b6cb9295221bc4c57e Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 11 Oct 2010 14:37:37 +0530
Subject: [PATCH 541/632] [REF]

bzr revid: mra@mra-laptop-20101011090737-vlzoqec2p2jf1sgq
---
 addons/account/account_cash_statement.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 445072605ed..6431454b715 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -151,15 +151,14 @@ class account_cash_statement(osv.osv):
             res[r] = round(res[r], 2)
         return res
 
-    def _get_company(self, cr, uid, context={}):
+    def _get_company(self, cr, uid, context=None):
         user_pool = self.pool.get('res.users')
         company_pool = self.pool.get('res.company')
-        user = user_pool.browse(cr, uid, uid, context)
-        company_id = user.company_id and user.company_id.id
+        user = user_pool.browse(cr, uid, uid, context=context)
+        company_id = user.company_id
         if not company_id:
-            company_id = company_pool.search(cr, uid, [])[0]
-
-        return company_id
+            company_id = company_pool.search(cr, uid, [])
+        return company_id and company_id[0] or False
 
     def _get_cash_open_box_lines(self, cr, uid, context={}):
         res = []

From 1aa17c185e850454fb642512bc63c14bb3ca7bf9 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 11 Oct 2010 14:38:32 +0530
Subject: [PATCH 542/632] [FIX] Analytic journal items => Search view

bzr revid: mra@mra-laptop-20101011090832-dr4a1nb6i594wyz7
---
 addons/account/project/project_view.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8006a972915..d5249310276 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -180,6 +180,7 @@
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" invisible="not context.get('to_invoice', False)"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
+                    <field name="user_id" invisible="1"/>
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />
@@ -431,13 +432,13 @@
             </field>
         </record>
 
-        <act_window 
+        <act_window
             context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
-            id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" 
-            name="All Analytic Entries" 
-            res_model="account.analytic.line" 
-            src_model="account.analytic.account" 
-            view_mode="tree,form" 
+            id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
+            name="All Analytic Entries"
+            res_model="account.analytic.line"
+            src_model="account.analytic.account"
+            view_mode="tree,form"
             view_type="form"/>
 
         <record id="view_account_journal_1" model="ir.ui.view">

From 6e3236f3ba11f996f7b5f33d864a6db08ab4e53a Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 11 Oct 2010 14:38:47 +0530
Subject: [PATCH 543/632] [REM, IMP] point_of_sale: Removed unused report.
 Improved report name for Invoice.

bzr revid: uco@tinyerp.com-20101011090847-62gmt7jhcidzolhj
---
 addons/point_of_sale/pos_report.xml           |   2 +-
 .../point_of_sale/report/pos_receipt_bis.rml  | 186 ------------------
 2 files changed, 1 insertion(+), 187 deletions(-)
 delete mode 100644 addons/point_of_sale/report/pos_receipt_bis.rml

diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index b079f6b9177..3e6a265b34e 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -9,7 +9,7 @@
             name="pos.invoice"
             auto="False"
             multi="True"
-            rml="account/report/invoice.rml"
+            rml="account/report/account_print_invoice.rml"
              />
 
         <report
diff --git a/addons/point_of_sale/report/pos_receipt_bis.rml b/addons/point_of_sale/report/pos_receipt_bis.rml
deleted file mode 100644
index 8a9989294a8..00000000000
--- a/addons/point_of_sale/report/pos_receipt_bis.rml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(224.0,842.0)" title="Receipt" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="0.0" y1="0.0" width="224" height="842"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
-      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
-      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Dicount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Amount">
-      <blockAlignment value="LEFT"/>
-          <blockValign value="TOP"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="Table_Discount_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_1" fontName="Helvetica-Bold" fontSize="9.0" leading="7" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8a" fontName="Helvetica" fontSize="7.0" leading="8.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9b" fontName="Helvetica" fontSize="8.5" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9b" fontName="Helvetica-Bold" fontSize="12.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right1" fontName="Helvetica-Bold" fontSize="9.0" leading="10.5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
-    <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
-    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
-    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
-    <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
-    <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
-    <para style="terp_default_Centre_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_Centre_9b">Operation N° : [[ o.name ]]</para>
-    <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="115.0,25.0,35.0" repeatRows="1" style="Tableau2">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(o.lines,'line') ]]</para>
-      <blockTable colWidths="115.0,25.0,35.0" style="Tableau3">
-        <tr>
-          <td>
-            <para style="terp_default_9b">[[ len(line.product_id.name) > 39 and line.product_id.name[:39] + '...' or line.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.f' % line.qty ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ '%.2f' % net(line.id) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="175.0" style="Table_Dicount_Total">
-      <tr>
-        <td>
-          <blockTable colWidths="97.0,78.0" style="Table_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Discount : </para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ not(disc(o.id)) and removeParentNode('blockTable') or disc(o.id) ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="97.0,78.0" style="Table_Discount_Total">
-            <tr>
-              <td>
-                <para style="terp_tblheader_Details">Total :</para>
-              </td>
-              <td>
-                <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-    <blockTable colWidths="97.0,78.0" style="Table_Amount">
-      <tr>
-        <td>
-          <para style="terp_default_2">[[ repeatIn(o.statement_ids,'d') ]]</para>
-          <para style="terp_default_Bold_9_Right1">[[ d.name ]]:</para>
-          </td>
-        <td>
-          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
-        </td>
-      </tr>
-	</blockTable>
-
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>

From 0bfdeafc6331f4531a8e92caf16ac1fcaa900d9d Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 11 Oct 2010 15:02:40 +0530
Subject: [PATCH 544/632] [REF]  account/project/analytical account:  change
 the spelling in demo file administratif to administrative

bzr revid: vth@tinyerp.com-20101011093240-kv4hwwvda3po4z8l
---
 addons/account/project/analytic_account_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 3727f7741bf..8f33f70f856 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -198,7 +198,7 @@
             <field name="parent_id" ref="analytic_project_1"/>
         </record>
         <record id="analytic_administratif" model="account.analytic.account">
-            <field name="name">Administratif</field>
+            <field name="name">Administrative</field>
             <field name="code">1</field>
             <field name="parent_id" ref="analytic_internal"/>
         </record>

From afafa2df7b25ee9977f77e42f4b3f888c7b6eac0 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Mon, 11 Oct 2010 15:15:20 +0530
Subject: [PATCH 545/632] [FIX] purchase: Fixed yaml issues due to workflow
 changes.

bzr revid: uco@tinyerp.com-20101011094520-2z1fjpu315t82dam
---
 addons/purchase/purchase_unit_test.xml         | 6 ------
 addons/purchase/test/procurement_buy.yml       | 1 -
 addons/purchase/test/purchase_from_manual.yml  | 6 +-----
 addons/purchase/test/purchase_from_order.yml   | 6 +-----
 addons/purchase/test/purchase_from_picking.yml | 6 +-----
 5 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 0c6de9312c2..93c0e42fae2 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -35,12 +35,6 @@
 
         <workflow model="purchase.order" ref="test_purchase_1" action="purchase_confirm" />
 
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now confirmed">
-            <test expr="state">confirmed</test>
-        </assert>
-
-        <workflow model="purchase.order" ref="test_purchase_1" action="purchase_approve" uid="base.user_root" />
-
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now in progress">
             <test expr="state">approved</test>
         </assert>
diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml
index 4f28ccfafcf..2afd6c2fb62 100644
--- a/addons/purchase/test/procurement_buy.yml
+++ b/addons/purchase/test/procurement_buy.yml
@@ -76,7 +76,6 @@
     import netsvc
     wf_service = netsvc.LocalService("workflow")
     wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr)  
-    wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_approve', cr)  
 -   
   I receive the order of the supplier ASUStek from the Incoming Shipments menu.
 -   
diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml
index e7a608b7557..0c406635b85 100644
--- a/addons/purchase/test/purchase_from_manual.yml
+++ b/addons/purchase/test/purchase_from_manual.yml
@@ -56,7 +56,7 @@
   I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po1}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po1}
 -
   I check that the order which was initially in the confirmed state has transit to approved state.
 -
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
index a13c687c4a5..8c14611661c 100644
--- a/addons/purchase/test/purchase_from_order.yml
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -56,7 +56,7 @@
   I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po0}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po0}
 -
   I check that the order which was initially in the confirmed state has transit to approved state.
 -
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index 6250772a872..d0c1cbcb527 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -56,7 +56,7 @@
  I check that the order which was initially in the draft state has transit to confirm state.
 -
   !assert {model: purchase.order, id: purchase_order_po2}:
-    - state == 'confirmed'  
+    - state == 'approved'  
 -
   I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line.
 -
@@ -101,10 +101,6 @@
     account_obj = self.pool.get('account.invoice')
     ids = account_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
     assert ids, _('Pending Invoice is not created!')
--
-  Supplier approve the purchase order.
--
-  !workflow {model: purchase.order, action: purchase_approve, ref: purchase_order_po2}
 -
  I check that the order which was initially in the confirmed state has transit to approved state.
 -

From e322b982c67bdf68a84192b0643a5e204d765ae3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 11 Oct 2010 15:22:55 +0530
Subject: [PATCH 546/632] [Fix] stock: Stock move set readonly if state is done

bzr revid: sbh@tinyerp.com-20101011095255-c6qyw1t8rt2050h8
---
 addons/stock/stock.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9cd194175f7..c84862e7f59 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1442,16 +1442,16 @@ class stock_move(osv.osv):
         'create_date': fields.datetime('Creation Date', readonly=True),
         'date': fields.datetime('Date', required=True, help="Move date: scheduled date until move is done, then date of actual move processing", readonly=True),
         'date_expected': fields.datetime('Scheduled Date', required=True, help="Scheduled date for the processing of this move"),
-        'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
 
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True,states={'done': [('readonly', True)]}),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,states={'done': [('readonly', True)]}),
         'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM')),
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."),
 
-        'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
-        'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True, select=True, help="Location where the system will stock the finished products."),
+        'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True,states={'done': [('readonly', True)]}, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
+        'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True,states={'done': [('readonly', True)]}, select=True, help="Location where the system will stock the finished products."),
         'address_id': fields.many2one('res.partner.address', 'Destination Address', help="Optional address where goods are to be delivered, specifically used for allotment"),
 
         'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
@@ -1462,7 +1462,7 @@ class stock_move(osv.osv):
         'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Optional: next stock move when chaining them", select=True),
         'move_history_ids': fields.many2many('stock.move', 'stock_move_history_ids', 'parent_id', 'child_id', 'Move History (child moves)'),
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
-        'picking_id': fields.many2one('stock.picking', 'Picking List', select=True),
+        'picking_id': fields.many2one('stock.picking', 'Picking List', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
                                   help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Available\'.\n When the picking is done the state is \'Done\'.\

From 5785d49b746262fe1b4e9b7e35e13c26de605185 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 11 Oct 2010 15:25:42 +0530
Subject: [PATCH 547/632] [REF]

bzr revid: mra@mra-laptop-20101011095542-exml7h0edupu3q8w
---
 addons/account/project/project_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index d5249310276..809f69673fe 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -180,7 +180,6 @@
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" invisible="not context.get('to_invoice', False)"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field name="user_id" invisible="1"/>
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
                     <field name="user_id" invisible="1" />

From 7a30f6643bf23809adf06e14c8ac39ec181b8981 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 15:34:19 +0530
Subject: [PATCH 548/632] remove conflicts

bzr revid: apa@tinyerp.com-20101011100419-jzburzmpos92am48
---
 addons/hr_payroll/report/report_employees_detail.rml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 42127c8283c..9ddad713046 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -440,11 +440,8 @@
           </tr>
         </blockTable>
         <section>
-<<<<<<< TREE
-          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
-=======
+
           <para style="terp_default_9">[[ repeatIn(get_deduct(),'e2') ]]</para>
->>>>>>> MERGE-SOURCE
           <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table8">
             <tr>
               <td>
@@ -500,11 +497,7 @@
           </tr>
         </blockTable>
         <section>
-<<<<<<< TREE
-          <para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
-=======
           <para style="terp_default_9">[[ repeatIn(get_other(),'e3') ]]</para>
->>>>>>> MERGE-SOURCE
           <blockTable colWidths="99.0,73.0,69.0,74.0,70.0,74.0,75.0,72.0,76.0,76.0,76.0,76.0,76.0,76.0" style="Table9">
             <tr>
               <td>

From eaa031075c354bdef9ce568f6d8ca3b41047a3f3 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 11 Oct 2010 15:36:17 +0530
Subject: [PATCH 549/632] remove conflicts

bzr revid: apa@tinyerp.com-20101011100617-noz4sgp9xfpevzgv
---
 .../report/report_emp_salary_structure.rml       | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 8e2b69c43e2..e5505eb5b02 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -437,14 +437,10 @@
         </tr>
       </blockTable>
       <section>
-<<<<<<< TREE
-        <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,70.0,59.0" style="Table5">
-=======
         <para style="terp_default_1">
           <font color="white"> </font>
         </para>
         <blockTable colWidths="34.0,341.0,80.0,83.0" style="Table5">
->>>>>>> MERGE-SOURCE
           <tr>
             <td>
               <para style="terp_tblheader_Details">Code</para>
@@ -484,12 +480,9 @@
         </section>
       </section>
     </section>
-<<<<<<< TREE
-=======
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
->>>>>>> MERGE-SOURCE
     <blockTable colWidths="539.0" style="Table10">
       <tr>
         <td>
@@ -498,14 +491,10 @@
       </tr>
     </blockTable>
     <section>
-<<<<<<< TREE
-      <blockTable colWidths="34.0,116.0,40.0,67.0,44.0,109.0,128.0" style="Table11">
-=======
       <para style="terp_default_1">
         <font color="white"> </font>
       </para>
       <blockTable colWidths="34.0,338.0,82.0,84.0" style="Table11">
->>>>>>> MERGE-SOURCE
         <tr>
           <td>
             <para style="terp_tblheader_Details">Code</para>
@@ -522,13 +511,8 @@
         </tr>
       </blockTable>
       <section>
-<<<<<<< TREE
-        <para style="terp_default_1">[[repeatIn(employee.line_ids,'line1')]]</para>
-        <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,128.0" style="Table12">
-=======
         <para style="terp_default_9">[[repeatIn(employee.line_ids,'line1')]]</para>
         <blockTable colWidths="34.0,338.0,81.0,86.0" style="Table12">
->>>>>>> MERGE-SOURCE
           <tr>
             <td>
               <para style="terp_default_9">[[ line1.code or '' ]]</para>

From 1efa951effb07b835f2a6a0727535caa0cea935b Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 11 Oct 2010 15:46:12 +0530
Subject: [PATCH 550/632] [REF] cleaning code of account_payment

bzr revid: ara@tinyerp.com-20101011101612-g5kumq1dr7i73bn3
---
 addons/account_payment/__init__.py            |  2 +-
 addons/account_payment/__openerp__.py         |  6 ++---
 addons/account_payment/account_move_line.py   | 22 +++++++++----------
 addons/account_payment/account_payment.py     |  2 +-
 addons/account_payment/report/__init__.py     |  6 ++---
 .../account_payment/report/payment_order.py   | 12 +++++-----
 .../wizard/account_payment_order.py           |  2 +-
 .../wizard/account_payment_pay.py             |  2 +-
 .../account_payment_populate_statement.py     |  6 ++---
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/account_payment/__init__.py b/addons/account_payment/__init__.py
index 82a05aa73e9..6188de6a9da 100644
--- a/addons/account_payment/__init__.py
+++ b/addons/account_payment/__init__.py
@@ -29,4 +29,4 @@ import account_move_line
 import account_invoice
 import report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index be0ca2a127b..7ccafd90eb4 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -28,9 +28,9 @@
     "depends": ["account"],
     "init_xml": [],
     "description": """
-    This module provides :
-    * a more efficient way to manage invoice payment.
-    * a basic mechanism to easily plug various automated payment.
+This module provides :
+* a more efficient way to manage invoice payment.
+* a basic mechanism to easily plug various automated payment.
     """,
     'author': 'OpenERP SA',
     'depends': ['account_voucher'],
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 3f9b6c4b094..2b9ea22d824 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -47,7 +47,7 @@ class account_move_line(osv.osv):
         return r
 
     def _to_pay_search(self, cr, uid, obj, name, args, context):
-        if not len(args):
+        if not args:
             return []
         line_obj = self.pool.get('account.move.line')
         query = line_obj._query_get(cr, uid, context={})
@@ -63,17 +63,17 @@ class account_move_line(osv.osv):
         ) %(operator)s %%s ''' % {'operator': x[1]}, args))
         sql_args = tuple(map(itemgetter(2), args))
 
-        cr.execute(('''select id
-            from account_move_line l
-            where account_id in (select id
-                from account_account
-                where type=%s and active)
-            and reconcile_id is null
-            and credit > 0
-            and ''' + where + ' and ' + query), ('payable',)+sql_args )
+        cr.execute(('''SELECT id
+            FROM account_move_line l
+            WHERE account_id IN (select id
+                FROM account_account
+                WHERE type=%s AND active)
+            AND reconcile_id IS null
+            AND credit > 0
+            AND ''' + where + ' and ' + query), ('payable',)+sql_args )
 
         res = cr.fetchall()
-        if not len(res):
+        if not res:
             return [('id','=','0')]
         return [('id','in',map(lambda x:x[0], res))]
 
@@ -110,7 +110,7 @@ class account_move_line(osv.osv):
         return line2bank
 
     _columns = {
-        'amount_to_pay' : fields.function(amount_to_pay, method=True,
+        'amount_to_pay': fields.function(amount_to_pay, method=True,
             type='float', string='Amount to pay', fnct_search=_to_pay_search),
     }
 
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 1c0596ddf96..e4a121fb03e 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -330,7 +330,7 @@ class payment_line(osv.osv):
         'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'),
         'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),
         'date': fields.date('Payment Date', help="If no payment date is specified, the bank will treat this payment line directly"),
-        'create_date': fields.datetime('Created' , readonly=True),
+        'create_date': fields.datetime('Created', readonly=True),
         'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True),
         'bank_statement_line_id': fields.many2one('account.bank.statement.line', 'Bank statement line')
     }
diff --git a/addons/account_payment/report/__init__.py b/addons/account_payment/report/__init__.py
index 5a5c1dab1f2..e9d7f4013ac 100644
--- a/addons/account_payment/report/__init__.py
+++ b/addons/account_payment/report/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,9 +15,9 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import payment_order
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index a00c7a7871b..e0b0713c614 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -31,11 +31,11 @@ class payment_order(report_sxw.rml_parse):
         self.localcontext.update( {
             'time': time,
             'get_invoice_name': self._get_invoice_name,
-            'get_company_currency' : self._get_company_currency,
-            'get_company_currency_symbol': self._get_company_currency_symbol,         
-            'get_amount_total_in_currency' : self._get_amount_total_in_currency,
-            'get_amount_total' : self._get_amount_total,
-            'get_account_name' : self._get_account_name,
+            'get_company_currency': self._get_company_currency,
+            'get_company_currency_symbol': self._get_company_currency_symbol,
+            'get_amount_total_in_currency': self._get_amount_total_in_currency,
+            'get_amount_total': self._get_amount_total,
+            'get_account_name': self._get_account_name,
 
         })
     def _get_invoice_name(self, invoice_id):
@@ -87,4 +87,4 @@ class payment_order(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="external")
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 97a66e937ca..4a070f05a27 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -28,7 +28,7 @@ class payment_order_create(osv.osv_memory):
     Create a payment object with lines corresponding to the account move line
     to pay according to the date and the mode provided by the user.
     Hypothesis:
-    - Small number of non-reconcilied move line , payment mode and bank account type,
+    - Small number of non-reconcilied move line, payment mode and bank account type,
     - Big number of partner and bank account.
 
     If a type is given, unsuitable account Entry lines are ignored.
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 49858151670..132ab33af2c 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -36,7 +36,7 @@ class account_payment_make_payment(osv.osv_memory):
         obj_payment_order.set_done(cr, uid, context['active_id'], context)
         return {}
 #        t = order.mode and order.mode.type.code or 'manual'
-#        if t == 'manual' :
+#        if t == 'manual':
 #            obj_payment_order.set_done(cr,uid,context['active_id'],context)
 #            return {}
 #
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 53c9f14b6e8..7697d4eea6d 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -77,13 +77,13 @@ class account_payment_populate_statement(osv.osv_memory):
 
             if line.partner_id:
 #                line['partner_id'] = mv.partner_id.id
-                if amount < 0 :
+                if amount < 0:
                     account = line.partner_id.property_account_payable.id
-                else :
+                else:
                     account = line.partner_id.property_account_receivable.id
 
             if line.move_line_id:
-                voucher_res = { 'type': 'payment' ,
+                voucher_res = { 'type': 'payment',
                 'name': line.name,
                 'partner_id': line.partner_id.id,
                 'journal_id': statement.journal_id.id,

From fa8bd9305df3ee312c0a6af2ad7a8347cfa27e86 Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 11 Oct 2010 15:53:00 +0530
Subject: [PATCH 551/632] [REF] account

bzr revid: vth@tinyerp.com-20101011102300-59rukbdh3ps9m2dm
---
 .../account_analytic_analysis.py              | 14 +++----
 .../account_analytic_plans.py                 |  6 +--
 .../report/crossovered_analytic.py            |  8 ++--
 addons/analytic/analytic.py                   | 38 +++++++++----------
 .../analytic_journal_billing_rate.py          |  8 ++--
 .../analytic_user_function.py                 |  2 +-
 6 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index d9e9bf3907b..108b6acfc97 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -146,7 +146,7 @@ class account_analytic_account(osv.osv):
                             from account_analytic_line \
                             where account_id IN %s \
                                 and invoice_id is null \
-                            GROUP BY account_analytic_line.account_id" ,(parent_ids,))
+                            GROUP BY account_analytic_line.account_id", (parent_ids,))
                     for account_id, lwd in cr.fetchall():
                         if account_id not in res:
                             res[account_id] = {}
@@ -258,7 +258,7 @@ class account_analytic_account(osv.osv):
                         on account_analytic_line.journal_id = account_analytic_journal.id  \
                     where account_analytic_line.account_id IN %s \
                         and account_analytic_journal.type = 'sale' \
-                    group by account_analytic_line.account_id" ,(parent_ids,))
+                    group by account_analytic_line.account_id", (parent_ids,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
 
@@ -436,7 +436,7 @@ class account_analytic_account_summary_user(osv.osv):
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
         'unit_amount': fields.function(_unit_amount, method=True, type='float',
             string='Total Time'),
-        'user' : fields.many2one('res.users', 'User'),
+        'user': fields.many2one('res.users', 'User'),
     }
 
     def init(self, cr):
@@ -484,7 +484,7 @@ class account_analytic_account_summary_user(osv.osv):
         if fields==None:
             fields = self._columns.keys()
 
-        # construct a clause for the rules :
+        # construct a clause for the rules:
         d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
@@ -493,7 +493,7 @@ class account_analytic_account_summary_user(osv.osv):
         res = []
         cr.execute('SELECT MAX(id) FROM res_users')
         max_user = cr.fetchone()[0]
-        if len(fields_pre) :
+        if fields_pre:
             fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
             for i in range(0, len(ids), cr.IN_MAX):
                 sub_ids = ids[i:i+cr.IN_MAX]
@@ -661,14 +661,14 @@ class account_analytic_account_summary_month(osv.osv):
         if fields==None:
             fields = self._columns.keys()
 
-        # construct a clause for the rules :
+        # construct a clause for the rules:
         d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
 
         res = []
-        if len(fields_pre) :
+        if fields_pre:
             fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
             for i in range(0, len(ids), cr.IN_MAX):
                 sub_ids = ids[i:i+cr.IN_MAX]
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index e85275a9bba..73b0fcb301d 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -200,10 +200,10 @@ class account_analytic_plan_instance(osv.osv):
                 for l in temp_list:
                     if vals.has_key(l):
                         for tempo in vals[l]:
-                            if acct_anal_acct.search(cr, uid, [('parent_id','child_of',[item.root_analytic_id.id]),('id','=',tempo[2]['analytic_account_id'])]):
+                            if acct_anal_acct.search(cr, uid,[('parent_id','child_of',[item.root_analytic_id.id]),('id','=',tempo[2]['analytic_account_id'])]):
                                 total_per_plan += tempo[2]['rate']
                 if total_per_plan < item.min_required or total_per_plan > item.max_required:
-                    raise osv.except_osv(_('Value Error') ,_('The Total Should be Between %s and %s') % (str(item.min_required), str(item.max_required)))
+                    raise osv.except_osv(_('Value Error'),_('The Total Should be Between %s and %s') % (str(item.min_required), str(item.max_required)))
 
         return super(account_analytic_plan_instance, self).create(cr, uid, vals, context)
 
@@ -240,7 +240,7 @@ class account_analytic_plan_instance_line(osv.osv):
         'rate': 100.0
     }
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
         reads = self.read(cr, uid, ids, ['analytic_account_id'], context)
         res = []
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index f8a975a4c25..f4d35f936e1 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -29,8 +29,8 @@ class crossovered_analytic(report_sxw.rml_parse):
         self.localcontext.update( {
             'time': time,
             'lines': self._lines,
-            'ref_lines' : self._ref_lines,
-            'find_children':self.find_children,
+            'ref_lines': self._ref_lines,
+            'find_children': self.find_children,
         })
         self.base_amount = 0.00
 
@@ -99,7 +99,7 @@ class crossovered_analytic(report_sxw.rml_parse):
         if selected_ids:
             query="SELECT sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
                     WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
-    
+
             self.cr.execute(query)
             info=self.cr.dictfetchall()
 
@@ -133,7 +133,7 @@ class crossovered_analytic(report_sxw.rml_parse):
         for acc_id in self.final_list:
             selected_ids = line_pool.search(self.cr,self.uid,[('account_id','=',acc_id),('move_id','in',self.dict_acc_ref[form['ref']])])
             if selected_ids:
-                query="SELECT aaa.code as code , sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty,aaa.name as acc_name,aal.account_id as id  FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                query="SELECT aaa.code as code, sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty,aaa.name as acc_name,aal.account_id as id  FROM account_analytic_line AS aal, account_analytic_account AS aaa \
                 WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"" GROUP BY aal.account_id,aaa.name,aaa.code ORDER BY aal.account_id"
 
                 self.cr.execute(query)
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 66c74a72bc9..5f68cf98c1a 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -156,7 +156,7 @@ class account_analytic_account(osv.osv):
         return dict([(i, res[i]) for i in ids])
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
         res = []
         for account in self.browse(cr, uid, ids, context=context):
@@ -174,7 +174,7 @@ class account_analytic_account(osv.osv):
         return dict(res)
 
     _columns = {
-        'name' : fields.char('Account Name', size=128, required=True),
+        'name': fields.char('Account Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
         'code': fields.char('Account Code', size=24),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
@@ -182,14 +182,14 @@ class account_analytic_account(osv.osv):
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
         'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
-        'balance' : fields.function(_balance_calc, method=True, type='float', string='Balance'),
-        'debit' : fields.function(_debit_calc, method=True, type='float', string='Debit'),
-        'credit' : fields.function(_credit_calc, method=True, type='float', string='Credit'),
+        'balance': fields.function(_balance_calc, method=True, type='float', string='Balance'),
+        'debit': fields.function(_debit_calc, method=True, type='float', string='Debit'),
+        'credit': fields.function(_credit_calc, method=True, type='float', string='Credit'),
         'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'),
         'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
-        'partner_id' : fields.many2one('res.partner', 'Associated Partner'),
-        'contact_id' : fields.many2one('res.partner.address', 'Contact'),
-        'user_id' : fields.many2one('res.users', 'Account Manager'),
+        'partner_id': fields.many2one('res.partner', 'Associated Partner'),
+        'contact_id': fields.many2one('res.partner.address', 'Contact'),
+        'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -210,10 +210,10 @@ class account_analytic_account(osv.osv):
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 
     _defaults = {
-        'type' : 'normal',
+        'type': 'normal',
         'company_id': _default_company,
-        'state' : 'open',
-        'user_id' : lambda self, cr, uid, ctx : uid,
+        'state': 'open',
+        'user_id': lambda self, cr, uid, ctx: uid,
         'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
         'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False),
         'date_start': time.strftime('%Y-%m-%d')
@@ -244,7 +244,7 @@ class account_analytic_account(osv.osv):
             partner = parent['partner_id'][0]
         else:
             partner = False
-        res = {'value' : {}}
+        res = {'value': {}}
         if partner:
             res['value']['partner_id'] = partner
         return res
@@ -271,19 +271,19 @@ class account_analytic_line(osv.osv):
     _description = 'Analytic Line'
 
     _columns = {
-        'name' : fields.char('Description', size=256, required=True),
-        'date' : fields.date('Date', required=True, select=1),
-        'amount' : fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
-        'unit_amount' : fields.float('Quantity', help='Specifies the amount of quantity to count.'),
-        'account_id' : fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
-        'user_id' : fields.many2one('res.users', 'User'),
+        'name': fields.char('Description', size=256, required=True),
+        'date': fields.date('Date', required=True, select=1),
+        'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
+        'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
+        'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 
     }
     _defaults = {
         'date': time.strftime('%Y-%m-%d'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
-        'amount' : 0.00
+        'amount': 0.00
     }
 
     _order = 'date desc'
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
index 609d1cad7d9..5718a9fdaa7 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -38,7 +38,7 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'journal_rate_ids' : fields.one2many('analytic_journal_rate_grid', 'account_id', 'Invoicing Rate per Journal'),
+        'journal_rate_ids': fields.one2many('analytic_journal_rate_grid', 'account_id', 'Invoicing Rate per Journal'),
     }
 
 account_analytic_account()
@@ -92,7 +92,7 @@ class hr_analytic_timesheet(osv.osv):
         if to_invoice:
             res.setdefault('value',{})
             res['value']['to_invoice'] = to_invoice[0]
-    
+
         return res
 
 hr_analytic_timesheet()
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 21fe0a7da29..04f66fb8daa 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -40,7 +40,7 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'user_product_ids' : fields.one2many('analytic_user_funct_grid', 'account_id', 'Users/Products Rel.'),
+        'user_product_ids': fields.one2many('analytic_user_funct_grid', 'account_id', 'Users/Products Rel.'),
     }
 
 account_analytic_account()

From f9eb2e0260ba98475860e4daef7d12814fd40b5e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 12:24:39 +0200
Subject: [PATCH 552/632] [FIX] addons: fixed cross-platform compatibility for
 get_module_resource()

bzr revid: odo@openerp.com-20101011102439-qgrsxquxdmasnty8
---
 bin/addons/__init__.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 8e75a7d1124..72e9fb2c6e2 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -273,13 +273,12 @@ def get_module_resource(module, *args):
     res = a and opj(a, *args) or False
     if zipfile.is_zipfile( a +'.zip') :
         zip = zipfile.ZipFile( a + ".zip")
-        files = [opj(a,'/'.join(f.split('/')[1:])) for f in zip.namelist()]
+        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
+        res = '/'.join(args)
         if res in files:
-            return res
-    else:
-        if os.path.isfile(res):
-            return res
-    
+            return opj(a, res)
+    elif os.path.isfile(res):
+        return res
     return False
 
 

From ebb0595c549b3e2472bf2242e217c98c091d0f1e Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.com>
Date: Mon, 11 Oct 2010 16:08:56 +0530
Subject: [PATCH 553/632] Removed the conflict

bzr revid: jni@tinyerp.com-20101011103856-dvfjcx75kpntp591
---
 addons/stock/stock_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b1f624b8012..9e948ea2b77 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1705,9 +1705,7 @@
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
                     </group>
-<<<<<<< TREE
-            <field name="name">Delivery Products vs Planned</field>
-=======
+
                     <group colspan="2" col="2">
                         <separator string="Dates &amp; Priority" colspan="2" />
                         <field name="date" groups="base.group_extended"/>

From 9df06539a4e6b4f280ed1cd3096ac7e8c1302f08 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 11 Oct 2010 16:19:13 +0530
Subject: [PATCH 554/632] [MOD/IMP] : Usability Improvement

bzr revid: amp@tinyerp.com-20101011104913-7apvg28gokrjjdht
---
 addons/crm/crm_meeting_view.xml                      | 2 +-
 addons/report_designer/installer.py                  | 1 -
 addons/report_designer/report_designer_installer.xml | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aa8b6cc4820..62d4e9cd59b 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -36,7 +36,7 @@
                     <field name="date" string="Start Date" required="1"
                         on_change="onchange_dates(date,duration,False,allday)" />
                     <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False,allday)" />
+                        on_change="onchange_dates(date,duration,False,allday)" readonly="1" />
                     <field name="date_deadline" string="End Date" required="1"
                         on_change="onchange_dates(date,False,date_deadline)" />
                     <field name="location" />
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index 1accab65c0b..f849392d328 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -31,7 +31,6 @@ class report_designer_installer(osv.osv_memory):
                                 "upload the report using the same wizard."),
         'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
                                 "reports  on several objects. It's a SQL query builder and browser for end users."),
-        'olap':fields.boolean('Business Intelligence Report',help="Helps you manage Online Analytical Process with the mdx query and provides Cube Designing and Cube Browsing"),
     }
 report_designer_installer()
 
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index b377331a208..2f838c0b74c 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -28,7 +28,6 @@
           <group colspan="8">
             <field name="base_report_designer"/>
             <field name="base_report_creator"/>
-            <field name="olap"/>
           </group>
         </data>
       </field>

From 15da4879d949b075b7620d1baeaf2621586df7fc Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 11 Oct 2010 16:21:16 +0530
Subject: [PATCH 555/632] [REF] Account followup

bzr revid: mra@mra-laptop-20101011105116-oe24vzkv2etdehcl
---
 addons/account_followup/account_followup.py          |  8 ++++----
 .../wizard/account_followup_print.py                 | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 02986acb184..1d0ca8a500c 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -32,7 +32,7 @@ class followup(osv.osv):
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
-                }
+    }
 
 followup()
 
@@ -46,7 +46,7 @@ class followup_line(osv.osv):
         'start': fields.selection([('days','Net Days'),('end_of_month','End of Month')], 'Type of Term', size=64, required=True),
         'followup_id': fields.many2one('account_followup.followup', 'Follow Ups', required=True, ondelete="cascade"),
         'description': fields.text('Printed Message', translate=True),
-                }
+    }
 
 followup_line()
 
@@ -63,7 +63,7 @@ class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
         'follow_up_msg' : fields.text('Follow-up Message', translate=True),
-                }
+    }
 
     _defaults = {
         'overdue_msg': '''
@@ -80,7 +80,7 @@ Thanks,
 %(user_signature)s
 %(company_name)s
         '''
-                }
+    }
 
 res_company()
 
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index fe635a080c7..be353220e99 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -61,12 +61,12 @@ class account_followup_print(osv.osv_memory):
             'views': [(resource_id,'form')],
             'type': 'ir.actions.act_window',
             'target': 'new',
-            }
+    }
 
     _defaults = {
          'date': time.strftime('%Y-%m-%d'),
          'followup_id': _get_followup,
-                 }
+    }
 
 account_followup_print()
 
@@ -80,7 +80,7 @@ class account_followup_print_all(osv.osv_memory):
         'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'),
         'email_body': fields.text('Email body'),
         'summary': fields.text('Summary', required=True, readonly=True)
-                }
+    }
     def _get_summary(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -285,14 +285,14 @@ class account_followup_print_all(osv.osv_memory):
              'ids': [],
              'model': 'account_followup.followup',
              'form': data
-                 }
+        }
 
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account_followup.followup.print',
             'datas': datas,
-            }
+        }
 
 account_followup_print_all()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From faf70e7b3af98de4aefa60529ff03d054ec72503 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 11 Oct 2010 16:55:50 +0530
Subject: [PATCH 556/632] [IMP] account_analytic_analysis,
 account_analytic_default, account_analytic_plans: code cleaning

bzr revid: psi@tinyerp.co.in-20101011112550-ygkqmzmuhu1j7dm3
---
 .../account_analytic_entries_report_view.xml  |  24 +-
 .../account_analytic_analysis.py              | 217 +++++++++---------
 .../account_analytic_default.py               |  71 +++---
 .../account_analytic_plans.py                 | 181 ++++++++-------
 .../report/crossovered_analytic.py            |  71 +++---
 .../wizard/account_crossovered_analytic.py    |  23 +-
 .../wizard/analytic_plan_create_model.py      |  12 +-
 7 files changed, 300 insertions(+), 299 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 34d23826e80..6f1094599b5 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -56,18 +56,7 @@
                     </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="currency_id" widget="selection"/>
-                    <field name="general_account_id" widget="selection"/>
-                    <field name="product_uom_id" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -83,6 +72,17 @@
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="currency_id" widget="selection"/>
+                    <field name="general_account_id" widget="selection"/>
+                    <field name="product_uom_id" widget="selection"/>
+                    <field name="journal_id" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 108b6acfc97..633524e3aaa 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -34,7 +34,7 @@ class account_analytic_account(osv.osv):
         dp = 2
         res = dict([(i, {}) for i in ids])
 
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context))
         accounts = self.browse(cr, uid, ids, context=context)
 
         for f in fields:
@@ -62,10 +62,10 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = 0.0
                 if parent_ids:
-                    cr.execute("select account_analytic_line.account_id, max(date) \
-                            from account_analytic_line \
-                            where account_id IN %s \
-                                and invoice_id is not null \
+                    cr.execute("SELECT account_analytic_line.account_id, MAX(date) \
+                            FROM account_analytic_line \
+                            WHERE account_id IN %s \
+                                AND invoice_id IS NOT NULL \
                             GROUP BY account_analytic_line.account_id;", (parent_ids,))
                     for account_id, sum in cr.fetchall():
                         if account_id not in res:
@@ -85,25 +85,25 @@ class account_analytic_account(osv.osv):
                     # This computation doesn't take care of pricelist !
                     # Just consider list_price
                     cr.execute("""SELECT account_analytic_account.id, \
-                                COALESCE(sum (product_template.list_price * \
+                                COALESCE(SUM (product_template.list_price * \
                                     account_analytic_line.unit_amount * \
-                                    ((100-hr_timesheet_invoice_factor.factor)/100)),0.0) \
+                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
                                     AS ca_to_invoice \
                             FROM product_template \
-                            join product_product \
-                                on product_template.id = product_product.product_tmpl_id \
+                            JOIN product_product \
+                                ON product_template.id = product_product.product_tmpl_id \
                             JOIN account_analytic_line \
-                                on account_analytic_line.product_id = product_product.id \
+                                ON account_analytic_line.product_id = product_product.id \
                             JOIN account_analytic_journal \
-                                on account_analytic_line.journal_id = account_analytic_journal.id \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
                             JOIN account_analytic_account \
-                                on account_analytic_account.id = account_analytic_line.account_id \
+                                ON account_analytic_account.id = account_analytic_line.account_id \
                             JOIN hr_timesheet_invoice_factor \
-                                on hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
+                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
                             WHERE account_analytic_account.id IN %s \
-                                AND account_analytic_line.invoice_id is null \
+                                AND account_analytic_line.invoice_id IS NULL \
                                 AND account_analytic_line.to_invoice IS NOT NULL \
-                                and account_analytic_journal.type in ('purchase','general') \
+                                AND account_analytic_journal.type IN ('purchase','general') \
                             GROUP BY account_analytic_account.id;""", (parent_ids,))
                     for account_id, sum in cr.fetchall():
                         if account_id not in res:
@@ -124,13 +124,13 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = ''
                 if parent_ids:
-                    cr.execute ("select account_analytic_line.account_id, \
-                                date(max(account_invoice.date_invoice)) \
-                            from account_analytic_line \
-                            join account_invoice \
-                                on account_analytic_line.invoice_id = account_invoice.id \
-                            where account_analytic_line.account_id IN %s \
-                                and account_analytic_line.invoice_id is not null \
+                    cr.execute ("SELECT account_analytic_line.account_id, \
+                                DATE(MAX(account_invoice.date_invoice)) \
+                            FROM account_analytic_line \
+                            JOIN account_invoice \
+                                ON account_analytic_line.invoice_id = account_invoice.id \
+                            WHERE account_analytic_line.account_id IN %s \
+                                AND account_analytic_line.invoice_id IS NOT NULL \
                             GROUP BY account_analytic_line.account_id",(parent_ids,))
                     for account_id, lid in cr.fetchall():
                         res[account_id][f] = lid
@@ -142,11 +142,11 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = ''
                 if parent_ids:
-                    cr.execute("select account_analytic_line.account_id, max(date) \
-                            from account_analytic_line \
-                            where account_id IN %s \
-                                and invoice_id is null \
-                            GROUP BY account_analytic_line.account_id", (parent_ids,))
+                    cr.execute("SELECT account_analytic_line.account_id, MAX(date) \
+                            FROM account_analytic_line \
+                            WHERE account_id IN %s \
+                                AND invoice_id IS NULL \
+                            GROUP BY account_analytic_line.account_id" ,(parent_ids,))
                     for account_id, lwd in cr.fetchall():
                         if account_id not in res:
                             res[account_id] = {}
@@ -159,13 +159,13 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = 0.0
                 if parent_ids:
-                    cr.execute("select account_analytic_line.account_id, COALESCE(sum(unit_amount),0.0) \
-                            from account_analytic_line \
-                            join account_analytic_journal \
-                                on account_analytic_line.journal_id = account_analytic_journal.id \
-                            where account_analytic_line.account_id IN %s \
-                                and account_analytic_journal.type='general' \
-                                and invoice_id is null \
+                    cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(unit_amount), 0.0) \
+                            FROM account_analytic_line \
+                            JOIN account_analytic_journal \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
+                            WHERE account_analytic_line.account_id IN %s \
+                                AND account_analytic_journal.type='general' \
+                                AND invoice_id IS NULL \
                                 AND to_invoice IS NOT NULL \
                             GROUP BY account_analytic_line.account_id;",(parent_ids,))
                     for account_id, sua in cr.fetchall():
@@ -182,12 +182,12 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = 0.0
                 if parent_ids:
-                    cr.execute("select account_analytic_line.account_id,COALESCE(SUM(unit_amount),0.0) \
-                            from account_analytic_line \
-                            join account_analytic_journal \
-                                on account_analytic_line.journal_id = account_analytic_journal.id \
-                            where account_analytic_line.account_id IN %s \
-                                and account_analytic_journal.type='general' \
+                    cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(unit_amount), 0.0) \
+                            FROM account_analytic_line \
+                            JOIN account_analytic_journal \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
+                            WHERE account_analytic_line.account_id IN %s \
+                                AND account_analytic_journal.type='general' \
                             GROUP BY account_analytic_line.account_id",(parent_ids,))
                     ff =  cr.fetchall()
                     for account_id, hq in ff:
@@ -211,24 +211,24 @@ class account_analytic_account(osv.osv):
                 # This computation doesn't take care of pricelist !
                 # Just consider list_price
                 if parent_ids:
-                    cr.execute("""select account_analytic_line.account_id as account_id, \
-                                COALESCE(sum((account_analytic_line.unit_amount * pt.list_price) \
+                    cr.execute("""SELECT account_analytic_line.account_id AS account_id, \
+                                COALESCE(SUM((account_analytic_line.unit_amount * pt.list_price) \
                                     - (account_analytic_line.unit_amount * pt.list_price \
-                                        * hr.factor)),0.0) as somme
-                            from account_analytic_line \
-                            left join account_analytic_journal \
-                                on (account_analytic_line.journal_id = account_analytic_journal.id) \
-                            join product_product pp \
-                                on (account_analytic_line.product_id = pp.id) \
-                            join product_template pt \
-                                on (pp.product_tmpl_id = pt.id) \
-                            join account_analytic_account a \
-                                on (a.id=account_analytic_line.account_id) \
-                            join hr_timesheet_invoice_factor hr \
-                                on (hr.id=a.to_invoice) \
-                        where account_analytic_line.account_id IN %s \
-                            and a.to_invoice IS NOT NULL \
-                            and account_analytic_journal.type IN ('purchase','general')
+                                        * hr.factor)), 0.0) AS somme
+                            FROM account_analytic_line \
+                            LEFT JOIN account_analytic_journal \
+                                ON (account_analytic_line.journal_id = account_analytic_journal.id) \
+                            JOIN product_product pp \
+                                ON (account_analytic_line.product_id = pp.id) \
+                            JOIN product_template pt \
+                                ON (pp.product_tmpl_id = pt.id) \
+                            JOIN account_analytic_account a \
+                                ON (a.id=account_analytic_line.account_id) \
+                            JOIN hr_timesheet_invoice_factor hr \
+                                ON (hr.id=a.to_invoice) \
+                        WHERE account_analytic_line.account_id IN %s \
+                            AND a.to_invoice IS NOT NULL \
+                            AND account_analytic_journal.type IN ('purchase', 'general')
                         GROUP BY account_analytic_line.account_id""",(parent_ids,))
                     for account_id, sum in cr.fetchall():
                         res2[account_id] = round(sum, dp)
@@ -250,53 +250,51 @@ class account_analytic_account(osv.osv):
 
     def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context))
         if parent_ids:
-            cr.execute("select account_analytic_line.account_id, COALESCE(sum(amount_currency),0.0) \
-                    from account_analytic_line \
-                    join account_analytic_journal \
-                        on account_analytic_line.journal_id = account_analytic_journal.id  \
-                    where account_analytic_line.account_id IN %s \
-                        and account_analytic_journal.type = 'sale' \
-                    group by account_analytic_line.account_id", (parent_ids,))
+            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount_currency), 0.0) \
+                    FROM account_analytic_line \
+                    JOIN account_analytic_journal \
+                        ON account_analytic_line.journal_id = account_analytic_journal.id  \
+                    WHERE account_analytic_line.account_id IN %s \
+                        AND account_analytic_journal.type = 'sale' \
+                    GROUP BY account_analytic_line.account_id", (parent_ids,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-
-        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
+        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context)
 
     def _total_cost_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context))
         if parent_ids:
-            cr.execute("""select account_analytic_line.account_id,COALESCE(sum(amount_currency),0.0) \
-
-                    from account_analytic_line \
-                    join account_analytic_journal \
-                        on account_analytic_line.journal_id = account_analytic_journal.id \
-                    where account_analytic_line.account_id IN %s \
-                        and amount<0 \
+            cr.execute("""SELECT account_analytic_line.account_id, COALESCE(SUM(amount_currency), 0.0) \
+                    FROM account_analytic_line \
+                    JOIN account_analytic_journal \
+                        ON account_analytic_line.journal_id = account_analytic_journal.id \
+                    WHERE account_analytic_line.account_id IN %s \
+                        AND amount<0 \
                     GROUP BY account_analytic_line.account_id""",(parent_ids,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
+        return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context)
 
     def _remaining_hours_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             if account.quantity_max != 0:
                 res[account.id] = account.quantity_max - account.hours_quantity
             else:
-                res[account.id]=0.0
+                res[account.id] = 0.0
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
         return res
 
     def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = account.hours_quantity - account.hours_qtt_non_invoiced
             if res[account.id] < 0:
-                res[account.id]=0.0
+                res[account.id] = 0.0
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
         return res
@@ -414,7 +412,7 @@ class account_analytic_account_summary_user(osv.osv):
         max_user = cr.fetchone()[0]
         account_ids = [int(str(x/max_user - (x%max_user == 0 and 1 or 0))) for x in ids]
         user_ids = [int(str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user))) for x in ids]
-        parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
+        parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)], context=context))
         if parent_ids:
             cr.execute('SELECT id, unit_amount ' \
                     'FROM account_analytic_analysis_summary_user ' \
@@ -477,19 +475,19 @@ class account_analytic_account_summary_user(osv.osv):
 
     def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
         if not context:
-            context={}
+            context = {}
         if not ids:
             return []
 
-        if fields==None:
+        if fields is None:
             fields = self._columns.keys()
+        res_trans_obj = self.pool.get('ir.translation')
 
         # construct a clause for the rules:
         d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
-
         res = []
         cr.execute('SELECT MAX(id) FROM res_users')
         max_user = cr.fetchone()[0]
@@ -498,9 +496,9 @@ class account_analytic_account_summary_user(osv.osv):
             for i in range(0, len(ids), cr.IN_MAX):
                 sub_ids = ids[i:i+cr.IN_MAX]
                 if d1:
-                    cr.execute('select %s from \"%s\" where id IN (%s) ' \
-                            'and account_id IN (%s) ' \
-                            'and "user" IN (%s) and %s order by %s' % \
+                    cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \
+                            'AND account_id IN (%s) ' \
+                            'AND "user" IN (%s) AND %s ORDER BY %s' % \
                             (','.join(fields_pre2 + ['id']), self._table,
                                 ','.join([str(x) for x in sub_ids]),
                                 ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]),
@@ -510,9 +508,9 @@ class account_analytic_account_summary_user(osv.osv):
                         raise except_orm(_('AccessError'),
                                 _('You try to bypass an access rule (Document type: %s).') % self._description)
                 else:
-                    cr.execute('select %s from \"%s\" where id IN (%s) ' \
-                            'and account_id IN (%s) ' \
-                            'and "user" IN (%s) order by %s' % \
+                    cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \
+                            'AND account_id IN (%s) ' \
+                            'AND "user" IN (%s) ORDER BY %s' % \
                             (','.join(fields_pre2 + ['id']), self._table,
                                 ','.join([str(x) for x in sub_ids]),
                                 ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]),
@@ -521,7 +519,6 @@ class account_analytic_account_summary_user(osv.osv):
                 res.extend(cr.dictfetchall())
         else:
             res = map(lambda x: {'id': x}, ids)
-        res_trans_obj = self.pool.get('ir.translation')
         for f in fields_pre:
             if self._columns[f].translate:
                 ids = map(lambda x: x['id'], res)
@@ -579,7 +576,7 @@ class account_analytic_account_summary_month(osv.osv):
         account_obj = self.pool.get('account.analytic.account')
         account_ids = [int(str(int(x))[:-6]) for x in ids]
         month_ids = [int(str(int(x))[-6:]) for x in ids]
-        parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
+        parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)], context=context))
         if parent_ids:
             cr.execute('SELECT id, unit_amount ' \
                     'FROM account_analytic_analysis_summary_month ' \
@@ -598,11 +595,9 @@ class account_analytic_account_summary_month(osv.osv):
         return res
 
     _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',
-            readonly=True),
-        'unit_amount': fields.function(_unit_amount, method=True, type='float',
-            string='Total Time'),
-        'month': fields.char('Month', size=25, readonly=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'unit_amount': fields.function(_unit_amount, method=True, type='float', string='Total Time'),
+        'month': fields.char('Month', size=32, readonly=True),
     }
 
     def init(self, cr):
@@ -654,28 +649,27 @@ class account_analytic_account_summary_month(osv.osv):
 
     def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
         if not context:
-            context={}
+            context = {}
         if not ids:
             return []
 
-        if fields==None:
+        if fields is None:
             fields = self._columns.keys()
-
-        # construct a clause for the rules:
-        d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name)
+        res_trans_obj = self.pool.get('ir.translation')
+        # construct a clause for the rules :
+        d1, d2, tables= self.pool.get('ir.rule').domain_get(cr, user, self._name)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
-
         res = []
         if fields_pre:
             fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
             for i in range(0, len(ids), cr.IN_MAX):
                 sub_ids = ids[i:i+cr.IN_MAX]
                 if d1:
-                    cr.execute('select %s from \"%s\" where id IN (%s) ' \
-                            'and account_id IN (%s) ' \
-                            'and month_id IN (%s) and %s order by %s' % \
+                    cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \
+                            'AND account_id IN (%s) ' \
+                            'AND month_id IN (%s) AND %s ORDER BY %s' % \
                             (','.join(fields_pre2 + ['id']), self._table,
                                 ','.join([str(x) for x in sub_ids]),
                                 ','.join([str(x)[:-6] for x in sub_ids]),
@@ -685,9 +679,9 @@ class account_analytic_account_summary_month(osv.osv):
                         raise except_orm(_('AccessError'),
                                 _('You try to bypass an access rule (Document type: %s).') % self._description)
                 else:
-                    cr.execute('select %s from \"%s\" where id IN (%s) ' \
-                            'and account_id IN (%s) ' \
-                            'and month_id IN (%s) order by %s' % \
+                    cr.execute('SELECT %s FROM \"%s\" WHERE id IN (%s) ' \
+                            'AND account_id IN (%s) ' \
+                            'AND month_id IN (%s) ORDER BY %s' % \
                             (','.join(fields_pre2 + ['id']), self._table,
                                 ','.join([str(x) for x in sub_ids]),
                                 ','.join([str(x)[:-6] for x in sub_ids]),
@@ -697,7 +691,6 @@ class account_analytic_account_summary_month(osv.osv):
         else:
             res = map(lambda x: {'id': x}, ids)
 
-        res_trans_obj = self.pool.get('ir.translation')
         for f in fields_pre:
             if self._columns[f].translate:
                 ids = map(lambda x: x['id'], res)
@@ -739,10 +732,8 @@ class account_analytic_account_summary_month(osv.osv):
             res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res)
             for record in res:
                 record[f] = res2[record['id']]
-
         return res
 
 account_analytic_account_summary_month()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index dce86597a4c..ebc78956a93 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -21,13 +21,13 @@
 
 import time
 
-from osv import fields,osv
+from osv import fields, osv
 
 class account_analytic_default(osv.osv):
-    _name = 'account.analytic.default'
-    _description = 'Analytic Distribution'
-    _rec_name = 'analytic_id'
-    _order = 'sequence'
+    _name = "account.analytic.default"
+    _description = "Analytic Distribution"
+    _rec_name = "analytic_id"
+    _order = "sequence"
     _columns = {
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution."),
         'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
@@ -38,50 +38,50 @@ class account_analytic_default(osv.osv):
         'date_start': fields.date('Start Date'),
         'date_stop': fields.date('End Date'),
     }
-    
+
     def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None):
         domain = []
         if product_id:
-            domain += ['|',('product_id','=',product_id)]
-        domain += [('product_id','=',False)]
+            domain += ['|', ('product_id', '=', product_id)]
+        domain += [('product_id','=', False)]
         if partner_id:
-            domain += ['|',('partner_id','=',partner_id)]
-        domain += [('partner_id','=',False)]
+            domain += ['|', ('partner_id', '=', partner_id)]
+        domain += [('partner_id', '=', False)]
         if user_id:
-            domain += ['|',('user_id','=',user_id)]
-        domain += [('user_id','=',False)]
+            domain += ['|',('user_id', '=', user_id)]
+        domain += [('user_id','=', False)]
         if date:
-            domain += ['|',('date_start','<=',date),('date_start','=',False)]
-            domain += ['|',('date_stop','>=',date),('date_stop','=',False)]
+            domain += ['|', ('date_start', '<=', date), ('date_start', '=', False)]
+            domain += ['|', ('date_stop', '>=', date), ('date_stop', '=', False)]
         best_index = -1
         res = False
         for rec in self.browse(cr, uid, self.search(cr, uid, domain, context=context), context=context):
             index = 0
-            if rec.product_id: index+=1
-            if rec.partner_id: index+=1
-            if rec.user_id: index+=1
-            if rec.date_start: index+=1
-            if rec.date_stop: index+=1
-            if index>best_index:
+            if rec.product_id: index += 1
+            if rec.partner_id: index += 1
+            if rec.user_id: index += 1
+            if rec.date_start: index += 1
+            if rec.date_stop: index += 1
+            if index > best_index:
                 res = rec
                 best_index = index
         return res
-    
+
 account_analytic_default()
 
 class account_invoice_line(osv.osv):
-    _inherit = 'account.invoice.line'
-    _description = 'Invoice Line'
+    _inherit = "account.invoice.line"
+    _description = "Invoice Line"
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context)
-        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context)
+        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec:
-            res_prod['value'].update({'account_analytic_id':rec.analytic_id.id})
+            res_prod['value'].update({'account_analytic_id': rec.analytic_id.id})
         else:
-            res_prod['value'].update({'account_analytic_id':False})
+            res_prod['value'].update({'account_analytic_id': False})
         return res_prod
-    
+
 account_invoice_line()
 
 
@@ -95,28 +95,27 @@ class stock_picking(osv.osv):
         if rec:
             return rec.analytic_id.id
 
-        return super(stock_picking, self)._get_account_analytic_invoice(cursor,
-                user, picking, move_line)
+        return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 
 stock_picking()
 
 class sale_order_line(osv.osv):
-    _inherit = 'sale.order.line'
+    _inherit = "sale.order.line"
 
     # Method overridden to set the analytic account by default on criterion match
     def invoice_line_create(self, cr, uid, ids, context=None):
-        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context=context)
         if not ids:
             return create_ids
-        sale_line = self.browse(cr, uid, ids[0], context)
+        sale_line = self.browse(cr, uid, ids[0], context=context)
         inv_line_obj = self.pool.get('account.invoice.line')
         anal_def_obj = self.pool.get('account.analytic.default')
 
-        for line in inv_line_obj.browse(cr, uid, create_ids, context):
-            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, sale_line.order_id.user_id.id, time.strftime('%Y-%m-%d'), context)
+        for line in inv_line_obj.browse(cr, uid, create_ids, context=context):
+            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, sale_line.order_id.user_id.id, time.strftime('%Y-%m-%d'), context=context)
 
             if rec:
-                inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)
+                inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id': rec.analytic_id.id}, context=context)
         return create_ids
 
 sale_order_line()
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 73b0fcb301d..0e3ec4b33ca 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -18,8 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from lxml import etree
+
 import time
+from lxml import etree
 
 from osv import fields, osv
 import tools
@@ -34,10 +35,10 @@ class one2many_mod2(fields.one2many):
             res[id] = []
         ids2 = None
         if 'journal_id' in context:
-            journal = obj.pool.get('account.journal').browse(cr, user, context['journal_id'], context)
+            journal = obj.pool.get('account.journal').browse(cr, user, context['journal_id'], context=context)
             pnum = int(name[7]) -1
             plan = journal.plan_id
-            if plan and len(plan.plan_ids)>pnum:
+            if plan and len(plan.plan_ids) > pnum:
                 acc_id = plan.plan_ids[pnum].root_analytic_id.id
                 ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('analytic_account_id','child_of',[acc_id])], limit=self._limit)
         if ids2 is None:
@@ -50,8 +51,8 @@ class account_analytic_plan(osv.osv):
     _name = "account.analytic.plan"
     _description = "Analytic Plan"
     _columns = {
-        'name': fields.char('Analytic Plan', size=64, required=True, select=True,),
-        'plan_ids': fields.one2many('account.analytic.plan.line','plan_id','Analytic Plans'),
+        'name': fields.char('Analytic Plan', size=64, required=True, select=True),
+        'plan_ids': fields.one2many('account.analytic.plan.line', 'plan_id', 'Analytic Plans'),
     }
 
 account_analytic_plan()
@@ -61,10 +62,10 @@ class account_analytic_plan_line(osv.osv):
     _description = "Analytic Plan Line"
     _order = "sequence, id"
     _columns = {
-        'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
+        'plan_id': fields.many2one('account.analytic.plan','Analytic Plan'),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
-        'sequence':fields.integer('Sequence'),
-        'root_analytic_id': fields.many2one('account.analytic.account','Root Account',help="Root account of this plan.",required=False),
+        'sequence': fields.integer('Sequence'),
+        'root_analytic_id': fields.many2one('account.analytic.account', 'Root Account', help="Root account of this plan.", required=False),
         'min_required': fields.float('Minimum Allowed (%)'),
         'max_required': fields.float('Maximum Allowed (%)'),
     }
@@ -76,27 +77,28 @@ class account_analytic_plan_line(osv.osv):
 account_analytic_plan_line()
 
 class account_analytic_plan_instance(osv.osv):
-    _name = 'account.analytic.plan.instance'
-    _description = 'Analytic Plan Instance'
+    _name = "account.analytic.plan.instance"
+    _description = "Analytic Plan Instance"
     _columns = {
-        'name':fields.char('Analytic Distribution', size=64),
-        'code':fields.char('Distribution Code', size=16),
+        'name': fields.char('Analytic Distribution', size=64),
+        'code': fields.char('Distribution Code', size=16),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal' ),
-        'account_ids':fields.one2many('account.analytic.plan.instance.line', 'plan_id', 'Account Id'),
-        'account1_ids':one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account1 Id'),
-        'account2_ids':one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account2 Id'),
-        'account3_ids':one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account3 Id'),
-        'account4_ids':one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account4 Id'),
-        'account5_ids':one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account5 Id'),
-        'account6_ids':one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account6 Id'),
-        'plan_id':fields.many2one('account.analytic.plan', "Model's Plan"),
+        'account_ids': fields.one2many('account.analytic.plan.instance.line', 'plan_id', 'Account Id'),
+        'account1_ids': one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account1 Id'),
+        'account2_ids': one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account2 Id'),
+        'account3_ids': one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account3 Id'),
+        'account4_ids': one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account4 Id'),
+        'account5_ids': one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account5 Id'),
+        'account6_ids': one2many_mod2('account.analytic.plan.instance.line', 'plan_id', 'Account6 Id'),
+        'plan_id': fields.many2one('account.analytic.plan', "Model's Plan"),
     }
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
+        journal_obj = self.pool.get('account.journal')
         if context.get('journal_id', False):
-            journal = self.pool.get('account.journal').browse(cr, user, [context['journal_id']], context=context)[0]
+            journal = journal_obj.browse(cr, user, [context['journal_id']], context=context)[0]
             analytic_journal = journal.analytic_journal_id and journal.analytic_journal_id.id or False
             args.append('|')
             args.append(('journal_id', '=', analytic_journal))
@@ -108,15 +110,16 @@ class account_analytic_plan_instance(osv.osv):
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-            default.update({'account1_ids':False, 'account2_ids':False, 'account3_ids':False,
+        default.update({'account1_ids':False, 'account2_ids':False, 'account3_ids':False,
                 'account4_ids':False, 'account5_ids':False, 'account6_ids':False})
-        return super(account_analytic_plan_instance, self).copy(cr, uid, id, default, context)
+        return super(account_analytic_plan_instance, self).copy(cr, uid, id, default, context=context)
 
     def _default_journal(self, cr, uid, context=None):
         if not context:
             context = {}
+        journal_obj = self.pool.get('account.journal')
         if context.has_key('journal_id') and context['journal_id']:
-            journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
+            journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
             if journal.analytic_journal_id:
                 return journal.analytic_journal_id.id
         return False
@@ -127,7 +130,7 @@ class account_analytic_plan_instance(osv.osv):
     }
     def name_get(self, cr, uid, ids, context=None):
         res = []
-        for inst in self.browse(cr, uid, ids, context):
+        for inst in self.browse(cr, uid, ids, context=context):
             name = inst.name or '/'
             if name and inst.code:
                 name=name+' ('+inst.code+')'
@@ -135,7 +138,7 @@ class account_analytic_plan_instance(osv.osv):
         return res
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
-        args= args or []
+        args = args or []
         if name:
             ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context or {})
             if not ids:
@@ -145,15 +148,16 @@ class account_analytic_plan_instance(osv.osv):
         return self.name_get(cr, uid, ids, context or {})
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        wiz_id = self.pool.get('ir.actions.act_window').search(cr, uid, [("name","=","analytic.plan.create.model.action")])
+        wiz_id = self.pool.get('ir.actions.act_window').search(cr, uid, [("name","=","analytic.plan.create.model.action")], context=context)
         res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-
+        journal_obj = self.pool.get('account.journal')
+        analytic_plan_obj = self.pool.get('account.analytic.plan')
         if (res['type']=='form'):
             plan_id = False
-            if context.get('journal_id',False):
-                plan_id = self.pool.get('account.journal').browse(cr, uid, int(context['journal_id']), context).plan_id
-            elif context.get('plan_id',False):
-                plan_id = self.pool.get('account.analytic.plan').browse(cr, uid, int(context['plan_id']), context)
+            if context.get('journal_id', False):
+                plan_id = journal_obj.browse(cr, uid, int(context['journal_id']), context=context).plan_id
+            elif context.get('plan_id', False):
+                plan_id = analytic_plan_obj.browse(cr, uid, int(context['plan_id']), context=context)
 
             if plan_id:
                 i=1
@@ -183,40 +187,43 @@ class account_analytic_plan_instance(osv.osv):
             return res
 
     def create(self, cr, uid, vals, context=None):
+        journal_obj = self.pool.get('account.journal')
+        ana_plan_instance_obj = self.pool.get('account.analytic.plan.instance')
+        acct_anal_acct = self.pool.get('account.analytic.account')
+        acct_anal_plan_line_obj = self.pool.get('account.analytic.plan.line')
         if context and 'journal_id' in context:
-            journal= self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
+            journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
 
-            pids = self.pool.get('account.analytic.plan.instance').search(cr, uid, [('name','=',vals['name']),('code','=',vals['code']),('plan_id','<>',False)])
+            pids = ana_plan_instance_obj.search(cr, uid, [('name','=',vals['name']), ('code','=',vals['code']), ('plan_id','<>',False)], context=context)
             if pids:
                 raise osv.except_osv(_('Error'), _('A model having this name and code already exists !'))
 
-            acct_anal_acct = self.pool.get('account.analytic.account')
-            acct_anal_plan_line_obj = self.pool.get('account.analytic.plan.line')
-            res = acct_anal_plan_line_obj.search(cr, uid, [('plan_id','=',journal.plan_id.id)])
+            res = acct_anal_plan_line_obj.search(cr, uid, [('plan_id','=',journal.plan_id.id)], context=context)
             for i in res:
                 total_per_plan = 0
-                item = acct_anal_plan_line_obj.browse(cr, uid, i)
-                temp_list=['account1_ids','account2_ids','account3_ids','account4_ids','account5_ids','account6_ids']
+                item = acct_anal_plan_line_obj.browse(cr, uid, i, context=context)
+                temp_list = ['account1_ids','account2_ids','account3_ids','account4_ids','account5_ids','account6_ids']
                 for l in temp_list:
                     if vals.has_key(l):
                         for tempo in vals[l]:
-                            if acct_anal_acct.search(cr, uid,[('parent_id','child_of',[item.root_analytic_id.id]),('id','=',tempo[2]['analytic_account_id'])]):
+                            if acct_anal_acct.search(cr, uid, [('parent_id', 'child_of', [item.root_analytic_id.id]), ('id', '=', tempo[2]['analytic_account_id'])], context=context):
                                 total_per_plan += tempo[2]['rate']
                 if total_per_plan < item.min_required or total_per_plan > item.max_required:
                     raise osv.except_osv(_('Value Error'),_('The Total Should be Between %s and %s') % (str(item.min_required), str(item.max_required)))
 
-        return super(account_analytic_plan_instance, self).create(cr, uid, vals, context)
+        return super(account_analytic_plan_instance, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        this = self.browse(cr, uid, ids[0])
+        this = self.browse(cr, uid, ids[0], context=context)
+        invoice_line_obj = self.pool.get('account.invoice.line')
         if this.plan_id and not vals.has_key('plan_id'):
             #this instance is a model, so we have to create a new plan instance instead of modifying it
             #copy the existing model
-            temp_id = self.copy(cr, uid, this.id, None, context)
+            temp_id = self.copy(cr, uid, this.id, None, context=context)
             #get the list of the invoice line that were linked to the model
-            list = self.pool.get('account.invoice.line').search(cr, uid, [('analytics_id','=',this.id)])
+            lists = invoice_line_obj.search(cr, uid, [('analytics_id','=',this.id)], context=context)
             #make them link to the copy
-            self.pool.get('account.invoice.line').write(cr, uid, list, {'analytics_id':temp_id}, context)
+            invoice_line_obj.write(cr, uid, lists, {'analytics_id':temp_id}, context=context)
 
             #and finally modify the old model to be not a model anymore
             vals['plan_id'] = False
@@ -224,17 +231,17 @@ class account_analytic_plan_instance(osv.osv):
                 vals['name'] = this.name and (str(this.name)+'*') or "*"
             if not vals.has_key('code'):
                 vals['code'] = this.code and (str(this.code)+'*') or "*"
-        return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context)
+        return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context=context)
 
 account_analytic_plan_instance()
 
 class account_analytic_plan_instance_line(osv.osv):
-    _name='account.analytic.plan.instance.line'
-    _description = 'Analytic Instance Line'
-    _columns={
-        'plan_id':fields.many2one('account.analytic.plan.instance', 'Plan Id'),
-        'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account', required=True),
-        'rate':fields.float('Rate (%)', required=True),
+    _name = "account.analytic.plan.instance.line"
+    _description = "Analytic Instance Line"
+    _columns = {
+        'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+        'rate': fields.float('Rate (%)', required=True),
     }
     _defaults = {
         'rate': 100.0
@@ -242,7 +249,7 @@ class account_analytic_plan_instance_line(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
-        reads = self.read(cr, uid, ids, ['analytic_account_id'], context)
+        reads = self.read(cr, uid, ids, ['analytic_account_id'], context=context)
         res = []
         for record in reads:
             res.append((record['id'], record['analytic_account_id']))
@@ -251,44 +258,44 @@ class account_analytic_plan_instance_line(osv.osv):
 account_analytic_plan_instance_line()
 
 class account_journal(osv.osv):
-    _inherit='account.journal'
-    _name='account.journal'
+    _inherit = "account.journal"
+    _name = "account.journal"
     _columns = {
-        'plan_id':fields.many2one('account.analytic.plan', 'Analytic Plans'),
+        'plan_id': fields.many2one('account.analytic.plan', 'Analytic Plans'),
     }
 
 account_journal()
 
 class account_invoice_line(osv.osv):
-    _inherit='account.invoice.line'
-    _name='account.invoice.line'
+    _inherit = "account.invoice.line"
+    _name = "account.invoice.line"
     _columns = {
-        'analytics_id':fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
+        'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
 
     def create(self, cr, uid, vals, context=None):
-        if 'analytics_id' in vals and isinstance(vals['analytics_id'],tuple):
+        if 'analytics_id' in vals and isinstance(vals['analytics_id'], tuple):
             vals['analytics_id'] = vals['analytics_id'][0]
-        return super(account_invoice_line, self).create(cr, uid, vals, context)
+        return super(account_invoice_line, self).create(cr, uid, vals, context=context)
 
     def move_line_get_item(self, cr, uid, line, context=None):
-        res= super(account_invoice_line,self).move_line_get_item(cr, uid, line, context={})
-        res ['analytics_id']=line.analytics_id and line.analytics_id.id or False
+        res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context=context)
+        res ['analytics_id'] = line.analytics_id and line.analytics_id.id or False
         return res
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
-        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
+        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec and rec.analytics_id:
-            res_prod['value'].update({'analytics_id':rec.analytics_id.id})
+            res_prod['value'].update({'analytics_id': rec.analytics_id.id})
         return res_prod
 
 account_invoice_line()
 
 class account_move_line(osv.osv):
 
-    _inherit='account.move.line'
-    _name='account.move.line'
+    _inherit = "account.move.line"
+    _name = "account.move.line"
     _columns = {
         'analytics_id':fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
@@ -300,9 +307,9 @@ class account_move_line(osv.osv):
         return data
 
     def create_analytic_lines(self, cr, uid, ids, context=None):
-        super(account_move_line, self).create_analytic_lines(cr, uid, ids, context)
+        super(account_move_line, self).create_analytic_lines(cr, uid, ids, context=context)
         analytic_line_obj = self.pool.get('account.analytic.line')
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
            if line.analytics_id:
                if not line.journal_id.analytic_journal_id:
                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
@@ -333,24 +340,25 @@ account_move_line()
 
 class account_invoice(osv.osv):
     _name = "account.invoice"
-    _inherit="account.invoice"
+    _inherit = "account.invoice"
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
-        res=super(account_invoice,self).line_get_convert(cr, uid, x, part, date, context)
-        res['analytics_id']=x.get('analytics_id',False)
+        res=super(account_invoice,self).line_get_convert(cr, uid, x, part, date, context=context)
+        res['analytics_id'] = x.get('analytics_id', False)
         return res
 
     def _get_analytic_lines(self, cr, uid, id):
         inv = self.browse(cr, uid, [id])[0]
         cur_obj = self.pool.get('res.currency')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        acct_ins_obj = self.pool.get('account.analytic.plan.instance')
         company_currency = inv.company_id.currency_id.id
         if inv.type in ('out_invoice', 'in_refund'):
             sign = 1
         else:
             sign = -1
 
-        iml = self.pool.get('account.invoice.line').move_line_get(cr, uid, inv.id)
-        acct_ins_obj = self.pool.get('account.analytic.plan.instance')
+        iml = invoice_line_obj.move_line_get(cr, uid, inv.id)
 
         for il in iml:
             if il.get('analytics_id', False):
@@ -369,8 +377,8 @@ class account_invoice(osv.osv):
                     al_vals = {
                         'name': il['name'],
                         'date': inv['date_invoice'],
-                        'unit_amount':qtty,
-                        'product_id':il['product_id'],
+                        'unit_amount': qtty,
+                        'product_id': il['product_id'],
                         'account_id': line2.analytic_account_id.id,
                         'amount': amt,
                         'product_uom_id': il['uos_id'],
@@ -378,7 +386,7 @@ class account_invoice(osv.osv):
                         'journal_id': self._get_journal_analytic(cr, uid, inv.type),
                         'ref': ref,
                     }
-                    il['analytic_lines'].append((0,0,al_vals))
+                    il['analytic_lines'].append((0, 0, al_vals))
         return iml
 
 account_invoice()
@@ -391,7 +399,7 @@ class account_analytic_plan(osv.osv):
 account_analytic_plan()
 
 class analytic_default(osv.osv):
-    _inherit = 'account.analytic.default'
+    _inherit = "account.analytic.default"
     _columns = {
         'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
@@ -399,21 +407,20 @@ class analytic_default(osv.osv):
 analytic_default()
 
 class sale_order_line(osv.osv):
-    _inherit = 'sale.order.line'
+    _inherit = "sale.order.line"
 
     # Method overridden to set the analytic account by default on criterion match
     def invoice_line_create(self, cr, uid, ids, context=None):
-        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context)
+        inv_line_obj = self.pool.get('account.invoice.line')
+        acct_anal_def_obj = self.pool.get('account.analytic.default')
         if ids:
-            sale_line = self.browse(cr, uid, ids[0], context)
-            inv_line_obj = self.pool.get('account.invoice.line')
-            acct_anal_def_obj = self.pool.get('account.analytic.default')
-
-            for line in inv_line_obj.browse(cr, uid, create_ids, context):
+            sale_line = self.browse(cr, uid, ids[0], context=context)
+            for line in inv_line_obj.browse(cr, uid, create_ids, context=context):
                 rec = acct_anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
 
                 if rec:
-                    inv_line_obj.write(cr, uid, [line.id], {'analytics_id':rec.analytics_id.id}, context=context)
+                    inv_line_obj.write(cr, uid, [line.id], {'analytics_id': rec.analytics_id.id}, context=context)
         return create_ids
 
 sale_order_line()
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index f4d35f936e1..67b25ae6013 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -39,11 +39,12 @@ class crossovered_analytic(report_sxw.rml_parse):
         final_list = []
         parent_list = []
         set_list = []
+        analytic_obj = self.pool.get('account.analytic.account')
         for id in ref_ids:
             # to avoid duplicate entries
             if id not in to_return_ids:
-                to_return_ids.append(self.pool.get('account.analytic.account').search(self.cr,self.uid,[('parent_id','child_of',[id])]))
-        data_accnt = self.pool.get('account.analytic.account').browse(self.cr,self.uid,to_return_ids[0])
+                to_return_ids.append(analytic_obj.search(self.cr,self.uid,[('parent_id','child_of',[id])]))
+        data_accnt = analytic_obj.browse(self.cr,self.uid,to_return_ids[0])
         for data in data_accnt:
             if data.parent_id and data.parent_id.id == ref_ids[0]:
                 parent_list.append(data.id)
@@ -54,7 +55,7 @@ class crossovered_analytic(report_sxw.rml_parse):
 
     def set_account(self,cats):
         lst = []
-        category = self.pool.get('account.analytic.account').read(self.cr,self.uid,cats)
+        category = self.pool.get('account.analytic.account').read(self.cr, self.uid, cats)
         for cat in category:
             lst.append(cat['id'])
             if cat['child_ids']:
@@ -75,44 +76,44 @@ class crossovered_analytic(report_sxw.rml_parse):
         else:
             journal = 'is not null'
 
-        query_general = "select id from account_analytic_line where (journal_id " + journal +") AND date>='"+ str(form['date1']) +"'"" AND date<='" + str(form['date2']) + "'"
+        query_general = "SELECT id FROM account_analytic_line WHERE (journal_id " + journal +") AND date>='"+ str(form['date1']) +"'"" AND date<='" + str(form['date2']) + "'"
 
         self.cr.execute(query_general)
-        l_ids=self.cr.fetchall()
+        l_ids = self.cr.fetchall()
         line_ids = [x[0] for x in l_ids]
 
         obj_line = line_pool.browse(self.cr,self.uid,line_ids)
 
         #this structure will be usefull for easily knowing the account_analytic_line that are related to the reference account. At this purpose, we save the move_id of analytic lines.
         self.dict_acc_ref[form['ref']] = []
-        children_list = self.pool.get('account.analytic.account').search(self.cr,self.uid,[('parent_id','child_of',[form['ref']])])
+        children_list = acc_pool.search(self.cr, self.uid, [('parent_id', 'child_of', [form['ref']])])
         for obj in obj_line:
             if obj.account_id.id in children_list:
                 if obj.move_id and obj.move_id.id not in self.dict_acc_ref[form['ref']]:
                     self.dict_acc_ref[form['ref']].append(obj.move_id.id)
 
-        res['ref_name'] = acc_pool.name_get(self.cr,self.uid,[form['ref']])[0][1]
-        res['ref_code'] = acc_pool.browse(self.cr,self.uid,form['ref']).code
+        res['ref_name'] = acc_pool.name_get(self.cr, self.uid, [form['ref']])[0][1]
+        res['ref_code'] = acc_pool.browse(self.cr, self.uid, form['ref']).code
 
         self.final_list = children_list
-        selected_ids = line_pool.search(self.cr,self.uid,[('account_id','in',self.final_list)])
+        selected_ids = line_pool.search(self.cr, self.uid, [('account_id', 'in' ,self.final_list)])
         if selected_ids:
-            query="SELECT sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
-                    WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
+            query = "SELECT SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                    WHERE aal.account_id = aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
 
             self.cr.execute(query)
             info=self.cr.dictfetchall()
 
-            res['ref_qty']=info[0]['qty']
-            res['ref_amt']=info[0]['amt']
-            self.base_amount= info[0]['amt']
-        res['ref_qty']=0.0
-        res['ref_amt']=0.0
-        self.base_amount= 0.0
+            res['ref_qty'] = info[0]['qty']
+            res['ref_amt'] = info[0]['amt']
+            self.base_amount = info[0]['amt']
+        res['ref_qty'] = 0.0
+        res['ref_amt'] = 0.0
+        self.base_amount = 0.0
         result.append(res)
         return result
 
-    def _lines(self,form,ids={}):
+    def _lines(self, form, ids={}):
         if not ids:
             ids = self.ids
 
@@ -122,43 +123,43 @@ class crossovered_analytic(report_sxw.rml_parse):
             journal= 'is not null'
 
         acc_pool = self.pool.get('account.analytic.account')
-        line_pool=self.pool.get('account.analytic.line')
-        acc_id=[]
-        final=[]
-        child_ids=[]
-        self.list_ids=[]
+        line_pool = self.pool.get('account.analytic.line')
+        acc_id = []
+        final = []
+        child_ids = []
+        self.list_ids = []
 
         self.final_list = self.find_children(ids)
 
         for acc_id in self.final_list:
-            selected_ids = line_pool.search(self.cr,self.uid,[('account_id','=',acc_id),('move_id','in',self.dict_acc_ref[form['ref']])])
+            selected_ids = line_pool.search(self.cr, self.uid, [('account_id','=',acc_id), ('move_id', 'in', self.dict_acc_ref[form['ref']])])
             if selected_ids:
-                query="SELECT aaa.code as code, sum(aal.amount) AS amt, sum(aal.unit_amount) AS qty,aaa.name as acc_name,aal.account_id as id  FROM account_analytic_line AS aal, account_analytic_account AS aaa \
+                query="SELECT aaa.code AS code, SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty, aaa.name AS acc_name, aal.account_id AS id FROM account_analytic_line AS aal, account_analytic_account AS aaa \
                 WHERE aal.account_id=aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"" GROUP BY aal.account_id,aaa.name,aaa.code ORDER BY aal.account_id"
 
                 self.cr.execute(query)
                 res = self.cr.dictfetchall()
                 if res:
                     for element in res:
-                        if self.base_amount<>0.00:
-                            element['perc']= (element['amt'] / self.base_amount) * 100.00
+                        if self.base_amount <> 0.00:
+                            element['perc'] = (element['amt'] / self.base_amount) * 100.00
                         else:
-                            element['perc']=0.00
+                            element['perc'] = 0.00
                 else:
-                    result={}
-                    res=[]
-                    result['id']=acc_id
-                    data_account = acc_pool.browse(self.cr,self.uid,acc_id)
-                    result['acc_name']=data_account.name
+                    result = {}
+                    res = []
+                    result['id'] = acc_id
+                    data_account = acc_pool.browse(self.cr, self.uid, acc_id)
+                    result['acc_name'] = data_account.name
                     result['code'] = data_account.code
-                    result['amt']=result['qty']=result['perc']=0.00
+                    result['amt'] = result['qty'] = result['perc'] = 0.00
                     if not form['empty_line']:
                         res.append(result)
             else:
                 result = {}
                 res = []
                 result['id'] = acc_id
-                data_account = acc_pool.browse(self.cr,self.uid,acc_id)
+                data_account = acc_pool.browse(self.cr, self.uid, acc_id)
                 result['acc_name'] = data_account.name
                 result['code'] = data_account.code
                 result['amt'] = result['qty'] = result['perc'] = 0.00
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 97df80e23fc..2b36fec2cc9 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -18,37 +18,38 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
 from tools.translate import _
 
 class account_crossovered_analytic(osv.osv_memory):
-    _name = 'account.crossovered.analytic'
-    _description = 'Print Crossovered Analytic'
+    _name = "account.crossovered.analytic"
+    _description = "Print Crossovered Analytic"
     _columns = {
         'date1': fields.date('Start Date', required=True),
         'date2': fields.date('End Date', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic Journal'),
         'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=False),
         'empty_line': fields.boolean('Dont show empty lines'),
-                }
+    }
     _defaults = {
-         'date1': lambda *a: time.strftime('%Y-01-01'),
-         'date2': lambda *a: time.strftime('%Y-%m-%d'),
-                 }
+         'date1': time.strftime('%Y-01-01'),
+         'date2': time.strftime('%Y-%m-%d'),
+    }
 
     def print_report(self, cr, uid, ids, context=None):
-        cr.execute('select account_id from account_analytic_line')
+        cr.execute('SELECT account_id FROM account_analytic_line')
         res = cr.fetchall()
         acc_ids = [x[0] for x in res]
 
         data = self.read(cr, uid, ids, [], context=context)[0]
 
-        obj_acc = self.pool.get('account.analytic.account').browse(cr, uid, data['ref'])
+        obj_acc = self.pool.get('account.analytic.account').browse(cr, uid, data['ref'], context=context)
         name = obj_acc.name
 
-        account_ids = self.pool.get('account.analytic.account').search(cr, uid, [('parent_id', 'child_of', [data['ref']])])
+        account_ids = self.pool.get('account.analytic.account').search(cr, uid, [('parent_id', 'child_of', [data['ref']])], context=context)
 
         flag = True
         for acc in account_ids:
@@ -62,12 +63,12 @@ class account_crossovered_analytic(osv.osv_memory):
              'ids': [],
              'model': 'account.analytic.account',
              'form': data
-                 }
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.analytic.account.crossovered.analytic',
             'datas': datas,
-            }
+        }
 
 account_crossovered_analytic()
 
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index dc108d1700a..777421798cd 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -18,24 +18,26 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import osv
 from tools.translate import _
 
 class analytic_plan_create_model(osv.osv_memory):
-    _name = 'analytic.plan.create.model'
-    _description = 'analytic.plan.create.model'
+    _name = "analytic.plan.create.model"
+    _description = "analytic.plan.create.model"
 
     def activate(self, cr, uid, ids, context=None):
         plan_obj = self.pool.get('account.analytic.plan.instance')
         mod_obj = self.pool.get('ir.model.data')
+        anlytic_plan_obj = self.pool.get('account.analytic.plan')
         if 'active_id' in context and context['active_id']:
             plan = plan_obj.browse(cr, uid, context['active_id'], context=context)
             if (not plan.name) or (not plan.code):
                 raise osv.except_osv(_('Error'), _('Please put a name and a code before saving the model !'))
-            pids  =  self.pool.get('account.analytic.plan').search(cr, uid, [], context=context)
-            if (not pids):
+            pids = anlytic_plan_obj.search(cr, uid, [], context=context)
+            if not pids:
                 raise osv.except_osv(_('Error'), _('No analytic plan defined !'))
-            plan_obj.write(cr, uid, [context['active_id']], {'plan_id':pids[0]})
+            plan_obj.write(cr, uid, [context['active_id']], {'plan_id':pids[0]}, context=context)
 
             model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'),('name', '=', 'view_analytic_plan_create_model')], context=context)
             resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']

From 6b8353e933af1506a2e5521400ba7effc2bd1c82 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 11 Oct 2010 16:58:45 +0530
Subject: [PATCH 557/632] [FIX] Fix the account yml warning

bzr revid: ara@tinyerp.com-20101011112845-tii4g0uiokjmdp24
---
 addons/account/test/account_report.yml | 58 +++++++++++++-------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 7e4295da45b..5bb868cd5d2 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -1,6 +1,6 @@
 -
   In order to test the PDF reports defined on an invoice, we will print an Invoice Report
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
@@ -9,7 +9,7 @@
 
 -
   In order to test the PDF reports defined on a partner, we will print the Overdue Report
-- 
+-
   !python {model: res.partner}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
@@ -18,7 +18,7 @@
 
 -
   In order to test the PDF reports defined on Account Move, we will print the Voucher Report
-- 
+-
   !python {model: account.move}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
@@ -32,7 +32,7 @@
     name : Tax Code Test
 -
  Print Tax Code entries report
-- 
+-
   !python {model: account.tax.code}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account_tax_code_0')], {}, {})
@@ -51,7 +51,7 @@
 
 -
   In order to test the PDF reports defined on an invoice, we will print an invoice
-- 
+-
   !python {model: account.invoice}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {})
@@ -65,6 +65,8 @@
     import netsvc, tools, os, time
     import datetime
     from mx.DateTime import *
+	import warnings
+	warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
     start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
     start = DateTime(int(start.year), int(start.month), int(start.day))
     res = {}
@@ -84,9 +86,9 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'initial_balance': 1, 'periods': period_list,'journal_ids':journal_ids, 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : query_line, 'result_selection': 'customer','direction_selection': 'past','fiscalyear_id':fy_id}}
     data_dict['form'].update(res)
     (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {})
@@ -122,10 +124,10 @@
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal.'+format), 'wb+').write(data)
-    
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':[ref('account.bal'),ref('account.gpf')]})
-    
+
     (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [], data_dict, {'periods': []})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal-menu.'+format), 'wb+').write(data)
@@ -145,16 +147,16 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
-       
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':journal_period_ids})
-    
+
     (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-central_journal-menu.'+format), 'wb+').write(data)
@@ -167,13 +169,13 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'ir.ui.menu','id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
     (data, format) = netsvc.LocalService('report.account.general.journal').create(cr, uid, journal_period_ids, data_dict, {})
@@ -189,15 +191,15 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query': query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
@@ -217,15 +219,15 @@
     period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     acc_ids = [ref('account.bal'),ref('account.gpf')]
-    
+
     obj_move = self.pool.get('account.move.line')
     ctx = {}
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, acc_ids, data_dict, {})
     if tools.config['test_report_directory']:
@@ -252,17 +254,17 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'sort_selection': 'date','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
     (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, journal_period_ids, data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-print_journal.'+format), 'wb+').write(data)
-       
+
     data_dict.update({'model': 'ir.ui.menu'})
     data_dict['form'].update({'active_ids':journal_period_ids})
-    
+
     (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'account-print_journal-menu.'+format), 'wb+').write(data)
@@ -281,7 +283,7 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, [], data_dict, {})
@@ -302,9 +304,9 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    
+
     data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': True,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
@@ -324,7 +326,7 @@
     ctx['fiscalyear'] = fy_id
     ctx['journal_ids'] = journal_ids
     ctx['chart_account_id'] = ref('account.chart0')
-    
+
     query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
     data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': False,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
     (data, format) = netsvc.LocalService('report.account.third_party_ledger_other').create(cr, uid, [], data_dict, {})

From 90758779b05b2a11a9c739e75e1c31606e0b5704 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 11 Oct 2010 17:13:11 +0530
Subject: [PATCH 558/632] [IMP] sale : The button Create Invoice open the
 invoice form

bzr revid: vir@tinyerp.com-20101011114311-6bhy7mv4lpgwgson
---
 addons/sale/sale.py       | 28 ++++++++++++++++++++++++++++
 addons/sale/sale_view.xml |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 70313b03b24..fe5deac13a7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -461,6 +461,34 @@ class sale_order(osv.osv):
         inv_obj.button_compute(cr, uid, [inv_id])
         return inv_id
 
+    def manual_invoice(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        inv_ids = set()
+        inv_ids1 = set()
+        for id in ids:
+            for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids:
+                inv_ids.add(record.id)
+        # inv_ids would have old invoices if any
+        for id in ids:
+            wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
+            for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids:
+                inv_ids1.add(record.id)
+        inv_ids = list(inv_ids1.difference(inv_ids))
+
+        result = {
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'account.invoice',
+            'view_id': False,
+            'context': "{'type':'out_refund'}",
+            'type': 'ir.actions.act_window',
+            'res_id': inv_ids[0],
+            'nodestroy' :True
+                  }
+
+        return result
+
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
         res = False
         invoices = {}
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 747414b7e8d..913dfa1f82d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -205,7 +205,7 @@
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward" type="object"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>

From 3e44b15833aeff145186d03663a57039536ffaa6 Mon Sep 17 00:00:00 2001
From: husen <husen@husen-laptop>
Date: Mon, 11 Oct 2010 17:47:53 +0530
Subject: [PATCH 559/632] fix related field create problem

bzr revid: husen@husen-laptop-20101011121753-geotbl0iwqf3cqwe
---
 bin/tools/convert.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index ec3869f322f..6e534fe0400 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -300,7 +300,7 @@ form: module.record_id""" % (xml_id,)
         for dest,f in (('name','string'),('model','model'),('report_name','name')):
             res[dest] = rec.get(f,'').encode('utf8')
             assert res[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if rec.get(field):
                 res[dest] = rec.get(field).encode('utf8')
         if rec.get('auto'):

From 6b92fc0fcd44e57b00e0889fcb02c03e813e4b5d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 14:37:49 +0200
Subject: [PATCH 560/632] [REF] hr_timesheet_invoice: moved sample invoicing
 rate to regular data for usability purposes

bzr revid: odo@openerp.com-20101011123749-5infnnimvg196vax
---
 addons/hr_timesheet_invoice/__openerp__.py           | 11 ++++++-----
 .../hr_timesheet_invoice_data.xml                    | 10 ++++++++++
 .../hr_timesheet_invoice_demo.xml                    | 12 ------------
 3 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml

diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index f45490867c2..dfcda5ec534 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -31,9 +31,9 @@ reports, eso.""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account', 'hr_timesheet'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
+        'hr_timesheet_invoice_data.xml',
         'hr_timesheet_invoice_view.xml',
         'hr_timesheet_invoice_wizard.xml',
         'hr_timesheet_invoice_report.xml',
@@ -45,11 +45,12 @@ reports, eso.""",
         'wizard/hr_timesheet_invoice_create_final_view.xml',
         'board_hr_timesheet_invoice.xml',
     ],
-    'demo_xml': ['hr_timesheet_invoice_demo.xml',
-                 ],
+    'demo': [
+        'hr_timesheet_invoice_demo.xml',
+    ],
     'test': ['test/test_hr_timesheet_invoice.yml',
              'test/hr_timesheet_invoice_report.yml',
-             ],             
+             ],
     'installable': True,
     'active': False,
     'certificate': '0056091842381',
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
new file mode 100644
index 00000000000..a81af0788b6
--- /dev/null
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
+            <field name="name">Yes (100%)</field>
+            <field name="customer_name">100%</field>
+            <field name="factor">0.0</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index adc9e47b033..ee6bdf23538 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -1,36 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
-        <record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
-            <field name="name">100%</field>
-            <field name="customer_name"/>
-            <field name="factor">0.0</field>
-        </record>
-        
         <record id="timesheet_invoice_factor2" model="hr_timesheet_invoice.factor">
             <field name="name">50%</field>
             <field name="customer_name">50% Discount</field>
             <field name="factor">50.0</field>
         </record>
-        
         <record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
             <field name="name">Gratis</field>
             <field name="customer_name">Offered developments</field>
             <field name="factor">100.0</field>
         </record>
-        
         <record id="account.analytic_sednacom" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
-        
         <record id="account.analytic_thymbra" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
-        
         <record id="account.analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
-        
     </data>
 </openerp>

From affab14974d28c1da6b672bb924114f9e9c3fb9d Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Mon, 11 Oct 2010 18:08:01 +0530
Subject: [PATCH 561/632] [IMP] account payment : For make payment , method 
 directly called  from the account_payment.py instead of wizard

bzr revid: vth@tinyerp.com-20101011123801-x0oqn20p5azfxkxs
---
 addons/account_payment/account_payment.py          | 14 ++++++--------
 addons/account_payment/account_payment_view.xml    |  5 ++---
 .../account_payment/account_payment_workflow.xml   |  8 +++++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index e4a121fb03e..a70e8fb75c3 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 
 from osv import osv, fields
@@ -118,11 +119,10 @@ class payment_order(osv.osv):
                 self.write(cr, uid, order['id'],{'reference':reference})
         return True
 
-    def set_done(self, cr, uid, id, *args):
-        self.write(cr,uid,id,{'date_done': time.strftime('%Y-%m-%d'),
-            'state': 'done',})
+    def set_done(self, cr, uid, ids, *args):
         wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'payment.order', id, 'done', cr)
+        self.write(cr, uid, ids, {'date_done': time.strftime('%Y-%m-%d')})
+        wf_service.trg_validate(uid, 'payment.order', ids[0], 'done', cr)
         return True
 
     def copy(self, cr, uid, id, default={}, context=None):
@@ -162,7 +162,6 @@ class payment_line(osv.osv):
     _name = 'payment.line'
     _description = 'Payment Line'
 
-
     def translate(self, orig):
         return {
                 "due_date": "date_maturity",
@@ -337,7 +336,7 @@ class payment_line(osv.osv):
     _defaults = {
         'name': lambda obj, cursor, user, context: obj.pool.get('ir.sequence'
             ).get(cursor, user, 'payment.line'),
-        'state': lambda *args: 'normal',
+        'state': 'normal',
         'currency': _get_currency,
         'company_currency': _get_currency,
         'date': _get_date,
@@ -438,5 +437,4 @@ class payment_line(osv.osv):
 
 payment_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e9238ec62f9..01c8965f9a4 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -142,7 +142,7 @@
                     <group col="4" colspan="2">
                          <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
                          <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                         <button name="%(action_account_payment_make_payment)d" states="open" string="Make Payments" type="action" icon="gtk-execute"/>
+                         <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
                          <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
                     </group>
                 </form>
@@ -165,7 +165,7 @@
                     <field name="state"/>
                     <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
                     <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                    <button name="%(action_account_payment_make_payment)d" states="open" string="Make Payments" type="action" icon="gtk-execute"/>
+                    <button name="set_done" states="open" string="Make Payments"  type ="object" icon="gtk-execute"/>
                 </tree>
             </field>
         </record>
@@ -241,7 +241,6 @@
                              <field name="state"/>
                         </page>
                         <page string="Information">
-
                             <separator colspan="4" string="General Information"/>
                             <group colspan="2">
                                 <field name="amount" select="1"/>
diff --git a/addons/account_payment/account_payment_workflow.xml b/addons/account_payment/account_payment_workflow.xml
index dd7aa2d4933..06ba7b83f70 100644
--- a/addons/account_payment/account_payment_workflow.xml
+++ b/addons/account_payment/account_payment_workflow.xml
@@ -24,6 +24,8 @@ write({'state':'open'})</field>
         <record id="act_done" model="workflow.activity">
             <field name="name">done</field>
             <field name="wkf_id" ref="wkf_payment_order"/>
+            <field name="action">write({'state':'done'})</field>
+            <field name="kind">function</field>
             <field name="flow_stop">True</field>
         </record>
         <record id="act_cancel" model="workflow.activity">
@@ -33,14 +35,14 @@ write({'state':'open'})</field>
             <field name="kind">function</field>
             <field name="flow_stop">True</field>
         </record>
-        
+
         <!-- Transition -->
         <record id="trans_draft_open" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_open"/>
             <field name="signal">open</field>
         </record>
-        
+
         <record id="trans_open_done" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_done"/>
@@ -56,6 +58,6 @@ write({'state':'open'})</field>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-        
+
     </data>
 </openerp>

From efab55ee39c1b89f246d271ead15f4ee004bfcc1 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Mon, 11 Oct 2010 18:16:07 +0530
Subject: [PATCH 562/632] [MOD/IMP] : Usability Improvement

bzr revid: amp@tinyerp.com-20101011124607-9cb7byanld4uka1s
---
 addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 2 +-
 addons/product/product.py                                 | 1 +
 addons/product/product_view.xml                           | 6 ++----
 addons/project/project_view.xml                           | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4beda0999d0..a284523665c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -112,7 +112,7 @@
 
         <!-- Menus -->
         <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Costs to Invoice</field>
+            <field name="name">Bill Tasks Works</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 09732a9bff3..922868684aa 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -308,6 +308,7 @@ class product_template(osv.osv):
         'uos_coeff' : lambda *a: 1.0,
         'mes_type' : lambda *a: 'fixed',
         'categ_id' : _default_category,
+        'type' : lambda *a: 'consu',
     }
 
     def _check_uom(self, cursor, user, ids):
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8f2e5efe649..b7c7f621818 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,10 +9,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
-		   <filter icon="terp-accessories-archiver" string="Consumable"
-                        domain="[('type','=', 'consumable')]"/>                   
-                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>                   
+                   <filter string="Consumable/Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
                    <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5e5be5ee4b0..6b4796cc099 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,7 +46,7 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
                                 <field name="state" select="1" readonly="1"/>
-                                <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
+                                <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
@@ -67,9 +67,9 @@
                                 </tree>
                             </field>
                         </page>
-                        <page groups="base.group_extended" string="Partner Info">
+                        <page groups="base.group_extended" string="Accounting">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
                             <field name="warn_customer"/>
                             <newline/>
                             <separator colspan="2" string="Mail Header"/>

From 6df8057c9f1ef8ae0a8efe06c02673730d402ae8 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 11 Oct 2010 18:17:38 +0530
Subject: [PATCH 563/632] [MOD] account : set widget=selection in account chart
 configuration

bzr revid: vir@tinyerp.com-20101011124738-l7st79yqwa25w21c
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 11e8d2e62d6..ba1bd98fc04 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2348,7 +2348,7 @@
                 <group string="res_config_contents" position="replace">
                   <field name="company_id" widget="selection"/>
                   <field name ="code_digits" />
-                  <field name="chart_template_id"/>
+                  <field name="chart_template_id" widget="selection"/>
                   <field name ="seq_journal" />
                   <field colspan="4" mode="tree" name="bank_accounts_id"
                          nolabel="1" widget="one2many_list">

From ed8aaa066e5a9ef9cc119a5e4369da8160d98a22 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 11 Oct 2010 18:19:25 +0530
Subject: [PATCH 564/632] [IMP] account_voucher:-improvements on the basis of
 base_module_quality

bzr revid: mtr@mtr-20101011124925-d9bc3ldvzi9hbdgg
---
 addons/account_voucher/account_voucher.py     | 40 +++++++++----------
 addons/account_voucher/invoice.py             |  3 +-
 .../account_voucher/report/account_voucher.py | 10 ++---
 .../report/account_voucher_print.py           |  4 +-
 addons/account_voucher/report/rml_parse.py    | 34 +++++++---------
 .../wizard/account_statement_from_invoice.py  | 20 +++++-----
 .../wizard/account_voucher_unreconcile.py     |  5 +--
 7 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index a69b0a0ce11..25997a2e0eb 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -115,7 +115,7 @@ class account_voucher(osv.osv):
         return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
-        if not view_id and context.get('invoice_type',False):
+        if not view_id and context.get('invoice_type', False):
             mod_obj = self.pool.get('ir.model.data')
             if context.get('invoice_type') in ('out_invoice', 'out_refund'):
                 result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
@@ -123,7 +123,7 @@ class account_voucher(osv.osv):
                 result = mod_obj._get_id(cr, uid, 'account_voucher', 'view_vendor_payment_form')
             result = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
             view_id = result
-        res = super(account_voucher,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
         doc = etree.XML(res['arch'])
         nodes = doc.xpath("//field[@name='partner_id']")
         if context.get('type', 'sale') in ('purchase', 'payment'):
@@ -226,7 +226,7 @@ class account_voucher(osv.osv):
             total_tax = 0.0
 
             if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes',[]):
+                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes', []):
                     total_tax += tax_line.get('amount', 0.0)
                 total += total_tax
             else:
@@ -234,7 +234,7 @@ class account_voucher(osv.osv):
                     line_total = 0.0
                     line_tax = 0.0
 
-                    for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes',[]):
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, line.untax_amount or line.amount, 1).get('taxes', []):
                         line_tax += tax_line.get('amount', 0.0)
                         line_total += tax_line.get('price_unit')
                     total_tax += line_tax
@@ -249,8 +249,8 @@ class account_voucher(osv.osv):
         partner_pool = self.pool.get('res.partner')
         position_pool = self.pool.get('account.fiscal.position')
         res = {
-            'tax_amount':False,
-            'amount':False,
+            'tax_amount': False,
+            'amount': False,
         }
         voucher_total = 0.0
         voucher_line_ids = []
@@ -274,7 +274,7 @@ class account_voucher(osv.osv):
                 tax = tax_pool.browse(cr, uid, taxes)
 
             if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes',[]):
+                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
                     total_tax += tax_line.get('amount')
                 total += total_tax
 
@@ -374,7 +374,7 @@ class account_voucher(osv.osv):
             return default
 
         if not partner_id and ids:
-            line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
+            line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])])
             if line_ids:
                 line_pool.unlink(cr, uid, line_ids)
             return default
@@ -405,7 +405,7 @@ class account_voucher(osv.osv):
             account_type = 'receivable'
 
         if not context.get('move_line_ids', False):
-            ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id)], context=context)
+            ids = move_line_pool.search(cr, uid, [('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
         else:
             ids = context['move_line_ids']
         ids.reverse()
@@ -472,7 +472,7 @@ class account_voucher(osv.osv):
         @return: Returns a dict which contains new values, and context
         """
         period_pool = self.pool.get('account.period')
-        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+        pids = period_pool.search(cr, user, [('date_start', '<=', date), ('date_stop', '>=', date)])
         if not pids:
             return {}
         return {
@@ -688,13 +688,13 @@ class account_voucher(osv.osv):
             if not self.pool.get('res.currency').is_zero(cr, uid, inv.currency_id, line_total):
                 diff = line_total
                 move_line = {
-                    'name':name,
-                    'account_id':False,
-                    'move_id':move_id ,
-                    'partner_id':inv.partner_id.id,
-                    'date':inv.date,
-                    'credit':diff>0 and diff or 0.0,
-                    'debit':diff<0 and -diff or 0.0,
+                    'name': name,
+                    'account_id': False,
+                    'move_id': move_id ,
+                    'partner_id': inv.partner_id.id,
+                    'date': inv.date,
+                    'credit': diff > 0 and diff or 0.0,
+                    'debit': diff < 0 and -diff or 0.0,
                 }
                 account_id = False
                 if inv.type in ('sale', 'receipt'):
@@ -795,10 +795,10 @@ class account_voucher_line(osv.osv):
         if move_line_id:
             move_line = move_line_pool.browse(cr, user, move_line_id, context=context)
             if move_line.credit:
-                ttype='dr'
+                ttype = 'dr'
                 amount = move_line.credit
             else:
-                ttype='cr'
+                ttype = 'cr'
             account_id = move_line.account_id.id
             res.update({
                 'account_id':account_id,
@@ -912,4 +912,4 @@ class account_bank_statement_line(osv.osv):
         self.pool.get('account.voucher').unlink(cr, uid, unlink_ids, context=context)
         return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
 
-account_bank_statement_line()
+account_bank_statement_line()
\ No newline at end of file
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index a2cf45391fb..7b6d232d702 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-import netsvc
-from osv import fields, osv
+from osv import osv
 from tools.translate import _
 
 class invoice(osv.osv):
diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py
index 7655f294bf9..c37d921ecbc 100644
--- a/addons/account_voucher/report/account_voucher.py
+++ b/addons/account_voucher/report/account_voucher.py
@@ -36,7 +36,7 @@ class report_voucher(report_sxw.rml_parse):
         })
 
     def convert(self, amount, cur):
-        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur);
+        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur)
         return amt_en
 
     def get_title(self, type):
@@ -48,17 +48,17 @@ class report_voucher(report_sxw.rml_parse):
     def debit(self, move_ids):
         debit = 0.0
         for move in move_ids:
-            debit +=move.debit
+            debit += move.debit
         return debit
 
     def credit(self, move_ids):
         credit = 0.0
         for move in move_ids:
-            credit +=move.credit
+            credit += move.credit
         return credit
 
     def _get_ref(self, voucher_id, move_ids):
-        voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id','=',move_ids.partner_id.id), ('voucher_id','=',voucher_id)])
+        voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id', '=', move_ids.partner_id.id), ('voucher_id', '=', voucher_id)])
         if voucher_line:
             voucher = self.pool.get('account.voucher.line').browse(self.cr, self.uid, voucher_line)[0]
             return voucher.name
@@ -69,4 +69,4 @@ report_sxw.report_sxw(
     'account.voucher',
     'addons/account_voucher/report/account_voucher.rml',
     parser=report_voucher,header="external"
-)
+)
\ No newline at end of file
diff --git a/addons/account_voucher/report/account_voucher_print.py b/addons/account_voucher/report/account_voucher_print.py
index 0da644c6e4f..d39b77d8374 100644
--- a/addons/account_voucher/report/account_voucher_print.py
+++ b/addons/account_voucher/report/account_voucher_print.py
@@ -35,10 +35,10 @@ class report_voucher_print(report_sxw.rml_parse):
         })
 
     def convert(self, amount, cur):
-        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur);
+        amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur)
         return amt_en
 
-    def get_lines(self,voucher):
+    def get_lines(self, voucher):
         result = []
         if voucher.type in ('payment','receipt'):
             type = voucher.line_ids and voucher.line_ids[0].type or False
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index e23d8c52947..d59a5f0551a 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -20,15 +20,9 @@
 ##############################################################################
 
 from report import report_sxw
-import xml.dom.minidom
-import os, time
-import osv
-import re
-import tools
-import pooler
-import re
-import sys
 
+from datetime import datetime
+import re
 
 class rml_parse(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
@@ -40,7 +34,7 @@ class rml_parse(report_sxw.rml_parse):
             'explode_name' : self._explode_name,
         })
 
-    def comma_me(self,amount):
+    def comma_me(self, amount):
         if not amount:
             amount = 0.0
         if  type(amount) is float :
@@ -48,7 +42,7 @@ class rml_parse(report_sxw.rml_parse):
         else :
             amount = str(amount)
         if (amount == '0'):
-             return ' '
+            return ' '
         orig = amount
         new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
         if orig == new:
@@ -60,19 +54,19 @@ class rml_parse(report_sxw.rml_parse):
         ellipsis = ellipsis or ''
         try:
             return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
-        except Exception, e:
+        except:
             return False
 
     def _strip_name(self, name, maxlen=50):
         return self._ellipsis(name, maxlen, '...')
 
-    def _get_and_change_date_format_for_swiss (self,date_to_format):
-        date_formatted=''
+    def _get_and_change_date_format_for_swiss (self, date_to_format):
+        date_formatted = ''
         if date_to_format:
-            date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+            date_formatted = datetime.strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
         return date_formatted
 
-    def _explode_name(self,chaine,length):
+    def _explode_name(self, chaine, length):
         # We will test if the size is less then account
         full_string = ''
         if (len(str(chaine)) <= length):
@@ -92,7 +86,7 @@ class rml_parse(report_sxw.rml_parse):
 
         return full_string
 
-    def makeAscii(self,str):
+    def makeAscii(self, str):
         try:
             Stringer = str.encode("utf-8")
         except UnicodeDecodeError:
@@ -106,7 +100,7 @@ class rml_parse(report_sxw.rml_parse):
             return Stringer
         return Stringer
 
-    def explode_this(self,chaine,length):
+    def explode_this(self, chaine, length):
         chaine = rstrip(chaine)
         ast = list(chaine)
         i = length
@@ -116,7 +110,7 @@ class rml_parse(report_sxw.rml_parse):
         chaine = str("".join(ast))
         return chaine
 
-    def repair_string(self,chaine):
+    def repair_string(self, chaine):
         ast = list(chaine)
         UnicodeAst = []
         _previouslyfound = False
@@ -135,7 +129,7 @@ class rml_parse(report_sxw.rml_parse):
                 i += i + 1
         return "".join(UnicodeAst)
 
-    def ReencodeAscii(self,str):
+    def ReencodeAscii(self, str):
         try:
             Stringer = str.decode("ascii")
         except UnicodeEncodeError:
@@ -146,7 +140,7 @@ class rml_parse(report_sxw.rml_parse):
             return Stringer
 
     def _add_header(self, node, header=1):
-        if header==2:
+        if header == 2:
             rml_head =  self.rml_header2
         else:
             rml_head =  self.rml_header
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 2c5553488d0..16d05f3f62c 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -86,7 +86,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                             'period_id':statement.period_id.id}
             voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
 
-            voucher_line_dict =  False
+            voucher_line_dict =  {}
             if result['value']['line_ids']:
                 for line_dict in result['value']['line_ids']:
                     move_line = line_obj.browse(cr, uid, line_dict['move_line_id'], context)
@@ -94,7 +94,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                         voucher_line_dict = line_dict
 
             if voucher_line_dict:
-                voucher_line_dict.update({'voucher_id':voucher_id})
+                voucher_line_dict.update({'voucher_id': voucher_id})
                 voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
             if line.journal_id.type == 'sale':
                 type = 'customer'
@@ -147,11 +147,11 @@ class account_statement_from_invoice(osv.osv_memory):
         # Creating a group that is unique for importing move lines(move lines, once imported into statement lines, should not appear again)
         for st_line in statement.line_ids:
             args_move_line = []
-            args_move_line.append(('name','=', st_line.name))
-            args_move_line.append(('ref','=',st_line.ref))
+            args_move_line.append(('name', '=', st_line.name))
+            args_move_line.append(('ref', '=', st_line.ref))
             if st_line.partner_id:
-                args_move_line.append(('partner_id','=',st_line.partner_id.id))
-            args_move_line.append(('account_id','=',st_line.account_id.id))
+                args_move_line.append(('partner_id', '=', st_line.partner_id.id))
+            args_move_line.append(('account_id', '=', st_line.account_id.id))
 
             move_line_id = line_obj.search(cr, uid, args_move_line, context=context)
             if move_line_id:
@@ -159,7 +159,7 @@ class account_statement_from_invoice(osv.osv_memory):
 
         journal_ids = data['journal_ids']
         if journal_ids == []:
-            journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale','cash','purchase'))], context=context)
+            journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale', 'cash', 'purchase'))], context=context)
 
         args = [
             ('reconcile_id', '=', False),
@@ -167,12 +167,12 @@ class account_statement_from_invoice(osv.osv_memory):
             ('account_id.reconcile', '=', True)]
 
         if repeated_move_line_ids:
-            args.append(('id','not in',repeated_move_line_ids))
+            args.append(('id', 'not in', repeated_move_line_ids))
 
         line_ids = line_obj.search(cr, uid, args,
             context=context)
 
-        model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_account_statement_from_invoice_lines')], context=context)
+        model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'view_account_statement_from_invoice_lines')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         return {
             'domain': "[('id','in', ["+','.join([str(x) for x in line_ids])+"])]",
@@ -187,4 +187,4 @@ class account_statement_from_invoice(osv.osv_memory):
         }
 
 account_statement_from_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index 30cda8958d5..71b4fbc8fb5 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import netsvc
 from osv import osv
 from osv import fields
 
@@ -32,11 +31,11 @@ class account_voucher_unreconcile(osv.osv_memory):
     }
     
     _defaults = {
-        'remove': lambda *a: True,
+        'remove': True,
     }
     
     def trans_unrec(self, cr, uid, ids, context=None):
-        res = self.browse(cr, uid, ids[0])
+#        res = self.browse(cr, uid, ids[0])
         if context is None:
             context = {}
         voucher_pool = self.pool.get('account.voucher')

From 7bc5710eef14b16fc425596b7a2b39a3152daaff Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 18:31:41 +0530
Subject: [PATCH 565/632] [FIX] base : Deleting a Language deletes the
 respective translations

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

bzr revid: ach@tinyerp.com-20101011130141-wxzk35dx7sxoakaw
---
 bin/addons/base/res/res_lang.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index 13c4a33aa9c..1e158a175e6 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -23,7 +23,7 @@ from osv import fields, osv
 from locale import localeconv
 import tools
 from tools.safe_eval import safe_eval as eval
-
+from tools.translate import _
 class lang(osv.osv):
     _name = "res.lang"
     _description = "Languages"
@@ -76,6 +76,23 @@ class lang(osv.osv):
             self._lang_data_get.clear_cache(cr.dbname,lang_id= lang_id)
         return super(lang, self).write(cr, uid, ids, vals, context)
 
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        languages = self.read(cr, uid, ids, ['code','active'], context=context)
+        for language in languages:
+            lang = context.get('lang')
+            if language['code']=='en_US':
+                raise osv.except_osv(_('User Error'), _("Base Language 'en_US' can not be deleted !"))
+            if lang and (language['code']==lang):
+                raise osv.except_osv(_('User Error'), _("You cannot delete the language which is User's Preferred Language !"))
+            if language['active']:
+                raise osv.except_osv(_('User Error'), _("You cannot delete the language which is Active !\nPlease de-activate the language first."))
+            trans_obj = self.pool.get('ir.translation')
+            trans_ids = trans_obj.search(cr, uid, [('lang','=',language['code'])], context=context)
+            trans_obj.unlink(cr, uid, trans_ids, context=context)
+        return super(lang, self).unlink(cr, uid, ids, context=context)
+
     def _group(self, cr, uid, ids, s, monetary=False, grouping=False, thousands_sep=''):
         grouping = eval(grouping)
         

From 61da7d8883a915bb7e8593d696a10e94852ced90 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 11 Oct 2010 18:50:43 +0530
Subject: [PATCH 566/632] [REM]:removed implementation of gallery view

bzr revid: nch@tinyerp.com-20101011132043-qlzlaujac4yv1zr7
---
 bin/addons/base/ir/ir_actions.py |  3 +--
 bin/addons/base/ir/ir_ui_view.py |  1 -
 bin/addons/base/rng/view.rng     | 17 -----------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 195241afb21..1774b64fefa 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -282,8 +282,7 @@ class act_window_view(osv.osv):
             ('form', 'Form'),
             ('graph', 'Graph'),
             ('calendar', 'Calendar'),
-            ('gantt', 'Gantt'),
-            ('gallery', 'Gallery')), string='View Type', required=True),
+            ('gantt', 'Gantt')), string='View Type', required=True),
         'act_window_id': fields.many2one('ir.actions.act_window', 'Action', ondelete='cascade'),
         'multi': fields.boolean('On Multiple Doc.',
             help="If set to true, the action will not be displayed on the right toolbar of a form view."),
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index 810bfcf108a..4c90e85a35c 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -64,7 +64,6 @@ class view(osv.osv):
             ('calendar', 'Calendar'),
             ('diagram','Diagram'),
             ('gantt', 'Gantt'),
-            ('gallery', 'Gallery'),
             ('search','Search')), 'View Type', required=True),
         'arch': fields.text('View Architecture', required=True),
         'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade'),
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index c634ede8d5f..9c591723a9f 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -397,7 +397,6 @@
                     <rng:ref name="button"/>
                     <rng:ref name="group"/>
                     <rng:ref name="graph"/>
-		    <rng:ref name="gallery"/>
                     <rng:ref name="html"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>
@@ -441,7 +440,6 @@
             <rng:optional><rng:attribute name="required"/></rng:optional>
             <rng:optional><rng:attribute name="readonly"/></rng:optional>
             <rng:optional><rng:attribute name="view_mode"/></rng:optional>
-            <rng:optional><rng:attribute name="search_mode"/></rng:optional>
             <rng:optional><rng:attribute name="widget"/></rng:optional>
             <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:optional><rng:attribute name="states"/></rng:optional>
@@ -472,7 +470,6 @@
                     <rng:ref name="button"/>
                     <rng:ref name="group"/>
                     <rng:ref name="graph"/>
-		    <rng:ref name="gallery"/>
                     <rng:ref name="filter"/>
                     <rng:ref name="notebook"/>
                     <rng:ref name="html"/>
@@ -535,18 +532,6 @@
         </rng:element>
     </rng:define>
 
-    <rng:define name="gallery">
-        <rng:element name="gallery">
-            <rng:optional><rng:attribute name="string"/></rng:optional>
-            <rng:optional><rng:attribute name="width"/></rng:optional>
-            <rng:optional><rng:attribute name="height"/></rng:optional>
-            <rng:optional><rng:attribute name="col"/></rng:optional>
-            <rng:oneOrMore>
-                <rng:ref name="field"/>
-            </rng:oneOrMore>
-        </rng:element>
-    </rng:define>
-
     <rng:define name="button">
         <rng:element name="button">
             <rng:ref name="overload"/>
@@ -576,7 +561,6 @@
                     <rng:ref name="graph" />
                     <rng:ref name="calendar" />
                     <rng:ref name="gantt" />
-                    <rng:ref name="gallery" />
                     <rng:ref name="xpath" />
                     <rng:ref name="page" />
                     <rng:ref name="separator"/>
@@ -645,7 +629,6 @@
             <rng:ref name="calendar" />
             <rng:ref name="data" />
             <rng:ref name="gantt" />
-            <rng:ref name="gallery" />
             <rng:ref name="xpath" />
             <rng:ref name="page" />
             <rng:ref name="separator"/>

From a83920c20b4871c4e2b4eefb51fd4dc46ee70c1c Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 11 Oct 2010 18:51:28 +0530
Subject: [PATCH 567/632] [IMP] account_*: Improve view of all the menus coming
 under Configuration Menu

bzr revid: psi@tinyerp.co.in-20101011132128-g4rffrj7uv9q452w
---
 addons/account/account_view.xml               |  2 +-
 .../account_analytic_default_view.xml         |  2 +-
 .../account_followup_view.xml                 |  3 ++-
 .../account_invoice_layout_view.xml           |  3 ++-
 .../account_payment/account_payment_view.xml  | 21 ++++++++++++++++++-
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 63cbed81739..27fd0d65b14 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1640,7 +1640,7 @@
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <separator orientation="vertical"/>
                       <field name="name"/>
-                      <field name="journal_id"/>
+                      <field name="journal_id" widget="selection"/>
                       <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index b9f455d2231..5aad1f3521d 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -48,7 +48,7 @@
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="company_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index bbc3a8400a4..111870aa33b 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -73,7 +73,8 @@
                 <search string="Search Followup">
                    <group col="10" colspan="4">
                         <field name="name"/>
-                    </group>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index fdd4fa0781f..c9d3e32e892 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -75,7 +75,8 @@
                 <separator string="Write a notification or a wishful message." colspan="4"/>
                 <field name="name" select="1" colspan="2" />
                 <newline/>
-                <field name="msg" select="1" colspan="2"/>
+                <separator string="Special Message" colspan="4"/>
+                <field name="msg" select="1" nolabel="1" colspan="2"/>
             </form>
         </field>
     </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 01c8965f9a4..915da5c0f27 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -40,6 +40,23 @@
 
         <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="6"/>
 
+        <record id="view_payment_mode_search" model="ir.ui.view">
+            <field name="name">payment.mode.search</field>
+            <field name="model">payment.mode</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <form string="Payment Mode">
+                    <field name="name"/>
+                    <field name="journal" widget='selection'/>
+                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="view_payment_mode_tree" model="ir.ui.view">
             <field name="name">payment.mode.tree</field>
             <field name="model">payment.mode</field>
@@ -52,6 +69,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_payment_mode_form" model="ir.ui.view">
             <field name="name">payment.mode.form</field>
             <field name="model">payment.mode</field>
@@ -69,7 +87,8 @@
             <field name="name">Payment Mode</field>
             <field name="res_model">payment.mode</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_payment_mode_search"/>
         </record>
 
         <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc"/>

From c8bbcfdc57813e43230ff6ea513bd8e3926284ea Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 11 Oct 2010 18:55:25 +0530
Subject: [PATCH 568/632] [MOD/IMP] Account_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101011132525-hc2nmdmjaz6p7mju
---
 addons/account/account_invoice_view.xml              |  2 +-
 addons/account/account_view.xml                      | 10 +++++-----
 addons/account/wizard/account_invoice_state_view.xml |  2 +-
 addons/account_budget/account_budget_view.xml        |  2 +-
 addons/base_calendar/base_calendar_view.xml          | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e72bd584f9d..0825aad8831 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -209,8 +209,8 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
-                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 36ee5255523..f2beba72a12 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -471,8 +471,8 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end" invisible="1"/>
                     <field name="state"/>
-                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
+                    <button type="object" string="Confirm" name="button_confirm_bank" states="draft" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -553,9 +553,9 @@
                     <group col="8" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -585,9 +585,9 @@
                     <group col="8" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -1470,9 +1470,9 @@
                     <group col="7" colspan="4">
                         <field name="state"/>
                         <field name="balance_end"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -2455,9 +2455,9 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
                     <field name="state"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 6f6dca22e46..8e9c04b788d 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -33,8 +33,8 @@
             <form string="Cancel Selected Invoices">
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
                         <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="terp-dialog-close" special="cancel" string="Close"/>
                    </group>
             </form>
             </field>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index d6c4b82e960..a1aeb93252c 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -147,10 +147,10 @@
                             </field>
                             <field name="state" select="1"/>
                             <group col="4" colspan="2">
+                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
                                 <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
-                                <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
                                 <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
                             </group>
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index ba91c4b75dd..bc581955571 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -313,6 +313,11 @@
                         <separator colspan="4" string="" />
                            <group col="5" colspan="4">
                                <field name="state" select="2" />
+                               <button name="do_cancel"
+                                   string="Cancel"
+                                   states="tentative,confirmed"
+                                   type="object"
+                                   icon="gtk-cancel" />
                                <button name="do_tentative"
                                    states="confirmed,cancelled"
                                    string="Uncertain"
@@ -323,11 +328,6 @@
                                    states="tentative,cancelled"
                                    type="object"
                                    icon="gtk-apply" />
-                               <button name="do_cancel"
-                                   string="Cancel"
-                                   states="tentative,confirmed"
-                                   type="object"
-                                   icon="gtk-cancel" />
                            </group>
                         </page>
                         <page string="Invitation Detail">
@@ -475,7 +475,7 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-                            
+
                         </group>
                 </search>
             </field>

From 4fa6f8317732d77fab7ec76a158ef8c1194f6539 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 11 Oct 2010 19:05:12 +0530
Subject: [PATCH 569/632] [MOD/IMP] CRM_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101011133512-itlt90clyzunqvot
---
 addons/crm/crm_meeting_view.xml                 |  6 +++---
 addons/crm/crm_phonecall_view.xml               |  8 ++++----
 addons/crm/res_partner_view.xml                 |  8 ++++----
 addons/crm_claim/crm_claim_view.xml             | 12 ++++++------
 addons/crm_fundraising/crm_fundraising_view.xml | 12 ++++++------
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 12 ++++++------
 addons/crm_partner_assign/res_partner_view.xml  |  6 +++---
 7 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 62d4e9cd59b..d433e6a62ca 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -244,6 +244,9 @@
                 <field name="state" groups="base.group_extended"/>
                 <field name="user_id" invisible="1"/>
                 <field name="show_as" invisible="1" string="Show time as"/>
+                <button name="case_cancel" string="Cancel"
+                   states="draft,open" type="object"
+                   icon="gtk-cancel" />
                 <button name="case_reset" string="Reset to Unconfirmed"
                    states="open,done,cancel" type="object"
                    icon="gtk-convert" />
@@ -253,9 +256,6 @@
                 <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
-                <button name="case_cancel" string="Cancel"
-                   states="draft,open" type="object"
-                   icon="gtk-cancel" />
             </tree>
         </field>
     </record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index afc6edd5295..5d322d17727 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -40,10 +40,10 @@
                     states="draft,open,pending" icon="gtk-redo"
                      name="action_make_meeting" type="object" />
                 <field name="state"/>
+                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                 <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
             </tree>
         </field>
     </record>
@@ -105,6 +105,9 @@
                 <separator colspan="4" />
                 <group col="8" colspan="4">
                     <field name="state" select="1" />
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -116,9 +119,6 @@
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object"
                         icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                 </group>
             </form>
         </field>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 6ca978ea153..75189fb70f5 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -26,6 +26,9 @@
                                  invisible="context.get('invisible_section', True)" />
                              <field name="user_id" />
                              <field name="state" />
+                             <button name="case_cancel" string="Cancel"
+                                 states="draft,open,pending" type="object"
+                                 icon="gtk-cancel" />
                              <button name="case_open" string="Open"
                                  states="draft,pending" type="object"
                                  icon="gtk-go-forward" />
@@ -39,9 +42,6 @@
                              <button name="case_escalate" string="Escalate"
                                  states="open,draft,pending" type="object"
                                  icon="gtk-go-up" />
-                             <button name="case_cancel" string="Cancel"
-                                 states="draft,open,pending" type="object"
-                                 icon="gtk-cancel" />
                          </tree>
                     </field>
                     <field name="meeting_ids" colspan="4" nolabel="1" >
@@ -59,10 +59,10 @@
                             <field name="categ_id"/>
                             <field name="user_id"/>
                             <field name="state"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                             <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause"/>
-                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6b5f21df920..a52c5d7e93f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -53,6 +53,9 @@
                     <field name="categ_id" string="Type" select="1"/>
                     <field name="stage_id" invisible="1"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -62,9 +65,6 @@
                     <button name="case_close" string="Close"
                         states="open,draft,pending" type="object"
                         icon="gtk-close" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object" icon="gtk-convert" />
                 </tree>
@@ -130,6 +130,9 @@
                                 <separator colspan="4" string=""/>
                                 <group col="8" colspan="4">
                                     <field name="state" select="1"/>
+                                    <button name="case_cancel" string="Cancel"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-cancel" />
                                     <button name="case_open" string="Open"
                                     states="draft,pending" type="object"
                                     icon="gtk-go-forward" />
@@ -139,9 +142,6 @@
                                     <button name="case_close" string="Done"
                                     states="open,draft,pending" type="object"
                                     icon="gtk-jump-to" />
-                                    <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
                                     <button name="case_reset"
                                     string="Reset to Draft" states="done,cancel"
                                     type="object" icon="gtk-convert" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6bcf019dabe..f38b46c0a5e 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -54,6 +54,9 @@
                     <field name="user_id" />
                     <field name="state" />
                     <field name="partner_id" invisible="1"/>
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -66,9 +69,6 @@
                     <button name="case_close" string="Done"
                         states="open,draft,pending" type="object"
                         icon="gtk-close" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object" icon="gtk-convert" />
                 </tree>
@@ -115,6 +115,9 @@
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state"/>
+                                <button name="case_cancel" string="Cancel"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-cancel" />
                                 <button name="case_open" string="Open"
                                     states="draft,pending" type="object"
                                     icon="gtk-go-forward" />
@@ -128,9 +131,6 @@
                                 <button name="case_close" string="Done"
                                     states="open,draft,pending" type="object"
                                     icon="gtk-close" />
-                                <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
                                 <button name="case_reset"
                                     string="Reset to Draft" states="done,cancel"
                                     type="object" icon="gtk-convert" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0531092dd98..b792097534d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -69,6 +69,9 @@
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state" select="1"/>
+                                <button name="case_cancel"
+                                    states="draft,open,pending" string="Cancel"
+                                    type="object" icon="gtk-cancel" />
                                 <button name="case_open"
                                     states="draft,pending" string="Open"
                                     type="object" icon="gtk-go-forward" />
@@ -82,9 +85,6 @@
                                 <button name="case_close"
                                     states="open,draft,pending" string="Close"
                                     type="object" icon="gtk-jump-to" />
-                                <button name="case_cancel"
-                                    states="draft,open,pending" string="Cancel"
-                                    type="object" icon="gtk-cancel" />
                                 <button name="case_reset"
                                     states="done,cancel"
                                     string="Reset to Draft" type="object"
@@ -187,6 +187,9 @@
                     <field name="section_id"/>
                     <field name="priority"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
@@ -200,9 +203,6 @@
                     <button name="case_close" string="Done"
                         states="open,draft,pending" type="object"
                         icon="gtk-close" />
-                    <button name="case_cancel" string="Cancel"
-                        states="draft,open,pending" type="object"
-                        icon="gtk-cancel" />
                     <button name="case_reset" string="Reset to Draft"
                         states="done,cancel" type="object" icon="gtk-convert" />
                 </tree>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index ab14e7ca7b0..c340483f024 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -100,6 +100,9 @@
                                  invisible="context.get('invisible_section', True)" />
                              <field name="user_id" />
                              <field name="state" />
+                             <button name="case_cancel" string="Cancel"
+                                 states="draft,open,pending" type="object"
+                                 icon="gtk-cancel" />
                              <button name="case_open" string="Open"
                                  states="draft,pending" type="object"
                                  icon="gtk-go-forward" />
@@ -113,9 +116,6 @@
                              <button name="case_escalate" string="Escalate"
                                  states="open,draft,pending" type="object"
                                  icon="gtk-go-up" />
-                             <button name="case_cancel" string="Cancel"
-                                 states="draft,open,pending" type="object"
-                                 icon="gtk-cancel" />
                          </tree>
                     </field>
                 </page>

From eec37bdb7786b497ba7f7af9f35e91fabf80bc51 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 20:15:40 +0530
Subject: [PATCH 570/632] [FIX] base : Partner's Spam email wizard fixed

bzr revid: ach@tinyerp.com-20101011144540-fa5t23ys1c05403l
---
 bin/addons/base/res/partner/wizard/partner_wizard_spam.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/partner/wizard/partner_wizard_spam.py b/bin/addons/base/res/partner/wizard/partner_wizard_spam.py
index 8f85833d650..f349825d588 100644
--- a/bin/addons/base/res/partner/wizard/partner_wizard_spam.py
+++ b/bin/addons/base/res/partner/wizard/partner_wizard_spam.py
@@ -47,7 +47,7 @@ class partner_wizard_spam(osv.osv_memory):
 
         nbr = 0
         partner_pool = self.pool.get('res.partner')
-        data = self.browse(cr, uid, ids, context=context)
+        data = self.browse(cr, uid, ids[0], context=context)
         event_pool = self.pool.get('res.partner.event')
         active_ids = context and context.get('active_ids', [])
         partners = partner_pool.browse(cr, uid, active_ids, context)
@@ -61,7 +61,7 @@ class partner_wizard_spam(osv.osv_memory):
                     tools.email_send(data.email_from, [to], data.subject, data.text,subtype='html')
                     nbr += 1
             event_pool.create(cr, uid,
-                    {'name': 'Email sent through mass mailing',
+                    {'name': 'Email(s) sent through mass mailing',
                      'partner_id': partner.id,
                      'description': data.text })
     #TODO: log number of message sent

From 494f8f778da8594781f9b736f9a6a16bbeb52084 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 20:16:55 +0530
Subject: [PATCH 571/632] [FIX] base : Removed Translation References of
 ir.rule.group

bzr revid: ach@tinyerp.com-20101011144655-e6oqb3xb6grtutid
---
 bin/addons/base/i18n/am.po    | 44 ------------------------------
 bin/addons/base/i18n/ar.po    | 44 ------------------------------
 bin/addons/base/i18n/base.pot | 44 ------------------------------
 bin/addons/base/i18n/bg.po    | 48 ---------------------------------
 bin/addons/base/i18n/bs.po    | 44 ------------------------------
 bin/addons/base/i18n/ca.po    | 46 -------------------------------
 bin/addons/base/i18n/cs.po    | 44 ------------------------------
 bin/addons/base/i18n/da.po    | 44 ------------------------------
 bin/addons/base/i18n/de.po    | 47 --------------------------------
 bin/addons/base/i18n/el.po    | 46 -------------------------------
 bin/addons/base/i18n/en_GB.po | 44 ------------------------------
 bin/addons/base/i18n/es.po    | 45 -------------------------------
 bin/addons/base/i18n/es_AR.po | 45 -------------------------------
 bin/addons/base/i18n/es_EC.po | 45 -------------------------------
 bin/addons/base/i18n/et.po    | 44 ------------------------------
 bin/addons/base/i18n/eu.po    | 44 ------------------------------
 bin/addons/base/i18n/fa.po    | 47 --------------------------------
 bin/addons/base/i18n/fi.po    | 45 -------------------------------
 bin/addons/base/i18n/fr.po    | 46 -------------------------------
 bin/addons/base/i18n/gl.po    | 44 ------------------------------
 bin/addons/base/i18n/he.po    | 44 ------------------------------
 bin/addons/base/i18n/hr.po    | 44 ------------------------------
 bin/addons/base/i18n/hu.po    | 44 ------------------------------
 bin/addons/base/i18n/id.po    | 44 ------------------------------
 bin/addons/base/i18n/is.po    | 44 ------------------------------
 bin/addons/base/i18n/it.po    | 50 ----------------------------------
 bin/addons/base/i18n/ja.po    | 44 ------------------------------
 bin/addons/base/i18n/ko.po    | 44 ------------------------------
 bin/addons/base/i18n/lt.po    | 44 ------------------------------
 bin/addons/base/i18n/lt_LT.po | 44 ------------------------------
 bin/addons/base/i18n/lv.po    | 46 -------------------------------
 bin/addons/base/i18n/mn.po    | 44 ------------------------------
 bin/addons/base/i18n/nb.po    | 44 ------------------------------
 bin/addons/base/i18n/nl.po    | 47 --------------------------------
 bin/addons/base/i18n/nl_BE.po | 46 -------------------------------
 bin/addons/base/i18n/nl_NL.po | 46 -------------------------------
 bin/addons/base/i18n/pl.po    | 46 -------------------------------
 bin/addons/base/i18n/pt.po    | 45 -------------------------------
 bin/addons/base/i18n/pt_BR.po | 46 -------------------------------
 bin/addons/base/i18n/ro.po    | 44 ------------------------------
 bin/addons/base/i18n/ru.po    | 51 -----------------------------------
 bin/addons/base/i18n/sk.po    | 44 ------------------------------
 bin/addons/base/i18n/sl.po    | 44 ------------------------------
 bin/addons/base/i18n/sq.po    | 44 ------------------------------
 bin/addons/base/i18n/sr.po    | 46 -------------------------------
 bin/addons/base/i18n/sv.po    | 44 ------------------------------
 bin/addons/base/i18n/th.po    | 44 ------------------------------
 bin/addons/base/i18n/tlh.po   | 44 ------------------------------
 bin/addons/base/i18n/tr.po    | 46 -------------------------------
 bin/addons/base/i18n/uk.po    | 44 ------------------------------
 bin/addons/base/i18n/uk_UA.po | 44 ------------------------------
 bin/addons/base/i18n/vi.po    | 44 ------------------------------
 bin/addons/base/i18n/zh_CN.po | 44 ------------------------------
 bin/addons/base/i18n/zh_TW.po | 44 ------------------------------
 54 files changed, 2427 deletions(-)

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 718ec294ec0..9ab01f41afd 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index de0a35e7dfe..8080be966a3 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -248,11 +248,6 @@ msgstr "%y - السنة بدون القرن (من 00 إلى 99)"
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index f3b7e08da87..dfe019bdda2 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -242,11 +242,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -781,11 +776,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1295,7 +1285,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1390,11 +1379,6 @@ msgstr ""
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2098,11 +2082,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2696,11 +2675,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3016,7 +2990,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3669,11 +3642,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4001,11 +3969,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4613,11 +4576,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4862,7 +4820,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -5962,7 +5919,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 325288006a4..141f3e3b521 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -256,11 +256,6 @@ msgstr "%y - Година без век, като десетично число
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Това правило е удовлетворено ако поне един тест е истина"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Уеб-страница"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тестове"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1365,7 +1355,6 @@ msgstr "Брой обновени модули"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1473,13 +1462,6 @@ msgstr ""
 "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 "символи!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Направете правилото глобално, в противен случай то трябва да се зададе към "
-"определена група."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2195,11 +2177,6 @@ msgstr "Роли"
 msgid "Countries"
 msgstr "Държави"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила на записа"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2832,11 +2809,6 @@ msgstr "Удовлетвореност"
 msgid "Benin"
 msgstr "Бенин"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Правилото е удовлетворено ако всички тестове за истина (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3162,7 +3134,6 @@ msgstr "Казахстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3834,11 +3805,6 @@ msgstr "Наследен изглед"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4168,13 +4134,6 @@ msgstr "А4"
 msgid "Search View Ref."
 msgstr "\"Изглед\" търсене в справки"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Няколко правила към един и същ обект са обединени с помощта на оператор OR "
-"(или)"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4803,11 +4762,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Реюнион (Франция)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Общи"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5056,7 +5010,6 @@ msgstr "Доставчик на компоненти"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6187,7 +6140,6 @@ msgstr "Възвращаемо"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index 5eace0482b4..b6658bb0459 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -257,11 +257,6 @@ msgstr "%y - Godina bez stoljeća kao decimalni broj [00,99]"
 msgid "STOCK_GOTO_FIRST"
 msgstr "SKLADIŠTE_IDI_NA_PRVI"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je zadovoljeno ako je makar jedan test tačan"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -811,11 +806,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1342,7 +1332,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1445,11 +1434,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2159,11 +2143,6 @@ msgstr "Uloge"
 msgid "Countries"
 msgstr "Zemlje"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2774,11 +2753,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3098,7 +3072,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3758,11 +3731,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4090,11 +4058,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4715,11 +4678,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4966,7 +4924,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6080,7 +6037,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 68f51968a1a..5a48c0fdacc 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -258,11 +258,6 @@ msgstr "%y - Any sense centúria com un número decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla és satisfeta si almenys un test és Cert"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Lloc web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Proves"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1365,7 +1355,6 @@ msgstr "Número de mòduls actualitzats"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1473,11 +1462,6 @@ msgstr ""
 "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Feu la regla global, sinó necessitarà ser inclosa en un grup"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2193,11 +2177,6 @@ msgstr "Rols"
 msgid "Countries"
 msgstr "Països"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Regles de registre"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2830,11 +2809,6 @@ msgstr "Grau de satisfacció"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla es satisfà si tots els tests són Verdader (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3159,7 +3133,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3830,11 +3803,6 @@ msgstr "Vista heretada"
 msgid "ir.translation"
 msgstr "ir.traduccio"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.regla.grup"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4162,13 +4130,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Ref. vista cerca"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Sobre un mateix objecte, les regles múltiples s'associen utilitzan "
-"l'operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4796,11 +4757,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunió (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5049,7 +5005,6 @@ msgstr "Proveïdor de components"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6181,7 +6136,6 @@ msgstr "Devolució"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index aa4ad43cbc3..4d9e7bd26e8 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr "Webová stránka"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testy"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr "Počet aktualizovaných modulů"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 msgstr ""
 "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr "Funkce"
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2759,11 +2738,6 @@ msgstr "Názor(State of mind)"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3083,7 +3057,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3743,11 +3716,6 @@ msgstr "Inherited View(Inherited View)"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4075,11 +4043,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4696,11 +4659,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4947,7 +4905,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6060,7 +6017,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 614b8a8f285..402776a0302 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr "Hjemmeside"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Test"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 968b8392abe..86775b8ffa3 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -257,11 +257,6 @@ msgstr "%y - Jahr ohne Jahrtausend [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Die Regel ist erfüllt wenn mindestens ein Test korrekt ist."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1367,7 +1357,6 @@ msgstr "Anzahl Module mit Updates"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1478,13 +1467,6 @@ msgstr ""
 "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
 "beinhalten"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Mache die Regel global gültig, ansonsten muss diese auf Gruppeneben "
-"definiert werden."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2200,11 +2182,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Länder"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Aufzeichnung Regel"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2836,11 +2813,6 @@ msgstr "Kundenzufriedenheit"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Die Regel ist für mich o.K. falls alle Tests erfolgreich verlaufen."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3162,7 +3134,6 @@ msgstr "Kasachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3834,11 +3805,6 @@ msgstr "Abgeleitete Ansicht"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4166,12 +4132,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Suche Ansicht Referenz"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Mehrere Regeln für dasselbe Objekt werden mit dem Operator OR verbunden"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4802,11 +4762,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (franz.)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5055,7 +5010,6 @@ msgstr "Komponenten Lieferant"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6186,7 +6140,6 @@ msgstr "Rückgabe"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 5e1718b2d48..dbaa66d3f52 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -261,11 +261,6 @@ msgstr "%y - Χρονολογία χωρίς τον αιώνα, σε δεκαδ
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Ο κανόνας πληροίται αν τουλάχιστον ένα τεστ είναι Ορθό"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +814,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Ιστοσελίδα"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1365,7 +1355,6 @@ msgstr "Αριθμός Αρθρωμάτων που ενημερώθηκαν"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1472,11 +1461,6 @@ msgid ""
 msgstr ""
 "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Κάντε τον κανόνα γενικό, αλλιώς πρέπει να μπει σε ένα μια ομάδα"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2194,11 +2178,6 @@ msgstr "Ρόλοι"
 msgid "Countries"
 msgstr "Χώρες"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Καταχώρηση κανόνων"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2835,11 +2814,6 @@ msgstr "Προδιάθεση"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Ο κανόνας πληροίται αν τουλάχιστον ένα τεστ είναι Ορθό (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3164,7 +3138,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3835,11 +3808,6 @@ msgstr "Παράγωγος Προβολή"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4169,13 +4137,6 @@ msgstr "Α4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Πολλαπλοί κανόνες στα ίδια αντικείμενα συνδέονται μέσω της λογικής "
-"συνάρτησης 'Ή'"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4802,11 +4763,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Παγκόσμια"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5055,7 +5011,6 @@ msgstr "Προμηθευτής Μερών"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6188,7 +6143,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 098e3d1129a..2c28b7d1dd4 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -259,11 +259,6 @@ msgstr "%y - Year without century as a decimal number [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "The rule is satisfied if at least one test is True"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1362,7 +1352,6 @@ msgstr "Number of modules updated"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1469,11 +1458,6 @@ msgid ""
 msgstr ""
 "The Object name must start with x_ and not contain any special character !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Make the rule global, otherwise it needs to be put on a group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2189,11 +2173,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Countries"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Record rules"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2825,11 +2804,6 @@ msgstr "State of Mind"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "The rule is satisfied if all test are True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3153,7 +3127,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3822,11 +3795,6 @@ msgstr "Inherited View"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4155,11 +4123,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Search View Ref."
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Multiple rules on same objects are joined using operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4785,11 +4748,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5038,7 +4996,6 @@ msgstr "Components Supplier"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6167,7 +6124,6 @@ msgstr "Returning"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index be23757ec05..53727c6eec7 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -258,11 +258,6 @@ msgstr "%y - Año sin siglo como un número decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla se satisface si por lo menos un test es Verdadero (OR)"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -818,11 +813,6 @@ msgstr "ir.modelo.config"
 msgid "Website"
 msgstr "Sitio web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pruebas"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1368,7 +1358,6 @@ msgstr "Número de módulos actualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1476,11 +1465,6 @@ msgstr ""
 "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Haga la regla global, sino necesitará ser incluida en un grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2196,11 +2180,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reglas de registro"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2833,11 +2812,6 @@ msgstr "Grado de satisfacción"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla se satisface si todos los tests son Verdadero (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3163,7 +3137,6 @@ msgstr "Kazajstán"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3835,11 +3808,6 @@ msgstr "Vista heredada"
 msgid "ir.translation"
 msgstr "ir.traduccion"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.regla.grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4167,12 +4135,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Ref. vista búsqueda"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Las reglas múltiples sobre un mismo objeto se asocian usando el operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4800,11 +4762,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5053,7 +5010,6 @@ msgstr "Proveedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6185,7 +6141,6 @@ msgstr "Devolución"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po
index 6088fcba91f..8e2cfe27929 100644
--- a/bin/addons/base/i18n/es_AR.po
+++ b/bin/addons/base/i18n/es_AR.po
@@ -247,11 +247,6 @@ msgstr "%y - Año sin siglo como un número decimal [00,99]."
 msgid "Validated"
 msgstr "Validado"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla se satisface si por lo menos un test es Verdadero"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +814,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Sitio web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pruebas"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1366,7 +1356,6 @@ msgstr "El método set_memory no está implementado !"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1469,11 +1458,6 @@ msgstr ""
 "El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2181,11 +2165,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reglas de registro"
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2813,11 +2792,6 @@ msgstr "Establecer a NULL"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla se satisface si todos los tests son Verdaderas (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3129,7 +3103,6 @@ msgstr "Kazajstán"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3828,11 +3801,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4121,12 +4089,6 @@ msgstr "Cabecera interna RML"
 msgid "a4"
 msgstr "A4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Las reglas múltiples sobre un mismo objeto se asocian usando el operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4795,11 +4757,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5033,7 +4990,6 @@ msgstr "Proveedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6159,7 +6115,6 @@ msgstr "Padre"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index 88d23a33bfa..ef7691650d5 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -257,11 +257,6 @@ msgstr "%y - Año sin siglo como un número decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La regla se satisface si por lo menos un test es Verdadero (OR)"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -817,11 +812,6 @@ msgstr "ir.modelo.config"
 msgid "Website"
 msgstr "Sitio web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pruebas"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1367,7 +1357,6 @@ msgstr "Número de módulos actualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1475,11 +1464,6 @@ msgstr ""
 "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Haga la regla global, sino necesitará ser incluida en un grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2195,11 +2179,6 @@ msgstr "Roles"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reglas de registro"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2832,11 +2811,6 @@ msgstr "Grado de satisfacción"
 msgid "Benin"
 msgstr "Benín"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La regla se satisface si todos los tests son Verdadero (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3161,7 +3135,6 @@ msgstr "Kazajstán"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3833,11 +3806,6 @@ msgstr "Vista heredada"
 msgid "ir.translation"
 msgstr "ir.traduccion"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.regla.grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4165,12 +4133,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Ref. vista búsqueda"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Las reglas múltiples sobre un mismo objeto se asocian usando el operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4798,11 +4760,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunión (Francesa)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5051,7 +5008,6 @@ msgstr "Proveedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6183,7 +6139,6 @@ msgstr "Devolución"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 2d639fd8d86..ffd58080bf3 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -255,11 +255,6 @@ msgstr "%y - Aasta ilma sajandita kümnendarvuna [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "See reegel on rahuldatud kui vähemalt üks test on tõene"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -810,11 +805,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Veebileht"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testid"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1351,7 +1341,6 @@ msgstr "Uuendatud moodulite arv"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1458,11 +1447,6 @@ msgid ""
 msgstr ""
 "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Tee see reegel globaalseks, Teisel juhul peab ta panema gruppi"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2178,11 +2162,6 @@ msgstr "Rollid"
 msgid "Countries"
 msgstr "Riigid"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Kirje reeglid"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2813,11 +2792,6 @@ msgstr "Meeleolu"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Reegel on rahuldatud, kui kõik testid on Tõesed (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3140,7 +3114,6 @@ msgstr "Kasahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3807,11 +3780,6 @@ msgstr "Päritud vaade"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4139,11 +4107,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Mitmikreeglid samadel objektidel ühendatakse operaatoriga O"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4770,11 +4733,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Prantsuse)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globaalne"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5023,7 +4981,6 @@ msgstr "Komponentidega varustaja"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6149,7 +6106,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index a5bf4a24011..f1b900b3804 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index 0aa5c25bfbb..299bd9393ab 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -256,11 +256,6 @@ msgstr "%y - سال بدون دو شماره نخست به شکل یک شمار
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "در صورتی که یک تست درست باشد قاعده رعایت شده است"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "تارنما"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "آزمایش‌ها"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1362,7 +1352,6 @@ msgstr "تعداد پیمانه‌های بروزرسانده"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1468,13 +1457,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "نام شی باید با 'x_' آغاز شود و دارای هیچ نویسه ویژه‌ای نباشد!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"قاعده را فراگیر می‌کند، در غیر این صورت لازم است آن را به یک گروه یا کاربر "
-"بدهید"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2191,11 +2173,6 @@ msgstr "نقش‌ها"
 msgid "Countries"
 msgstr "کشورها"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "قواعد رکورد"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2829,11 +2806,6 @@ msgstr "وضعیت فکری"
 msgid "Benin"
 msgstr "بنین"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "در صورتی که تمامی تست‌ها درست باشند قاعده رعایت شده است. (و منطقی)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3156,7 +3128,6 @@ msgstr "قزاقستان"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3825,11 +3796,6 @@ msgstr "نمای موروثی"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4157,12 +4123,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "مرجع نمای جستجو"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"چندین قاعده روی اشیای همسان بوسیله گرداننده یای منطقی به هم پیوسته شدند"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4789,11 +4749,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "گویان فرانسه"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "فراگیر"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5042,7 +4997,6 @@ msgstr "تامین‌کننده اجزا"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6172,7 +6126,6 @@ msgstr "بازگشتی"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index 4e1a3189281..d9d6c9d941b 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -257,11 +257,6 @@ msgstr "%y - Vuosiluku ilman vuosisatoja desimaalilukuna [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Sääntö toteutuu jos vähintään yksi testeistä on \"tosi\""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web-sivusto"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testit"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1356,7 +1346,6 @@ msgstr "Päivitettyjen moduulien määrä"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1461,11 +1450,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Tee säännöstä yleinen, muuten se pitää laittaa ryhmään"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2181,11 +2165,6 @@ msgstr "Työtehtävät"
 msgid "Countries"
 msgstr "Maat"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Tietuesäännöt"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2819,11 +2798,6 @@ msgstr "Mielentila"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Sääntö täyttyy jos kaikki testit ovat tosia"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3148,7 +3122,6 @@ msgstr "Kazakstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3818,11 +3791,6 @@ msgstr "Peritty näkymä"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4150,12 +4118,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Monta sääntöä samalle objektille liitetään käyttämällä operaattoria TAI"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4783,11 +4745,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Réunion (Ranska)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Yleinen"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5036,7 +4993,6 @@ msgstr "Komponenttien toimittajat"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6167,7 +6123,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index d3bbc43f35c..3a6eeab5c6d 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -259,11 +259,6 @@ msgstr "%y - Année dans le siècle comme un nombre décimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "La règle est satisfaite si au moins un test est Vrai"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -818,11 +813,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Site Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1368,7 +1358,6 @@ msgstr "Nombre de modules mis à jour"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1476,13 +1465,6 @@ msgstr ""
 "Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
 "caractères spéciaux !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Faire une règle globale, sinon il sera nécessaire de mettre un groupe ou "
-"utilisateur"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2199,11 +2181,6 @@ msgstr "Rôles"
 msgid "Countries"
 msgstr "Pays"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Enregistrer la règle"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2838,11 +2815,6 @@ msgstr "État d'esprit"
 msgid "Benin"
 msgstr "Bénin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "La règle est satisfaite si tous les tests sont Vrai (ET)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3167,7 +3139,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3841,11 +3812,6 @@ msgstr "Vue héritée"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4173,11 +4139,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Vue de recherche"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Un \"ou\" est fait entre toutes les règles concernant le même objet."
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4806,11 +4767,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Réunion (Française)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5059,7 +5015,6 @@ msgstr "Fournisseurs de composants"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6192,7 +6147,6 @@ msgstr "Retour"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 5d303846db7..5f0b6e3b32a 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 40e0f35f606..cbe4e9067e7 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -256,11 +256,6 @@ msgstr "%y -שנה במבנה שתי ספרות [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "מספיקה בדיקה אחת נכונה וההוראה היא חוקית"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -811,11 +806,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "אתר"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "בדיקות"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1348,7 +1338,6 @@ msgstr "מספר מודולים עודכנו."
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1451,11 +1440,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "שם האובייקט חייב להתחיל עם X_ולא להכיל תוים מיוחדים!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2169,11 +2153,6 @@ msgstr "תפקיד"
 msgid "Countries"
 msgstr "מדינות"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "חוקי רישום"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2797,11 +2776,6 @@ msgstr "מַצַּב רוּחַ"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "ההוראה מיושמת אם כל הבדיקות הם TRUE (וגם)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3121,7 +3095,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3785,11 +3758,6 @@ msgstr "מבט יורש"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4117,11 +4085,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "חוקים מרובים על אותו אובייקט מצורפים ע\"י שימוש במפעיל OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4746,11 +4709,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (French)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "גלובלי"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4997,7 +4955,6 @@ msgstr "רכיבי ספק"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6116,7 +6073,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 679d8a9bf38..09aa6e981a6 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -258,11 +258,6 @@ msgstr "%y - Godina bez stoljeća kao decimalni broj [00,99]"
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je zadovoljeno ako je barem jedan test točan"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web stranice"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testovi"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1354,7 +1344,6 @@ msgstr "Broj nadograđenih modula"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1460,11 +1449,6 @@ msgid ""
 msgstr ""
 "Naziv objekta mora početi s x_ i ne smije sadržavati posebne znakove !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Napravite globalno pravilo, inače je potrebno staviti ga u grupu"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2174,11 +2158,6 @@ msgstr "Uloge"
 msgid "Countries"
 msgstr "Države"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Pravila zapisa"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2801,11 +2780,6 @@ msgstr "Stanje svijesti"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3126,7 +3100,6 @@ msgstr "Kazahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3786,11 +3759,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4118,11 +4086,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4739,11 +4702,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4990,7 +4948,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6103,7 +6060,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 4a1e1c08a53..4c9a39667d1 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index 27beb420c03..e99a5b9191d 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -258,11 +258,6 @@ msgstr "%y - Tahun tanpa abad sebagai angka desimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Aturan ini memuaskan jika setidaknya satu test Benar"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -807,11 +802,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1338,7 +1328,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1439,11 +1428,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2153,11 +2137,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2768,11 +2747,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3092,7 +3066,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3752,11 +3725,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4084,11 +4052,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4705,11 +4668,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4956,7 +4914,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6069,7 +6026,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index c1ee9927d16..eddb8f9faba 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index a43aa4a42de..c7ee91a97a2 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -258,12 +258,6 @@ msgstr "%y - Anno senza secolo come numero decimale [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-"La regola viene soddisfatta se almeno un test restituisce il valore True"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +813,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Sito Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Test"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1369,7 +1358,6 @@ msgstr "Numero di moduli aggiornati"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1477,12 +1465,6 @@ msgstr ""
 "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 "speciali!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Rende la regola globale, altrimenti deve essere inserita in un gruppo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2196,11 +2178,6 @@ msgstr "Ruoli"
 msgid "Countries"
 msgstr "Nazioni"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Registra Regole"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2834,13 +2811,6 @@ msgstr "Impressione"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-"La regola viene soddisfatta se tutti i test testituiscono il valore True "
-"(AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3166,7 +3136,6 @@ msgstr "Kazakistan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3839,11 +3808,6 @@ msgstr "Vista Collegata"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4171,13 +4135,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Rif. Vista Ricerca"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Regole multiple sugli stessi oggetti possonon essere combinate utilizzando "
-"l'operatore OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4806,11 +4763,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "La Réunion"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globale"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5058,7 +5010,6 @@ msgstr "Fornitori"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6188,7 +6139,6 @@ msgstr "Sto ritornando"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 9854b3d9c55..4a703076d64 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "このルールは、少なくとも一つのテストが通ることで満たされます。"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr "ウェブサイト"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "テスト"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1329,7 +1319,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1430,11 +1419,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2144,11 +2128,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2759,11 +2738,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3083,7 +3057,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3743,11 +3716,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4075,11 +4043,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4696,11 +4659,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4947,7 +4905,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6060,7 +6017,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index e8d4f6df07e..c3e8b6caa41 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -254,11 +254,6 @@ msgstr "%y - 백자리 단위를 뺀 년도 표시 [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "이 규칙은 적어도 하나의 테스트가 참일 때 적용됩니다."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -804,11 +799,6 @@ msgstr ""
 msgid "Website"
 msgstr "웹 사이트"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "테스트"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1338,7 +1328,6 @@ msgstr "갱신된 모듈들의 수"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1441,11 +1430,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2155,11 +2139,6 @@ msgstr "역할"
 msgid "Countries"
 msgstr "국가들"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "기록 규칙"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2782,11 +2761,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "이 규칙은 모든 테스트 결과가 참 (AND)일 때 적용됩니다."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3106,7 +3080,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3766,11 +3739,6 @@ msgstr "상속된 뷰"
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4098,11 +4066,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "동일 오브젝트에 대한 여러 규칙들은 OR 오퍼레이터로 연결됩니다."
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4724,11 +4687,6 @@ msgstr "재고_미디어_레코드"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "글로벌"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4975,7 +4933,6 @@ msgstr "컴포넌트 공급자"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6090,7 +6047,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index 5cb44432d4e..f0031333b10 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po
index 3dcb62f81fc..62eee0ce8ab 100644
--- a/bin/addons/base/i18n/lt_LT.po
+++ b/bin/addons/base/i18n/lt_LT.po
@@ -238,11 +238,6 @@ msgstr ""
 msgid "Validated"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -779,11 +774,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1302,7 +1292,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1392,11 +1381,6 @@ msgstr ""
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2091,11 +2075,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2690,11 +2669,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -2996,7 +2970,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3678,11 +3651,6 @@ msgstr ""
 msgid "Luxembourg"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -3968,11 +3936,6 @@ msgstr ""
 msgid "a4"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4627,11 +4590,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4861,7 +4819,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -5966,7 +5923,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index b731641cfa7..1e52e93b971 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -258,11 +258,6 @@ msgstr "%y - Gads, neskaitot gadsimtu, kā decimālskaitlis [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Filtrs ir derīgs, ja vismaz viens notikums izpildās (True)."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Tīkla vietne"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Pārbaudes"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1356,7 +1346,6 @@ msgstr "Jaunināto moduļu skaits"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1463,11 +1452,6 @@ msgid ""
 msgstr ""
 "Objekta nosaukumam jāsākas ar x_ un tas nedrīkst saturēt speciālos simbolus!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2186,11 +2170,6 @@ msgstr "Tiesības"
 msgid "Countries"
 msgstr "Valstis"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Ierakstu noteikumi"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2824,11 +2803,6 @@ msgstr "Apmierinātība"
 msgid "Benin"
 msgstr "Benina"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Noteikums ir pieņemts, ja visas pārbaudes atgriež True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3154,7 +3128,6 @@ msgstr "Kazahstāna"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3818,11 +3791,6 @@ msgstr "Mantotais Skatījums"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4150,13 +4118,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Multi izpildes noteikumi vieniem un tiem pašiem objektiem, tiek apvienoti ar "
-"operatoru OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4784,11 +4745,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reinjona"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Vispārēji"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5037,7 +4993,6 @@ msgstr "Komponentu Piegādātājs"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6161,7 +6116,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 247e7f202fe..ab4af442ebf 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -257,11 +257,6 @@ msgstr "%y - Мянгатын оронгүй жилийн тоон дугаар
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Дор хаяж нэг тест давбал дүрэмд нийцнэ"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -813,11 +808,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Вэбсайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тестүүд"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1359,7 +1349,6 @@ msgstr "Шинэчлэгдсэн модулийн тоо"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1467,11 +1456,6 @@ msgstr ""
 "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 "болохгүй!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Дүрмийг глобаль болгох эсвэл группэд байрлуулах хэрэгтэй"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2184,11 +2168,6 @@ msgstr "Дүрүүд"
 msgid "Countries"
 msgstr "Улс гүрнүүд"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2817,11 +2796,6 @@ msgstr "Нөхцөл байдал"
 msgid "Benin"
 msgstr "Бенин"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Бүх шалгалтыг давбал дүрэм хангагдана"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3142,7 +3116,6 @@ msgstr "Казакстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3811,11 +3784,6 @@ msgstr "Өргөтгөсөн дэлгэц"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4143,11 +4111,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Хайлтын дэлгэц."
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Нэг объект дээр олон дүрмүүд OR үйлдлээр холбогдсон байна"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4770,11 +4733,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобал"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5023,7 +4981,6 @@ msgstr "Эд анги нийлүүлэгч"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6144,7 +6101,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index eef57ddd6b6..7789d3d6ed0 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 2e2f548afde..0d1215a54cf 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -259,11 +259,6 @@ msgstr "%y - Jaar zonder eeuw als decimaal getal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Aan deze regel is voldaan als er tenminste één test 'waar' is."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -819,11 +814,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testen"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1368,7 +1358,6 @@ msgstr "Aantal bijgewerkte modules"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1475,12 +1464,6 @@ msgid ""
 msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Maak de regel globaal, anders dient deze in een groep te worden geplaatst"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2196,11 +2179,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Landen"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Recordregels"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2834,11 +2812,6 @@ msgstr "Loyaliteit"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "De regel is voldaan als alle testen Waar (AND) zijn."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3163,7 +3136,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3836,11 +3808,6 @@ msgstr "Afgeleide weergave"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4169,13 +4136,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Zoek weergave ref."
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Meerdere regels voor dezelfde objecten worden samengevoegd met behulp van de "
-"operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4804,11 +4764,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Frans)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Algemeen"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5057,7 +5012,6 @@ msgstr "Componenten leverancier"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6186,7 +6140,6 @@ msgstr "Terugkerend"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 907f58743dd..01fe20fcf9f 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -251,11 +251,6 @@ msgstr "%y - Jaartal zonder eeuw als decimaal getal [00,99]."
 msgid "Validated"
 msgstr "Gevalideerd"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Deze regel is goed als er tenminste 1 test 'waar' is."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -821,11 +816,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1358,7 +1348,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1457,11 +1446,6 @@ msgid ""
 msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2166,11 +2150,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Landen"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2791,11 +2770,6 @@ msgstr "Set NULL"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3102,7 +3076,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3797,11 +3770,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4087,13 +4055,6 @@ msgstr ""
 msgid "a4"
 msgstr "a4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Meerdere regels voor dezelfde objecten worden samengevoegd met behulp van de "
-"operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4767,11 +4728,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Frans)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5002,7 +4958,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6122,7 +6077,6 @@ msgstr "Bovenliggende"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po
index 018056b0afa..bde7d7d8e89 100644
--- a/bin/addons/base/i18n/nl_NL.po
+++ b/bin/addons/base/i18n/nl_NL.po
@@ -253,11 +253,6 @@ msgstr "%y - Jaar zonder eeuw als decimaal nummer [00,99]."
 msgid "Validated"
 msgstr "Gevalideerd"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Deze regel is goed als er tenminste 1 test 'waar' is."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -829,11 +824,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Tests"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1374,7 +1364,6 @@ msgstr "Niet geïmplenteerde set_memory methode !"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1476,11 +1465,6 @@ msgid ""
 msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2187,11 +2171,6 @@ msgstr "Rollen"
 msgid "Countries"
 msgstr "Landen"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Bericht regels"
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2828,11 +2807,6 @@ msgstr "Set NULL"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "De regel is OK als alle testen True (AND) zijn."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3143,7 +3117,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3841,11 +3814,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4132,13 +4100,6 @@ msgstr "RML Interne Koptekst"
 msgid "a4"
 msgstr "a4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Meerdere regels voor dezelfde objecten worden samengevoegd met behulp van de "
-"operator OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4814,11 +4775,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Frans)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Algemeen"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5052,7 +5008,6 @@ msgstr "Componenten leverancier"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6182,7 +6137,6 @@ msgstr "Bovenliggende"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index eca6c8a4393..43d72938fea 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -257,11 +257,6 @@ msgstr "%y - Rok dwucyfrowo jako liczba dziesiętna [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Reguła jest spełniona, jeśli co najmniej jeden test jest pozytywny"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -814,11 +809,6 @@ msgstr ""
 msgid "Website"
 msgstr "Strona WWW"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testy"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1364,7 +1354,6 @@ msgstr "Liczba zaktualizowanych modułów"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1472,13 +1461,6 @@ msgstr ""
 "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 "specjalnych !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Zdefiniuj regułę jak globalną, w przeciwnym przypadku musi ona być wstawiona "
-"do grupy"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2194,11 +2176,6 @@ msgstr "Role"
 msgid "Countries"
 msgstr "Kraje"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Reguły rekordów"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2831,11 +2808,6 @@ msgstr "Stan emocji"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Reguła będzie spełniona, jeśli wszystkie testy będą pozytywne (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3157,7 +3129,6 @@ msgstr "Kazachstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3827,11 +3798,6 @@ msgstr "Widok dziedziczony"
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4159,11 +4125,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Reguły dla tego samego obiektu są łączone operatorem LUB (OR)"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4791,11 +4752,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globalna"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5043,7 +4999,6 @@ msgstr "Dostawca komponentów"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6174,7 +6129,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index f2d03d46696..62322413fd2 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -258,11 +258,6 @@ msgstr "%y - Ano sem o século como um numero decimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "A regra é valida se pelo menos um teste for verdadeiro"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Página Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testes"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1364,7 +1354,6 @@ msgstr "Numero de módulos actualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1471,12 +1460,6 @@ msgid ""
 msgstr ""
 "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Estabeleça a regra como global, de outro modo terá de ser colocada num grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2192,11 +2175,6 @@ msgstr "Perfis"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Regras de gravação"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2827,11 +2805,6 @@ msgstr "Estado da mente"
 msgid "Benin"
 msgstr "Benim"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "A regra é satisfeita se todos os testes forem verdadeiras (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3155,7 +3128,6 @@ msgstr "Cazaquistão"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3824,11 +3796,6 @@ msgstr "Vista herdada"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4156,11 +4123,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Ref. da vista de pesquisa"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Multiplas funções no mesmo objecto são ligadas usando o operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4787,11 +4749,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunião (França)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5040,7 +4997,6 @@ msgstr "Fornecedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6172,7 +6128,6 @@ msgstr "A retornar"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 01a30d302a4..707fcef723f 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -258,11 +258,6 @@ msgstr "%y - Ano com 2 decimais [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "A regra será satisfeita se pelo menos um teste for verdadeiro"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Página da Web"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testes"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1364,7 +1354,6 @@ msgstr "Número de módulos atualizados"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1472,13 +1461,6 @@ msgstr ""
 "O nome do Objeto deve começar com x_ e não deve conter nenhum caracter "
 "especial!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-"Marque a regra como global - caso contrário, esta deve ser colocada em um "
-"grupo"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2194,11 +2176,6 @@ msgstr "Papéis"
 msgid "Countries"
 msgstr "Países"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Registro de Regras"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2830,11 +2807,6 @@ msgstr "Estado emocional"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "A regra será satisfeita se todos os testes forem verdadeiros (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3159,7 +3131,6 @@ msgstr "Cazaquistão"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3829,11 +3800,6 @@ msgstr "View herdada"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4161,11 +4127,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Multiplas regras em um mesmo objeto são unidas usando o operador OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4793,11 +4754,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunião"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Global"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5046,7 +5002,6 @@ msgstr "Fornecedor de componentes"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6174,7 +6129,6 @@ msgstr "Retornando"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 39f4f21635c..47bcccbfef2 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -259,11 +259,6 @@ msgstr "%y - An fara secol ca numar zecimal [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Regula este satisfacuta daca cel putin un test este Adevarat"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr ""
 msgid "Website"
 msgstr "Website"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Teste"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1346,7 +1336,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1447,11 +1436,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2161,11 +2145,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2776,11 +2755,6 @@ msgstr "Stare spirit"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3100,7 +3074,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3760,11 +3733,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4092,11 +4060,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4713,11 +4676,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4964,7 +4922,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6079,7 +6036,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 145d2f828f8..9710e4e5c80 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -257,11 +257,6 @@ msgstr "%y - Год без указания века как десятичное
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Удовлетворяет правилу, если результат хотя бы одной из проверок True"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -818,11 +813,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Сайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тесты"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1367,7 +1357,6 @@ msgstr "Количество обновленных модулей"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1475,11 +1464,6 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Задайте правило глобально или для определенной группы"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2195,11 +2179,6 @@ msgstr "Роли"
 msgid "Countries"
 msgstr "Страны"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила записи"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2833,11 +2812,6 @@ msgstr "Мнение"
 msgid "Benin"
 msgstr "Бенин"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Удовлетворяет правилу, если все условия 'True' (Логическое И)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3162,7 +3136,6 @@ msgstr "Казахстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3827,16 +3800,6 @@ msgstr ""
 msgid "Inherited View"
 msgstr "Унаследованный вид"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_translation
-msgid "ir.translation"
-msgstr "ir.translation"
-
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4164,13 +4127,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr "Поиск ссылки на обзор"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Монжественные правила для того же объекта объединены с использованием "
-"оператора ИЛИ"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4797,11 +4753,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Реюньон (заморский регион Франции)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобальный"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5050,7 +5001,6 @@ msgstr "Поставщик компонентов"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6176,7 +6126,6 @@ msgstr "Возвращаемое"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 5654b60553b..4d541d2efb4 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -259,11 +259,6 @@ msgstr "%y - Rok bez storočia ako desatinné číslo [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravidlo je splnené ak platí aspoň jedna z podmienok."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -813,11 +808,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Webová stránka"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testy"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1361,7 +1351,6 @@ msgstr "Počet aktualizovaných modulov"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1468,11 +1457,6 @@ msgid ""
 msgstr ""
 "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Spraviť pravidlo globálnym, inak je ho nutné pridať do skupiny"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2185,11 +2169,6 @@ msgstr "Role"
 msgid "Countries"
 msgstr "Krajiny"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2805,11 +2784,6 @@ msgstr "Stav mysle"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Podmienka je splená ak platia všetky podmienky (AND)."
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3129,7 +3103,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3789,11 +3762,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4121,11 +4089,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4742,11 +4705,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4993,7 +4951,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6106,7 +6063,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index fe867b0ae1f..8e4946642a1 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -250,11 +250,6 @@ msgstr "%y - Leto brez stoletij predstavljeno kot decimalno število [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je izpolnjeno, če je vsaj en test resničen"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -801,11 +796,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Spletno mesto"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Kriteriji"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1334,7 +1324,6 @@ msgstr "Število osveženih modulov"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1437,11 +1426,6 @@ msgid ""
 msgstr ""
 "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2151,11 +2135,6 @@ msgstr "Vloge"
 msgid "Countries"
 msgstr "Države"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Posnemi pravila"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2776,11 +2755,6 @@ msgstr "Razpoloženje partnerja"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Pravilo je izpolnjeno, če so vsi testi resnični (IN)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3101,7 +3075,6 @@ msgstr "Kazahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3761,11 +3734,6 @@ msgstr "Podedovan pogled"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4093,11 +4061,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Več pravil na istih objektih jih združenih z uporabo operatorja ALI"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4718,11 +4681,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globalno"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4971,7 +4929,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6091,7 +6048,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index 98911a06d0b..a9a3d60a2bb 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -254,11 +254,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -801,11 +796,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1332,7 +1322,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1433,11 +1422,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2147,11 +2131,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2762,11 +2741,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3086,7 +3060,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3746,11 +3719,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4078,11 +4046,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4699,11 +4662,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4950,7 +4908,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6063,7 +6020,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 3d0dc60859e..8c7af14853b 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -258,11 +258,6 @@ msgstr "%y - Godina bez veka kao decimalni broj [00,99]"
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Pravilo je zadovoljeno ako je bar jedan test tačan"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -816,11 +811,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web stranica"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Testovi"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1358,7 +1348,6 @@ msgstr "Broj ažuriranih modula"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1465,11 +1454,6 @@ msgid ""
 msgstr ""
 "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne znake!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2185,11 +2169,6 @@ msgstr "Uloge"
 msgid "Countries"
 msgstr "Zemlje"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Pravila zapisa"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2822,11 +2801,6 @@ msgstr "Stanje uma"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Pravilo je zadovoljeno ako su svi testovi istina (logičko I (AND))"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3150,7 +3124,6 @@ msgstr "Kazahstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3815,11 +3788,6 @@ msgstr "Nasleđeni pregled"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4147,13 +4115,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Više pravila nad istim objektom se priključuju korišćenjem operatora "
-"logičkog ILI (OR)"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4781,11 +4742,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Franciska)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Globalno"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5032,7 +4988,6 @@ msgstr "Dobavljač komponenti"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6158,7 +6113,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 657c35a352f..74cce03ce4c 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -259,11 +259,6 @@ msgstr "%y - År utan århundrade i två siffror [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Regeln är uppfyllt om minst ett test är sant"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -806,11 +801,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Webbplats"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1337,7 +1327,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1439,11 +1428,6 @@ msgid ""
 msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2153,11 +2137,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2770,11 +2749,6 @@ msgstr ""
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3094,7 +3068,6 @@ msgstr "Kazakhstan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3754,11 +3727,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4086,11 +4054,6 @@ msgstr "A4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4709,11 +4672,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4960,7 +4918,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6075,7 +6032,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index a8c0a3ca261..b219145c312 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 816c8a463c0..5eec1a0270e 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -248,11 +248,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -795,11 +790,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1326,7 +1316,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1427,11 +1416,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2141,11 +2125,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2756,11 +2735,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3080,7 +3054,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3740,11 +3713,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4072,11 +4040,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4693,11 +4656,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4944,7 +4902,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6057,7 +6014,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 8feffb44a99..42cbcbccc82 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -257,11 +257,6 @@ msgstr "%y - Yıl, yüzyıl olmadan onluk sistemde [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Testlerden en az biri Doğru ise kural sağlanır."
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -815,11 +810,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Web sitesi"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Sınamalar"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1362,7 +1352,6 @@ msgstr "Bir kaç modül güncllendi"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1467,11 +1456,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Kuralı genel geçer yapın yoksa bir gruba eklenmesi gerekir."
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2187,11 +2171,6 @@ msgstr "Roller"
 msgid "Countries"
 msgstr "Ülkeler"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Kayıt kuralları"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2822,11 +2801,6 @@ msgstr "Ruh Hali"
 msgid "Benin"
 msgstr "Benin"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Bu kural bütün sınamalar doğru (True) sonuçlanırsa sağlanır (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3149,7 +3123,6 @@ msgstr "Kazakistan"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3818,11 +3791,6 @@ msgstr "Devralınan Görünüm"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4150,13 +4118,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "Arama Görüntüsü Referansı"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-"Aynı nesne üzerindeki birden fazla kural OR operatörü kullanılarak "
-"birleştirilir"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4782,11 +4743,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "Reunion (Fransız)"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Evrensel"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5034,7 +4990,6 @@ msgstr "Parça Tedarikçisi"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6164,7 +6119,6 @@ msgstr "Ger Dönen"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 08556556f93..f01a5de45e3 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -256,11 +256,6 @@ msgstr "%y - Рік без століття цифрами [00,99]."
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Правило задовольняється, якщо принаймні один тест є 'істина'"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -813,11 +808,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Веб-сайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тести"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1359,7 +1349,6 @@ msgstr "Кількість обновлених модулів"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1462,11 +1451,6 @@ msgid ""
 msgstr ""
 "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "Зробіть правило загальним чи призначте його групі"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2178,11 +2162,6 @@ msgstr "Ролі"
 msgid "Countries"
 msgstr "Країни"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила запису"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2808,11 +2787,6 @@ msgstr "Настрій"
 msgid "Benin"
 msgstr "Бенін"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Правило задовольняється, якщо всі тести є True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3136,7 +3110,6 @@ msgstr "Казахстан"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3798,11 +3771,6 @@ msgstr "Успадкований вид"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4130,11 +4098,6 @@ msgstr "А4"
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Декілька правил для однакових об'єктів об'єднуються оператором OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4755,11 +4718,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобальне"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -5008,7 +4966,6 @@ msgstr "Постачальник Компонентів"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6124,7 +6081,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po
index f7a2900ec5e..8e50c76578f 100644
--- a/bin/addons/base/i18n/uk_UA.po
+++ b/bin/addons/base/i18n/uk_UA.po
@@ -242,11 +242,6 @@ msgstr ""
 msgid "Validated"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "Правило задовольняється, якщо принаймні один тест є 'істина'"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "Веб-сайт"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "Тести"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1319,7 +1309,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1409,11 +1398,6 @@ msgstr "Мадагаскар"
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2108,11 +2092,6 @@ msgstr "Ролі"
 msgid "Countries"
 msgstr "Країни"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "Правила запису"
-
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
@@ -2708,11 +2687,6 @@ msgstr "Set NULL"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "Правило задовольняється, якщо всі тести є True (AND)"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3014,7 +2988,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3696,11 +3669,6 @@ msgstr "ir.translation"
 msgid "Luxembourg"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -3986,11 +3954,6 @@ msgstr "Внутрішній заголовок RML"
 msgid "a4"
 msgstr "А4"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "Декілька правил для однакових об'єктів об'єднуються оператором OR"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4645,11 +4608,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "Глобальне"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4878,7 +4836,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -5979,7 +5936,6 @@ msgstr "Батьківська"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index 43e1bc0ac30..f3ba083adf5 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -249,11 +249,6 @@ msgstr ""
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr ""
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -796,11 +791,6 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1327,7 +1317,6 @@ msgstr ""
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1428,11 +1417,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2142,11 +2126,6 @@ msgstr ""
 msgid "Countries"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr ""
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2757,11 +2736,6 @@ msgstr ""
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr ""
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3081,7 +3055,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3741,11 +3714,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4073,11 +4041,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4694,11 +4657,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4945,7 +4903,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6058,7 +6015,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 8c2d99e0864..3d423859e77 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -251,11 +251,6 @@ msgstr "%y - 不包含世纪的十进制年份数 [00,99]。"
 msgid "STOCK_GOTO_FIRST"
 msgstr "STOCK_GOTO_FIRST"
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "只要一个条件判断为真，该规则即满足"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -800,11 +795,6 @@ msgstr "ir.model.config"
 msgid "Website"
 msgstr "网站"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr "测试"
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1334,7 +1324,6 @@ msgstr "已更新的模块数"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1436,11 +1425,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "让规则的作用范围为全局，否则需要将其指定给用户组"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2150,11 +2134,6 @@ msgstr "角色"
 msgid "Countries"
 msgstr "国家"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "记录规则"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2769,11 +2748,6 @@ msgstr "满意度"
 msgid "Benin"
 msgstr "贝宁"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "如果所有测试都为真的话该规则将满足条件（“与”运算）"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3093,7 +3067,6 @@ msgstr "哈萨克斯坦"
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3757,11 +3730,6 @@ msgstr "继承视图"
 msgid "ir.translation"
 msgstr "ir.translation"
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr "ir.rule.group"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4089,11 +4057,6 @@ msgstr "a4"
 msgid "Search View Ref."
 msgstr "搜索视图引用"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr "同一对象上的多条规则使用“或”（OR）操作符连接。"
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4712,11 +4675,6 @@ msgstr "STOCK_MEDIA_RECORD"
 msgid "Reunion (French)"
 msgstr "法属留尼旺岛"
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr "全局"
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4963,7 +4921,6 @@ msgstr "零件供应商"
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6080,7 +6037,6 @@ msgstr "所属公司"
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index 69dd7e92bcc..a8d5912499e 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -253,11 +253,6 @@ msgstr "%y - 不包含世紀的十進制年份數 [00,99]。"
 msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: base
-#: help:ir.rule.group,rules:0
-msgid "The rule is satisfied if at least one test is True"
-msgstr "只要一個條件判斷為真，該規則即滿足"
-
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
 msgid "Get Max"
@@ -802,11 +797,6 @@ msgstr ""
 msgid "Website"
 msgstr "網站"
 
-#. module: base
-#: field:ir.rule.group,rules:0
-msgid "Tests"
-msgstr ""
-
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
@@ -1334,7 +1324,6 @@ msgstr "已更新的模組數"
 #: field:ir.actions.todo,groups_id:0
 #: field:ir.actions.wizard,groups_id:0
 #: field:ir.model.fields,groups:0
-#: field:ir.rule.group,groups:0
 #: field:ir.ui.menu,groups_id:0
 #: model:ir.ui.menu,name:base.menu_action_res_groups
 #: view:res.groups:0
@@ -1436,11 +1425,6 @@ msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "對象名稱必須以「x_」開頭且不能包含任何特殊字符！"
 
-#. module: base
-#: help:ir.rule.group,global:0
-msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr "請設定全域規則,否則將會成為單一群組規則"
-
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
 #: field:ir.report.custom,menu_id:0
@@ -2150,11 +2134,6 @@ msgstr "角色"
 msgid "Countries"
 msgstr "國家"
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Record rules"
-msgstr "記錄規則"
-
 #. module: base
 #: field:res.partner,vat:0
 msgid "VAT"
@@ -2771,11 +2750,6 @@ msgstr "助记状态"
 msgid "Benin"
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "The rule is satisfied if all test are True (AND)"
-msgstr "如果所有測試都為真的話該規則將滿足條件（「與」運算）"
-
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CONNECT"
@@ -3095,7 +3069,6 @@ msgstr ""
 #: field:ir.module.repository,name:0
 #: field:ir.property,name:0
 #: field:ir.report.custom.fields,name:0
-#: field:ir.rule.group,name:0
 #: field:ir.values,name:0
 #: field:maintenance.contract.module,name:0
 #: field:res.bank,name:0
@@ -3755,11 +3728,6 @@ msgstr ""
 msgid "ir.translation"
 msgstr ""
 
-#. module: base
-#: model:ir.model,name:base.model_ir_rule_group
-msgid "ir.rule.group"
-msgstr ""
-
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree_install
 #: model:ir.ui.menu,name:base.menu_module_tree_install
@@ -4087,11 +4055,6 @@ msgstr ""
 msgid "Search View Ref."
 msgstr ""
 
-#. module: base
-#: view:ir.rule.group:0
-msgid "Multiple rules on same objects are joined using operator OR"
-msgstr ""
-
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
 msgid "acc_number"
@@ -4708,11 +4671,6 @@ msgstr ""
 msgid "Reunion (French)"
 msgstr ""
 
-#. module: base
-#: field:ir.rule.group,global:0
-msgid "Global"
-msgstr ""
-
 #. module: base
 #: model:res.country,name:base.cz
 msgid "Czech Republic"
@@ -4959,7 +4917,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_res_users
 #: field:ir.actions.todo,users_id:0
 #: field:ir.default,uid:0
-#: field:ir.rule.group,users:0
 #: model:ir.ui.menu,name:base.menu_action_res_users
 #: model:ir.ui.menu,name:base.menu_users
 #: view:res.groups:0
@@ -6072,7 +6029,6 @@ msgstr ""
 #: field:ir.model.data,model:0
 #: field:ir.model.grid,model:0
 #: field:ir.report.custom,model_id:0
-#: field:ir.rule.group,model_id:0
 #: selection:ir.translation,type:0
 #: field:ir.ui.view,model:0
 #: field:ir.values,model_id:0

From b0190b51685cbd4328f49386bfa007857cc23ee9 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Mon, 11 Oct 2010 20:26:47 +0530
Subject: [PATCH 572/632] [FIX] base : Translations added for res_lang

bzr revid: ach@tinyerp.com-20101011145647-suao8tirobfkiozd
---
 bin/addons/base/i18n/am.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ar.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/base.pot | 23 +++++++++++++++++++++++
 bin/addons/base/i18n/bg.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/bs.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ca.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/cs.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/da.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/de.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/el.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/en_GB.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/es.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/es_AR.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/es_EC.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/et.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/eu.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/fa.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/fi.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/fr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/gl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/he.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/hr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/hu.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/id.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/is.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/it.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ja.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ko.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/lt.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/lt_LT.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/lv.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/mn.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nb.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nl_BE.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/nl_NL.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/pl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/pt.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/pt_BR.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ro.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/ru.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sk.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sl.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sq.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/sv.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/th.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/tlh.po   | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/tr.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/uk.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/uk_UA.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/vi.po    | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/zh_CN.po | 24 ++++++++++++++++++++++++
 bin/addons/base/i18n/zh_TW.po | 24 ++++++++++++++++++++++++
 54 files changed, 1295 insertions(+)

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index 9ab01f41afd..dc910dc47d4 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index 8080be966a3..fd857b54e67 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -7992,3 +7992,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index dfe019bdda2..d279fc3e271 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -7860,3 +7860,26 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 141f3e3b521..b1b2096348b 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -8155,6 +8155,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Други партньори"
 
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index b6658bb0459..22bda14c6e2 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -8015,3 +8015,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index 5a48c0fdacc..b33243184f4 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -8151,6 +8151,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "ID fitxer adjunt"
 
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 4d9e7bd26e8..72ca59fd5dc 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -7996,5 +7996,29 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Hlavní společnost"
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 402776a0302..6902704935d 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 86775b8ffa3..7125ce3adae 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -8157,6 +8157,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "Sie können dieses Dokument nicht lesen ! (%s)"
 
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index dbaa66d3f52..0b4ab975a2f 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -8159,6 +8159,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Η μέθοδος αποσύνδεσης δεν έχει αναπτυχθεί σε αυτό το αντικείμενο!"
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 2c28b7d1dd4..213c82427a4 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -8134,3 +8134,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 53727c6eec7..5d9dcbac646 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -8158,6 +8158,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "ID archivo adjunto"
 
diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po
index 8e2cfe27929..07f8596dc29 100644
--- a/bin/addons/base/i18n/es_AR.po
+++ b/bin/addons/base/i18n/es_AR.po
@@ -8115,6 +8115,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid ""
 #~ "Some installed modules depends on the module you plan to desinstall :\n"
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index ef7691650d5..bb83aeb18f6 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -8162,3 +8162,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr "Error de Integridad"
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index ffd58080bf3..0b97344fc9f 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -8114,6 +8114,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "Manustatud ID"
 
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index f1b900b3804..caafabcff62 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index 299bd9393ab..6de36341b09 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -8136,6 +8136,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "شناسه پیوست"
 
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index d9d6c9d941b..b939177cb59 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -8140,6 +8140,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached Model"
 #~ msgstr "Liitetty malli"
 
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 3a6eeab5c6d..0471bd12dff 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -8168,6 +8168,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Autres partenaires"
 
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 5f0b6e3b32a..63971b2bae2 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index cbe4e9067e7..2b18b4be7c8 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -8076,6 +8076,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "השיטה הלא מקושרת לא הוטמעה באובייקט!"
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 09aa6e981a6..c5200db8b0c 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -8039,6 +8039,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "Recursivity Detected."
 #~ msgstr "Otkrivena je rekurzivnost"
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 4c9a39667d1..1bf33c12905 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -7993,5 +7993,29 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Anyagcég"
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index e99a5b9191d..d1ae581da0f 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -8004,3 +8004,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index eddb8f9faba..a26de9e9d24 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index c7ee91a97a2..723842010b0 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -8166,6 +8166,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr "Errore di integrità"
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "ID Allegato"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 4a703076d64..c0ff2af0662 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -7995,3 +7995,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index c3e8b6caa41..d23167e32c0 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -8035,6 +8035,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "링크해제 방법은 이 오브젝트에 적용되지 않습니다."
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index f0031333b10..62683dae0ba 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -7992,3 +7992,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po
index 62eee0ce8ab..6a90402e113 100644
--- a/bin/addons/base/i18n/lt_LT.po
+++ b/bin/addons/base/i18n/lt_LT.po
@@ -7849,3 +7849,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index 1e52e93b971..404d7096f1c 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -8128,6 +8128,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Objektam nav ieviesta atsaistes funkcija!"
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index ab4af442ebf..4b50a04b63d 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -8092,6 +8092,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Ижил нэвтрэх кодтой хоёр хэрэглэгч байж болохгүй!"
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 7789d3d6ed0..722fd43ae3a 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 0d1215a54cf..6be0a162fc6 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -8165,6 +8165,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr "Integriteit Fout"
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Moederorganisatie"
 
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 01fe20fcf9f..607e803bbc4 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -8057,6 +8057,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Make the rule global, otherwise it needs to be put on a group or user"
 #~ msgstr ""
 #~ "Maak dit een globale regel, anders moet de regel aan een groep of gebruiker "
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po
index bde7d7d8e89..2be89d2adb3 100644
--- a/bin/addons/base/i18n/nl_NL.po
+++ b/bin/addons/base/i18n/nl_NL.po
@@ -8138,6 +8138,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Make the rule global, otherwise it needs to be put on a group or user"
 #~ msgstr ""
 #~ "Maak dit een globale regel, anders moet de regel aan een groep of gebruiker "
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 43d72938fea..534179e69a4 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -8147,6 +8147,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "Product quantity"
 #~ msgstr "Ilość produktu"
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index 62322413fd2..f85e164b29f 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -8142,6 +8142,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached ID"
 #~ msgstr "Id ligado"
 
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 707fcef723f..0a2023ded93 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -8144,6 +8144,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Attached Model"
 #~ msgstr "Modelo anexado"
 
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 47bcccbfef2..39e081f347e 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -8015,6 +8015,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "Compania mama"
 
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 9710e4e5c80..766d4c8bce6 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -8121,6 +8121,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Прочие партнеры"
 
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 4d541d2efb4..f348b8e3f63 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -8042,6 +8042,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The read method is not implemented on this object !"
 #~ msgstr "Metóda nie je implementovaná na tento objekt!"
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index 8e4946642a1..4aaa81cd3dc 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -8034,6 +8034,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Others Partners"
 #~ msgstr "Ostali partnerji"
 
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index a9a3d60a2bb..c177b83a443 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -7998,3 +7998,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 8c7af14853b..6b741b11629 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -8123,6 +8123,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Metoda za prekid veze nije implementirana u ovaj objekat !"
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 74cce03ce4c..d778e62a3ae 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -8014,3 +8014,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index b219145c312..9d49e96a260 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 5eec1a0270e..4b1e0544a1e 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -7992,3 +7992,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 42cbcbccc82..35fdcc33b43 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -8130,6 +8130,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid ""
 #~ "The sum of the data (2nd field) is null.\n"
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index f01a5de45e3..e0c660f9291 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -8077,6 +8077,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #, python-format
 #~ msgid "The unlink method is not implemented on this object !"
 #~ msgstr "Метод unlink не реалізований у цьому об'єкті!"
diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po
index 8e50c76578f..45b170df689 100644
--- a/bin/addons/base/i18n/uk_UA.po
+++ b/bin/addons/base/i18n/uk_UA.po
@@ -7862,3 +7862,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index f3ba083adf5..c7cc46edca9 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -7993,3 +7993,27 @@ msgstr ""
 #, python-format
 msgid "Integrity Error"
 msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 3d423859e77..9f43500c238 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -8022,6 +8022,30 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "母公司"
 
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index a8d5912499e..cc4e92b4da0 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -8008,5 +8008,29 @@ msgstr ""
 msgid "Integrity Error"
 msgstr ""
 
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:0
+#, python-format
+msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgstr ""
+
 #~ msgid "Main Company"
 #~ msgstr "主要公司"

From 86c87e1a376447bf02acd628ee099acc738d0d2f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 17:43:14 +0200
Subject: [PATCH 573/632] [ADD] osv.perm_read: added XML ID (xmlid) to returned
 values - naming indicates this is not a m2o.

bzr revid: odo@openerp.com-20101011154314-sxdfqmeoxo5f91er
---
 bin/osv/orm.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c4195dc00fa..bc2d1b03d86 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2159,7 +2159,8 @@ class orm_memory(orm_template):
                 'create_date': create_date,
                 'write_uid': False,
                 'write_date': False,
-                'id': id
+                'id': id,
+                'xmlid' : False,
             })
         return result
 
@@ -3168,12 +3169,8 @@ class orm(orm_template):
 
     def perm_read(self, cr, user, ids, context=None, details=True):
         """
-        Read the permission for record of the given ids
+        Returns some metadata about the given records.
 
-        :param cr: database cursor
-        :param user: current user id
-        :param ids: id or list of ids
-        :param context: context arguments, like lang, time zone
         :param details: if True, \*_uid fields are replaced with the name of the user
         :return: list of ownership dictionaries for each requested record
         :rtype: list of dictionaries with the following keys:
@@ -3183,7 +3180,7 @@ class orm(orm_template):
                     * create_date: date when the record was created
                     * write_uid: last user who changed the record
                     * write_date: date of the last change to the record
-
+                    * xmlid: XML ID to use to refer to this record (if there is one), in format ``module.name``
         """
         if not context:
             context = {}
@@ -3193,18 +3190,25 @@ class orm(orm_template):
         uniq = isinstance(ids, (int, long))
         if uniq:
             ids = [ids]
-        fields = 'id'
+        fields = ['id']
         if self._log_access:
-            fields += ', create_uid, create_date, write_uid, write_date'
-        query = 'SELECT %s FROM "%s" WHERE id IN %%s' % (fields, self._table)
-        cr.execute(query, (tuple(ids),))
+            fields += ['create_uid', 'create_date', 'write_uid', 'write_date']
+        quoted_table = '"%s"' % self._table
+        fields_str = ",".join('%s.%s'%(quoted_table, field) for field in fields)
+        query = '''SELECT %s, __imd.module, __imd.name
+                   FROM %s LEFT JOIN ir_model_data __imd
+                       ON (__imd.model = %%s and __imd.res_id = %s.id)
+                   WHERE %s.id IN %%s''' % (fields_str, quoted_table, quoted_table, quoted_table)
+        cr.execute(query, (self._name, tuple(ids)))
         res = cr.dictfetchall()
         for r in res:
             for key in r:
                 r[key] = r[key] or False
-                if key in ('write_uid', 'create_uid', 'uid') and details:
+                if details and key in ('write_uid', 'create_uid'):
                     if r[key]:
                         r[key] = self.pool.get('res.users').name_get(cr, user, [r[key]])[0]
+            r['xmlid'] = ("%(module)s.%(name)s" % r) if r['name'] else False
+            del r['name'], r['module']
         if uniq:
             return res[ids[0]]
         return res

From 6a4845aee0a0c50b50d813993b7c513ad0898564 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 19:17:40 +0200
Subject: [PATCH 574/632] [FIX] procurement: corrected check in
 check_move_cancel

bzr revid: odo@openerp.com-20101011171740-1d47qzv071lzvtdz
---
 addons/procurement/procurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 318e572d597..62ff6cc961e 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -163,7 +163,7 @@ class procurement_order(osv.osv):
         """ Checks if move is cancelled or not.
         @return: True or False.
         """
-        return all(procurement.move_id.state != 'cancel' for procurement in self.browse(cr, uid, ids))
+        return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids))
 
     def check_move_done(self, cr, uid, ids, context={}):
         """ Checks if move is done or not.

From 4c2125ca0acea5eb3ab52ac63f8dd38e6939b72c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 19:18:05 +0200
Subject: [PATCH 575/632] [IMP] stock_location: improved demo data for
 push/pull flows

bzr revid: odo@openerp.com-20101011171805-2bfar259c3bic9w8
---
 addons/stock_location/stock_location_demo.xml | 165 +++++++++---------
 1 file changed, 85 insertions(+), 80 deletions(-)

diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index 012602735e7..f739f2325c5 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -1,84 +1,89 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data noupdate="1">
-	     <record id="product.product_product_cpu1" model="product.product">
-            <field name="description">This product use for  push/pull path </field>
+    <data noupdate="1">
+         <record id="product.product_product_cpu1" model="product.product">
+            <field name="description">This product is configured with example of push/pull flows</field>
         </record>
-		<record id="stock_location_input0" model="stock.location">
-			<field name="location_id" ref="stock.stock_location_company"/>
-			<field eval="0" name="scrap_location"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="usage">internal</field>
-			<field name="chained_location_type">none</field>
-			<field eval="1" name="active"/>
-			<field eval="27" name="parent_right"/>
-			<field name="name">Input</field>
-			<field name="chained_auto_packing">manual</field>
-			<field eval="26" name="parent_left"/>
-		</record>
-		<record id="stock_location_qualitytest0" model="stock.location">
-				<field name="location_id" ref="stock.stock_location_company"/>
-				<field eval="0" name="scrap_location"/>
-				<field name="company_id" ref="base.main_company"/>
-				<field name="usage">internal</field>
-				<field name="chained_location_type">none</field>
-				<field eval="1" name="active"/>
-				<field eval="25" name="parent_right"/>
-				<field name="name">Quality test</field>
-				<field name="chained_auto_packing">manual</field>
-				<field eval="24" name="parent_left"/>
-			</record> 
-		<record id="stock_location_path_3" model="stock.location.path">
-			<field name="location_from_id" ref="stock.stock_location_suppliers"/>
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="auto">auto</field>
-			<field name="invoice_state">none</field>
-			<field eval="1" name="delay"/>
-			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
-			<field name="picking_type">out</field>
-		</record>
-		<record id="stock_location_path_4" model="stock.location.path">
-			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="auto">auto</field>
-			<field name="invoice_state">none</field>
-			<field eval="1" name="delay"/>
-			<field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
-			<field name="picking_type">out</field>
-		</record>
-		<record id="stock_location_path_5" model="stock.location.path">
-			<field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="auto">auto</field>
-			<field name="invoice_state">none</field>
-			<field eval="5" name="delay"/>
-			<field name="location_dest_id" ref="stock.stock_location_stock"/>
-			<field name="picking_type">out</field>
-		</record>
-		
-		<record id="product_pulled_flow_l0" model="product.pulled.flow">
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_src_id" ref="stock.stock_location_stock"/>
-			<field name="location_id" ref="stock.stock_location_shop0"/>
-			<field name="partner_address_id" ref="base.main_address"/>
-			<field name="invoice_state">none</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="type_proc">move</field>
-			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_stock</field>
-			<field name="picking_type">out</field>
-			<field name="name">L001</field>
-		</record>
-		<record id="product_pulled_flow_l1" model="product.pulled.flow">
-			<field name="product_id" ref="product.product_product_cpu1"/>
-			<field name="location_id" ref="stock.stock_location_suppliers"/>
-			<field name="invoice_state">none</field>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="type_proc">buy</field>
-			<field eval="0" name="cancel_cascade"/>
-			<field name="procure_method">make_to_stock</field>
-			<field name="picking_type">out</field>
-			<field name="name">L002</field>
-		</record>
-	</data>
+        <record id="stock_location_input0" model="stock.location">
+            <field name="location_id" ref="stock.stock_location_company"/>
+            <field eval="0" name="scrap_location"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="usage">internal</field>
+            <field name="chained_location_type">none</field>
+            <field name="name">Input</field>
+            <field name="chained_auto_packing">manual</field>
+        </record>
+        <record id="stock_location_qualitytest0" model="stock.location">
+                <field name="location_id" ref="stock.stock_location_company"/>
+                <field eval="0" name="scrap_location"/>
+                <field name="company_id" ref="base.main_company"/>
+                <field name="usage">internal</field>
+                <field name="chained_location_type">none</field>
+                <field name="name">Quality test</field>
+                <field name="chained_auto_packing">manual</field>
+        </record>
+        <record id="stock.warehouse0" model="stock.warehouse">
+            <field name="lot_input_id" ref="stock_location_input0"/>
+        </record>
+        <record id="stock_location_path_3" model="stock.location.path">
+            <field name="location_from_id" ref="stock.stock_location_suppliers"/>
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="auto">auto</field>
+            <field name="invoice_state">none</field>
+            <field eval="1" name="delay"/>
+            <field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
+            <field name="picking_type">out</field>
+        </record>
+        <record id="stock_location_path_4" model="stock.location.path">
+            <field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="auto">auto</field>
+            <field name="invoice_state">none</field>
+            <field eval="1" name="delay"/>
+            <field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
+            <field name="picking_type">out</field>
+        </record>
+        <record id="stock_location_path_5" model="stock.location.path">
+            <field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="auto">auto</field>
+            <field name="invoice_state">none</field>
+            <field eval="5" name="delay"/>
+            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="picking_type">out</field>
+        </record>
+
+        <record id="product_pulled_flow_l0" model="product.pulled.flow">
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="location_id" ref="stock.stock_location_shop0"/>
+            <field name="partner_address_id" ref="base.main_address"/>
+            <field name="invoice_state">none</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="type_proc">move</field>
+            <field eval="0" name="cancel_cascade"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="picking_type">internal</field>
+            <field name="name">L001</field>
+        </record>
+        <record id="product_pulled_flow_l1" model="product.pulled.flow">
+            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="location_id" ref="stock.stock_location_suppliers"/>
+            <field name="invoice_state">none</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="type_proc">buy</field>
+            <field eval="0" name="cancel_cascade"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="picking_type">out</field>
+            <field name="name">L002</field>
+        </record>
+        <record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
+            <field name="product_max_qty">10.0</field>
+            <field name="product_min_qty">20.0</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
+            <field name="location_id" ref="stock.stock_location_shop0"/>
+            <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
+        </record>
+    </data>
 </openerp>

From aa27e8aae4be8d5f88b738868925b3e6051c3728 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 19:59:58 +0200
Subject: [PATCH 576/632] [IMP] stock_location: improved demo data for min
 stock rules

bzr revid: odo@openerp.com-20101011175958-g4vnek9v99i1klsl
---
 addons/stock_location/stock_location_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo.xml
index f739f2325c5..a828eb76f2d 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo.xml
@@ -78,8 +78,8 @@
             <field name="name">L002</field>
         </record>
         <record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
-            <field name="product_max_qty">10.0</field>
-            <field name="product_min_qty">20.0</field>
+            <field name="product_max_qty">20.0</field>
+            <field name="product_min_qty">10.0</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>

From 9e5a2d4e2706b897d518cfc4102533d24a876e09 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 11 Oct 2010 21:16:13 +0200
Subject: [PATCH 577/632] [FIX] stock: correct destination location for order
 point + autovalidate chained moves for procurements

bzr revid: odo@openerp.com-20101011191613-aw9753wodzb57wq2
---
 addons/procurement/procurement.py | 1 +
 addons/procurement/schedulers.py  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index ce59251b9fc..c8cb8f460f0 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -331,6 +331,7 @@ class procurement_order(osv.osv):
                         'date_expected': procurement.date_planned,
                         'state': 'draft',
                         'company_id': procurement.company_id.id,
+                        'auto_validate': True,
                     })
                     move_obj.action_confirm(cr, uid, [id], context=context)
                     self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 777a8de45cc..06cbb86957a 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -241,7 +241,7 @@ class procurement_order(osv.osv):
                             'product_id': op.product_id.id,
                             'product_qty': qty,
                             'product_uom': op.product_uom.id,
-                            'location_id': op.warehouse_id.lot_input_id.id,
+                            'location_id': op.location_id.id,
                             'procure_method': 'make_to_order',
                             'origin': op.name
                         })

From 4b77845710a1d237b75188d870b6eecd07f2073a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 11 Oct 2010 23:57:06 +0200
Subject: [PATCH 578/632] [FIX] stock_location, logistic, better demo data

bzr revid: fp@tinyerp.com-20101011215706-zu7cl6byilud541o
---
 .../claim_delivery_view.xml                   |  17 +-
 .../wizard/delivery_sale_order_view.xml       |  28 +--
 addons/mrp/test/mrp_procurement.yml           |   6 +-
 addons/procurement/procurement.py             |   6 +-
 addons/procurement/schedulers.py              |   6 +-
 addons/purchase/purchase_demo.xml             |  15 +-
 .../test/purchase_requisition.yml             |   2 +-
 addons/sale/process/sale_process.xml          |   1 -
 addons/sale/sale.py                           |   5 -
 addons/sale/sale_data.xml                     |   8 +-
 addons/sale/sale_view.xml                     |  30 +--
 addons/sale/test/manual_order_policy.yml      |   6 +-
 addons/sale/test/picking_order_policy.yml     |   6 +-
 addons/sale/test/postpaid_order_policy.yml    |   6 +-
 addons/sale/test/prepaid_order_policy.yml     |   2 +-
 addons/sale/test/so_make_invoice.yml          |   2 +-
 addons/sale_journal/sale_journal_view.xml     |  44 ----
 addons/stock/report/report_stock_move.py      |   6 +-
 .../stock/report/report_stock_move_view.xml   |   1 -
 addons/stock/stock.py                         |  28 ++-
 addons/stock/stock_data.xml                   |   6 +
 addons/stock/stock_demo.xml                   |  44 ++--
 addons/stock/stock_sequence.xml               |  18 +-
 addons/stock/stock_view.xml                   | 218 ------------------
 addons/stock/test/stock_report.yml            |   2 +-
 addons/stock/wizard/stock_partial_move.py     |   2 +-
 addons/stock/wizard/stock_partial_picking.py  |   2 +-
 addons/stock_location/__openerp__.py          |  16 +-
 addons/stock_location/stock_location.py       |   9 +-
 ..._demo.xml => stock_location_demo_cpu1.xml} |  75 +++---
 .../stock_location_demo_cpu3.yml              |  55 +++++
 addons/stock_location/stock_location_view.xml |  15 +-
 .../test/stock_location_push_flow.yml         |   6 +-
 .../test/stock_no_autopicking.yml             |   2 +-
 34 files changed, 225 insertions(+), 470 deletions(-)
 rename addons/stock_location/{stock_location_demo.xml => stock_location_demo_cpu1.xml} (62%)
 create mode 100644 addons/stock_location/stock_location_demo_cpu3.yml

diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index d2fe510460d..624e93466db 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -1,18 +1,5 @@
 <openerp>
-	<data>
-
-        <record id="view_picking_delivery" model="ir.ui.view">
-            <field name="name">stock.picking.delivery.form20</field>
-            <field name="model">stock.picking</field>
-            <field name="type">form</field>
-            <field name="priority" eval="2"/>
-            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
-            <field name="arch" type="xml">
-              <xpath expr="//form/group/field[@name='date']"  position="after">
-                <field name="partner_id" invisible="1"/>
-              </xpath>
-            </field>
-        </record>
+    <data>
 
         <act_window id="action_claim_from_delivery" name="Claim"
             domain="[]" target="current"
@@ -20,5 +7,5 @@
             view_mode="form" res_model="crm.claim"
             src_model="stock.picking" />
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
index 6ac0883493f..fa56b0efcf7 100644
--- a/addons/delivery/wizard/delivery_sale_order_view.xml
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -4,27 +4,27 @@
         
         <!--  Delivery Sale Order -->
         
-		<record id="view_make_delivery_wizard" model="ir.ui.view">
+        <record id="view_make_delivery_wizard" model="ir.ui.view">
             <field name="name">Delivery Costs</field>
             <field name="model">delivery.sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Deliveries">
-                	<separator colspan="4" string="Delivery Method" />
-				    <field name="carrier_id" widget="selection"/>
-				    <newline/>
-				    <separator colspan="4"/>
-				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="_Cancel" />
-                		<button name="delivery_set" string="_Apply"
-                			colspan="1" type="object" icon="gtk-apply" />
-                	</group>
+                    <separator colspan="4" string="Delivery Method" />
+                    <field name="carrier_id" widget="selection"/>
+                    <newline/>
+                    <separator colspan="4"/>
+                    <group col="2" colspan="4">
+                        <button icon='gtk-cancel' special="cancel"
+                            string="_Cancel" />
+                        <button name="delivery_set" string="_Apply"
+                            colspan="1" type="object" icon="gtk-apply" />
+                    </group>
                 </form>
             </field>
         </record>
         
-		<record id="action_delivery_cost" model="ir.actions.act_window">
+        <record id="action_delivery_cost" model="ir.actions.act_window">
             <field name="name">Delivery Costs</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">delivery.sale.order</field>
@@ -34,5 +34,5 @@
             <field name="target">new</field>            
         </record>
 
-	</data>
-</openerp>	
+    </data>
+</openerp>
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 40d22ae817f..4e01062d7b2 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -177,7 +177,7 @@
     purch_ids = self.search(cr, uid, [('partner_id.name','=','Maxtor')])
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+        wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
 
 -
   I confirm purchase order for Buttons.
@@ -187,7 +187,7 @@
     purch_ids = self.search(cr, uid, [('partner_id.name','=','ASUStek')])
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+        wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
 
 -
   I Check incoming shipments for cloth. And receive products.
@@ -284,7 +284,7 @@
     assert prod_ids, _('No Ready Manufacturing Orders found!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in prod_ids:
-    	wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
+        wf_service.trg_validate(uid, 'mrp.production', p_id, 'button_produce', cr)
 -
   I create record for producing products with quantity 5.00.
 -
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index c8cb8f460f0..4f0d3530a80 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -322,7 +322,7 @@ class procurement_order(osv.osv):
                     if procurement.procure_method == 'make_to_order':
                         source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
                     id = move_obj.create(cr, uid, {
-                        'name': 'PROC:' + procurement.name,
+                        'name': procurement.name,
                         'location_id': source,
                         'location_dest_id': procurement.location_id.id,
                         'product_id': procurement.product_id.id,
@@ -374,10 +374,6 @@ class procurement_order(osv.osv):
                             "Not enough stock and no minimum orderpoint rule defined.") % \
                             procurement.name
                     self.log(cr, uid, procurement.id, message)
-            if procurement.state=='exception' and procurement.message=='':
-                cr.execute('update procurement_order set message=%s where id=%s',
-                        (_('Not enough stock '), procurement.id) )
-
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context={}):
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 06cbb86957a..88dbafc3c62 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -170,8 +170,8 @@ class procurement_order(osv.osv):
                 else:
                     continue
                 proc_id = proc_obj.create(cr, uid, {
-                    'name': 'Automatic OP: %s' % product.name,
-                    'origin': 'SCHEDULER',
+                    'name': _('Automatic OP: %s') % (product.name,),
+                    'origin': _('SCHEDULER'),
                     'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
                     'product_id': product.id,
                     'product_qty': -product.virtual_available,
@@ -236,7 +236,7 @@ class procurement_order(osv.osv):
                         continue
                     if op.product_id.type not in ('consu'):
                         proc_id = procurement_obj.create(cr, uid, {
-                            'name': 'OP:' + str(op.id),
+                            'name': op.name,
                             'date_planned': newdate.strftime('%Y-%m-%d'),
                             'product_id': op.product_id.id,
                             'product_qty': qty,
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index ebd0b0becaf..b3fe345308a 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -3,19 +3,17 @@
     <data noupdate="1">
     
     <!--Resource: purchase.order-->
-    	
-		<record id="order_purchase1" model="purchase.order">
+        
+        <record id="order_purchase1" model="purchase.order">
             <field model="stock.location" name="location_id" search="[]"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
             <field model="res.partner.address" name="partner_address_id" search="[]"/>
-		</record>
-		
-		<record id="order_purchase2" model="purchase.order">
+        </record>
+        
+        <record id="order_purchase2" model="purchase.order">
             <field model="stock.location" name="location_id" search="[]"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_demo"/>
             <field model="res.partner" name="partner_id" search="[]"/>
             <field model="res.partner.address" name="partner_address_id" search="[]"/>
         </record>
@@ -30,7 +28,6 @@
             <field model="product.uom" name="product_uom" search="[]"/>
             <field name="price_unit">150</field>
             <field name="product_qty">5</field>
-            <field name="type">make_to_stock</field>
         </record>
         
         <record id="line2_purchase" model="purchase.order.line">
@@ -57,4 +54,4 @@
         
     </data>
 </openerp>
-    
\ No newline at end of file
+    
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index 3f3aae2d8f0..c61a83a9b39 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -127,7 +127,7 @@
 -
   !python {model: stock.picking }: |
     from tools.translate import _   
-    picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001'),('type','=','delivery')])
+    picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001')])
     if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       assert (pick.state =='confirmed'),_('Picking  is  not in confirm state.')
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 20f20a7ef72..e20cf959c9b 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -85,7 +85,6 @@
         </record>
 
         <record id="process_node_deliveryorder0" model="process.node">
-            <field name="menu_id" ref="stock.menu_action_picking_tree_delivery"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ac2b1a620cf..8a26ef6ebba 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1234,11 +1234,6 @@ class sale_config_picking_policy(osv.osv_memory):
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
             if o.step == 'one':
                 md = self.pool.get('ir.model.data')
-                group_id = md._get_id(cr, uid, 'base', 'group_no_one')
-                group_id = md.browse(cr, uid, group_id, context=context).res_id
-                menu_id = md._get_id(cr, uid, 'stock', 'menu_action_picking_tree_delivery')
-                menu_id = md.browse(cr, uid, menu_id, context=context).res_id
-                self.pool.get('ir.ui.menu').write(cr, uid, [menu_id], {'groups_id': [(6, 0, [group_id])]})
                 location_id = md._get_id(cr, uid, 'stock', 'stock_location_output')
                 location_id = md.browse(cr, uid, location_id, context=context).res_id
                 self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 6c8249131e8..f2ebe3af020 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!--
-	Requests Links
-	-->
+    Requests Links
+    -->
         <record id="req_link_sale_order" model="res.request.link">
             <field name="name">Sale Order</field>
             <field name="object">sale.order</field>
         </record>
         
         <!--
-	Resource: sale.shop
-	-->
+    Resource: sale.shop
+    -->
         <record id="shop" model="sale.shop">
             <field model="res.company" name="name" search="[]" use="name"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 913dfa1f82d..6f62e074ad1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -375,22 +375,22 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order Lines">
-				    <group colspan="4" col="6">
-						<field name="order_id"/>
-						<field name="product_id" readonly="1"/>
-						<field name="invoiced"/>
-						<field name="product_uom_qty" readonly="1"/>
-						<field groups="product.group_uos" name="product_uos_qty"/>
-						<field name="product_uom"/>
-						<field colspan="4" name="name" groups="base.group_extended"/>
-						<field name="company_id" groups="base.group_multi_company" readonly="1"/>
-						<field name="order_partner_id" readonly="1" invisible="1"/>
-				    </group>
+                    <group colspan="4" col="6">
+                        <field name="order_id"/>
+                        <field name="product_id" readonly="1"/>
+                        <field name="invoiced"/>
+                        <field name="product_uom_qty" readonly="1"/>
+                        <field groups="product.group_uos" name="product_uos_qty"/>
+                        <field name="product_uom"/>
+                        <field colspan="4" name="name" groups="base.group_extended"/>
+                        <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        <field name="order_partner_id" readonly="1" invisible="1"/>
+                    </group>
                     <separator colspan="4" string="Price"/>
                     <group colspan="4" col="6">
-	                    <field name="price_unit"/>
-	                    <field name="discount"/>
-	                    <field name="price_subtotal"/>
+                        <field name="price_unit"/>
+                        <field name="discount"/>
+                        <field name="price_subtotal"/>
                     </group>
                     <separator colspan="4" string="Notes"/>
                     <field colspan="4" name="notes" nolabel="1"/>
@@ -518,7 +518,7 @@ to your configuration: from the sales order, from the pickings, etc.
         groups="base.group_extended"/>
 
         <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"
-		groups="base.group_extended"/>
+        groups="base.group_extended"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
         <!-- configartion view -->
 
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index c6cf4d66c74..7cb253a2bfb 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -110,7 +110,7 @@
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    assert (picking_id),"Delivery order has not been generated"
 -
   I verify that a procurement has been generated for so
@@ -282,7 +282,7 @@
    import time
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
@@ -304,7 +304,7 @@
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    pick = self.browse(cr,uid,picking_id[0])
    assert (pick.state) =='done', "Picking for SO is not in done state."
 -
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index e90d58bab68..c3f4ba87aaf 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -261,7 +261,7 @@
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    assert (picking_id),"Delivery order has not been generated"
 -
   I verify that delivery has been done
@@ -270,7 +270,7 @@
    import time
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
@@ -292,7 +292,7 @@
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    if picking_id:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml
index 8ef86840fc9..bbd015d726b 100644
--- a/addons/sale/test/postpaid_order_policy.yml
+++ b/addons/sale/test/postpaid_order_policy.yml
@@ -73,7 +73,7 @@
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    assert (picking_id),"Delivery order has not been generated"
 -
   I click on the Products Sent button and then on the Validate button
@@ -82,7 +82,7 @@
    import time
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    if picking_id:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
@@ -104,7 +104,7 @@
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','delivery')])
+   picking_id = self.search(cr, uid, [('origin','=',so.name)])
    if picking_id:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
index f9bf8dbd330..0a8f2aafa81 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -40,7 +40,7 @@
   !python {model: stock.picking }: |
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-   picking_id = self.search(cr, uid, [('origin','!=',so.name),(('type','=','out')and('type','=','delivery'))])
+   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
    assert picking_id,"There is a picking attached to this sale order"
 -
   I open the Invoice for the SO.
diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml
index 61d379c9a60..0133391395b 100644
--- a/addons/sale/test/so_make_invoice.yml
+++ b/addons/sale/test/so_make_invoice.yml
@@ -110,7 +110,7 @@
     sale_order_obj = self.pool.get('sale.order')
     so = sale_order_obj.browse(cr, uid, ref("sale_order_so4"))
     pick_obj = self.pool.get('stock.picking')
-    pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name),('type','=','delivery')])
+    pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name)])
     pick_brw = pick_obj.browse(cr,uid,pick_id)[0]
     move_obj = self.pool.get('stock.move')
     move_id = move_obj.search(cr, uid, [('picking_id', '=', pick_brw.name),('name','=','LG Viewty Smart')])
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 8c9103d25f0..029908da37a 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -213,38 +213,6 @@
             </field>
         </record>
 
-    <!--  Inherit stock picking delivery's form  view.-->
-
-        <record model="ir.ui.view" id="sale_journal_picking_order_del">
-            <field name="name">stock.picking.journal.view.form</field>
-            <field name="type">form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_delivery_form" />
-            <field name="arch" type="xml">
-                <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
-                    <field name="invoice_type_id" select="1"/>
-                </field>
-            </field>
-        </record>
-
-    <!--  Inherit stock picking delivery's tree  view.-->
-
-        <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
-            <field name="name">stock.picking.journal.view.tree</field>
-            <field name="type">tree</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
-            <field name="arch" type="xml">
-                <field name="origin" position="after">
-                    <field name="journal_id" select="1"/>
-                    <field name="invoice_type_id" select="1"/>
-                    <field name="sale_journal_id" select="1"/>
-                </field>
-            </field>
-        </record>
-
         <record model="ir.ui.view" id="sale_journal_picking_order_in">
             <field name="name">stock.picking.journal.view.form</field>
             <field name="type">form</field>
@@ -487,18 +455,6 @@
             <field name="object" eval="True"/>
         </record>
 
-        <record id="view_picking_delivery_jorunal_search_form" model="ir.ui.view">
-            <field name="name">stock.picking.journal.search</field>
-            <field name="model">stock.picking</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="stock.view_stock_delivery_filter"/>
-            <field name="arch" type="xml">
-                <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
-                   	<filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                </xpath>
-            </field>
-        </record>
-
         <record id="view_picking_out_jorunal_search_form" model="ir.ui.view">
             <field name="name">stock.picking.journal.search</field>
             <field name="model">stock.picking</field>
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 618c086cd4f..49c3f8fb327 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -39,7 +39,7 @@ class report_stock_move(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'picking_id':fields.many2one('stock.picking', 'Packing', readonly=True),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('other', 'Others')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'location_id': fields.many2one('stock.location', 'Source Location', readonly=True, select=True, help="Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', readonly=True, select=True, help="Location where the system will stock the finished products."),
         'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True),
@@ -85,7 +85,7 @@ class report_stock_move(osv.osv):
                         al.stock_journal as stock_journal,
                         sum(al.in_value - al.out_value) as value
                     FROM (SELECT
-                        CASE WHEN sp.type in ('out','delivery') THEN
+                        CASE WHEN sp.type in ('out') THEN
                             sum(sm.product_qty * pu.factor)
                             ELSE 0.0
                             END AS out_qty,
@@ -93,7 +93,7 @@ class report_stock_move(osv.osv):
                             sum(sm.product_qty * pu.factor)
                             ELSE 0.0
                             END AS in_qty,
-                        CASE WHEN sp.type in ('out','delivery') THEN
+                        CASE WHEN sp.type in ('out') THEN
                             sum(sm.product_qty * pu.factor) * pt.standard_price
                             ELSE 0.0
                             END AS out_value,
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 353b8b6bc9c..e1db3ebfa49 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -96,7 +96,6 @@
                 <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
                 <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
                 <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                <filter icon="terp-go-home" name="delivery" string="Deliveries" domain="[('type','=','delivery')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id" default_focus="1"/>
                 <field name="partner_id" context="{'contact_display':'partner'}"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 989fc50cc31..0d7767fe4c1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -186,7 +186,7 @@ class stock_location(osv.osv):
                 "validated automatically. With 'Manual Operation', the stock move has to be validated "\
                 "by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
             ),
-        'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
+        'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', help="Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."),
         'chained_company_id': fields.many2one('res.company', 'Chained Company', help='The company the Picking List containing the chained move will belong to (leave empty to use the default company determination rules'),
         'chained_delay': fields.integer('Chaining Lead Time',help="Delay between original move and chained move in days"),
         'address_id': fields.many2one('res.partner.address', 'Location Address',help="Address of  customer or supplier."),
@@ -242,7 +242,7 @@ class stock_location(osv.osv):
         """
         result = 'internal'
         if (from_location.usage=='internal') and (to_location and to_location.usage in ('customer', 'supplier')):
-            result = 'delivery'
+            result = 'out'
         elif (from_location.usage in ('supplier', 'customer')) and (to_location.usage == 'internal'):
             result = 'in'
         return result
@@ -602,7 +602,7 @@ class stock_picking(osv.osv):
         'name': fields.char('Reference', size=64, select=True),
         'origin': fields.char('Origin', size=64, help="Reference of the document that produced this picking.", select=True),
         'backorder_id': fields.many2one('stock.picking', 'Back Order of', help="If this picking was split this field links to the picking that contains the other part that has been processed already.", select=True),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'note': fields.text('Notes'),
         'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True),
         'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \
@@ -1251,7 +1251,6 @@ class stock_picking(osv.osv):
                 'out':'Picking List',
                 'in':'Reception',
                 'internal': 'Internal picking',
-                'delivery': 'Delivery order'
             }
             message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "
             if pick.min_date:
@@ -1652,10 +1651,15 @@ class stock_move(osv.osv):
             )
             if dest:
                 if dest[1] == 'transparent':
+                    newdate = (datetime.strptime(m.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d')
                     self.write(cr, uid, [m.id], {
-                        'date': (datetime.strptime(m.date, '%Y-%m-%d %H:%M:%S') + \
-                            relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d'),
+                        'date': newdate,
                         'location_dest_id': dest[0].id})
+                    m.location_dest_id = dest[0]
+                    res2 = self._chain_compute(cr, uid, [m], context=context)
+                    for pick_id in res2.keys():
+                        result.setdefault(pick_id, [])
+                        result[pick_id] += res2[pick_id]
                 else:
                     result.setdefault(m.picking_id, [])
                     result[m.picking_id].append( (m, dest) )
@@ -1695,16 +1699,10 @@ class stock_move(osv.osv):
             for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
                 ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
                 pick_name = picking.name or ''
-                if ptype == 'delivery':
-                    pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
-                check_picking_ids = picking_obj.search(cr, uid, [('name','=',picking.name),('origin','=',str(picking.origin or '')),('type','=',ptype),('move_type','=',picking.move_type)])
-                if check_picking_ids:
-                    pickid = check_picking_ids[0]
+                if picking:
+                    pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
                 else:
-                    if picking:
-                        pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
-                    else:
-                        pickid = False
+                    pickid = False
                 for move, (loc, auto, delay, journal, company_id, ptype) in todo:
                     new_id = move_obj.copy(cr, uid, move.id, {
                         'location_id': move.location_dest_id.id,
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index b9aaff33e72..be1881634eb 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -74,11 +74,17 @@
             <field name="usage">view</field>
             <field name="location_id" ref="stock_location_locations"/>
         </record>
+
+        <record id="journal_delivery" model="stock.journal">
+            <field name="name">Delivery Orders</field>
+        </record>
         <record id="stock_location_output" model="stock.location">
             <field name="name">Output</field>
             <field name="location_id" ref="stock_location_company"/>
             <field name="usage">internal</field>
             <field name="chained_location_type">customer</field>
+            <field name="chained_picking_type">out</field>
+            <field name="chained_journal_id" ref="journal_delivery"/>
         </record>
         <record id="stock_location_stock" model="stock.location">
             <field name="name">Stock</field>
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 1249317a2e4..33d130c2d77 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -3,8 +3,8 @@
     <data noupdate="1">
 
         <!--
-	Resource: stock.location
-	-->
+    Resource: stock.location
+    -->
         <record id="stock_location_3" model="stock.location">
             <field name="name">IT Suppliers</field>
             <field name="location_id" ref="stock_location_suppliers"/>
@@ -30,30 +30,18 @@
             <field name="location_id" ref="stock_location_customers"/>
             <field name="usage">customer</field>
         </record>
-        <record id="stock_location_13" model="stock.location">
-            <field name="name">Stock Level 1</field>
-            <field name="location_id" ref="stock_location_stock"/>
-        </record>
         <record id="stock_location_14" model="stock.location">
             <field name="name">Shelf 2</field>
-            <field name="location_id" ref="stock_location_13"/>
-        </record>
-        <record id="stock_location_15" model="stock.location">
-            <field name="name">Sub Products</field>
-            <field name="location_id" ref="stock_location_13"/>
-        </record>
-        <record id="stock_location_workshop" model="stock.location">
-            <field name="name">Workshop</field>
             <field name="location_id" ref="stock_location_stock"/>
         </record>
         <record id="stock_location_components" model="stock.location">
             <field name="name">Shelf 1</field>
-            <field name="location_id" ref="stock_location_workshop"/>
+            <field name="location_id" ref="stock_location_stock"/>
         </record>
 
         <!--
-	Resource: stock.inventory
-	-->
+    Resource: stock.inventory
+    -->
 
         <record id="stock_inventory_0" model="stock.inventory">
             <field name="name">Starting Inventory</field>
@@ -62,8 +50,8 @@
         </record>
 
         <!--
-	Resource: stock.inventory.line
-	-->
+    Resource: stock.inventory.line
+    -->
 
         <record id="stock_inventory_line_0" model="stock.inventory.line">
             <field name="product_id" ref="product.product_product_pc1"/>
@@ -189,7 +177,7 @@
             <field eval="0" name="customer"/>
             <field eval="0" name="supplier"/>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 1&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="res_partner_address_fabien0" model="res.partner.address">
             <field eval="&quot;&quot;&quot;Fabien&quot;&quot;&quot;" name="name"/>
@@ -206,7 +194,7 @@
             <field eval="1" name="customer"/>
             <field eval="0" name="supplier"/>
             <field eval="1" name="active"/>
-            <field eval="&quot;&quot;&quot;Tiny Shop 2&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="res_partner_address_eric0" model="res.partner.address">
             <field eval="&quot;&quot;&quot;Eric&quot;&quot;&quot;" name="name"/>
@@ -223,7 +211,7 @@
         </record>
         <record id="stock_location_shop0" model="stock.location">
             <field model="res.partner.address" name="address_id" search="[('name','=','Fabien')]"/>
-            <field name="location_id" ref="stock.stock_location_company"/>
+            <field name="location_id" ref="stock.stock_location_locations"/>
             <field name="company_id" ref="res_company_shop0"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
             <field eval="&quot;&quot;&quot;none&quot;&quot;&quot;" name="chained_location_type"/>
@@ -234,14 +222,14 @@
         <record id="stock_location_shop1" model="stock.location">
             <field model="res.partner.address" name="address_id" search="[('name','=','Eric')]"/>
             <field name="company_id" ref="res_company_tinyshop0"/>
-            <field name="location_id" ref="stock.stock_location_company"/>
+            <field name="location_id" ref="stock.stock_location_locations"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
             <field eval="1" name="active"/>
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>
         </record>
         <record id="stock_location_intermediatelocation0" model="stock.location">
             <field name="address_id" ref="base.main_address"/>
-            <field name="location_id" ref="stock.stock_location_company"/>
+            <field name="location_id" ref="stock.stock_location_locations_partner"/>
             <field eval="&quot;&quot;&quot;procurement&quot;&quot;&quot;" name="usage"/>
             <field eval="&quot;&quot;&quot;Internal Shippings&quot;&quot;&quot;" name="name"/>
         </record>
@@ -263,13 +251,13 @@
             <field name="lot_input_id" ref="stock_location_shop1"/>
         </record>
 
- 		<record forcecreate="True" id="property_stock_variation" model="ir.property">
+        <record forcecreate="True" id="property_stock_variation" model="ir.property">
             <field name="name">property_stock_variation</field>
             <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_variation')]"/>
-			<field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
- 			<field name="company_id" ref="base.main_company"/>
+            <field eval="'account.account,'+str(ref('account.a_recv'))" model="account.account" name="value"/>
+             <field name="company_id" ref="base.main_company"/>
         </record>
-		 <record id="stock_picking_1" model="stock.picking">
+        <record id="stock_picking_1" model="stock.picking">
             <field name="name">PACKO1</field>
             <field name="type">out</field>
             <field name="move_type">direct</field>
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 06d898c6637..cabf24dda5b 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -20,14 +20,9 @@
             <field name="code">stock.picking.internal</field>
         </record>
 
-        <record id="seq_type_picking_delivery" model="ir.sequence.type">
-            <field name="name">Picking Delivery</field>
-            <field name="code">stock.picking.delivery</field>
-        </record>
-
-		<!--
-    		Sequences for pickings
-    	-->
+        <!--
+            Sequences for pickings
+        -->
 
         <record id="seq_picking_in" model="ir.sequence">
             <field name="name">Picking IN</field>
@@ -50,13 +45,6 @@
             <field name="padding">5</field>
         </record>
 
-        <record id="seq_picking_delivery" model="ir.sequence">
-            <field name="name">Picking DLV</field>
-            <field name="code">stock.picking.delivery</field>
-            <field name="prefix">DLV/</field>
-            <field name="padding">5</field>
-        </record>
-
         <!--
     Sequences from tracking numbers
     -->
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fa81b7534c3..dcee27a4b86 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -798,224 +798,6 @@
             </field>
         </record>
 
-        <record id="view_picking_delivery_tree" model="ir.ui.view">
-            <field name="name">stock.picking.delivery.tree</field>
-            <field name="model">stock.picking</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="backorder_id" groups="base.group_extended"/>
-                    <field name="origin"/>
-                    <field name="date"/>
-                    <field name="min_date"/>
-                    <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                    <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_picking_delivery_form" model="ir.ui.view">
-            <field name="name">stock.picking.delivery.form</field>
-            <field name="model">stock.picking</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Delivery Picking list">
-                    <group col="6" colspan="4" attrs="{'readonly': [('state','not in',['draft','auto'])]}">
-                        <group colspan="4" col="4">
-                            <field name="name" readonly="1"/>
-                            <field name="origin" readonly="1"/>
-                            <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
-                            <field name="invoice_state"/>
-                            <field name="backorder_id" readonly="1" groups="base.group_extended"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="date"/>
-                            <field name="min_date" readonly="1"/>
-                            <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Products">
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="name" string="Move Name"/>
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="product_uos" groups="product.product_uos"/>
-                                   <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_extended"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="base.group_extended"/>
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           type="action" icon="terp-stock_effects-object-colorize"
-                                           groups="base.group_extended"
-                                           states="draft,waiting,confirmed,assigned" />
-                                    <field groups="base.group_extended" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        groups="base.group_extended"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed,done"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed,done"
-                                        groups="base.group_extended"/>
-                                    <field name="location_id"/>
-                                    <field name="location_dest_id"/>
-                                    <field name="date"/>
-                                    <field name="date_expected" string="Date Expected"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves">
-                                    <group colspan="2" col="4">
-                                        <separator colspan="2" string="Move Information"/>
-                                        <field name="name" invisible="1" colspan="4"/>
-                                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
-                                        <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
-                                        <button name="%(stock.move_scrap)d"
-                                                string="Scrap" type="action" groups="base.group_extended"
-                                                icon="gtk-convert" context="{'scrap': True}"
-                                                states="draft,waiting,confirmed,assigned" colspan="1"/>
-                                        <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
-                                        <field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
-                                        <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4"/>
-                                        <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]" colspan="4"/>
-                                    </group>
-
-                                    <group colspan="2" col="2">
-                                        <separator string="Locations" colspan="2" />
-                                        <field name="location_id" domain="[('usage','=','internal')]" />
-                                        <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]" />
-                                    </group>
-
-                                    <group colspan="2" col="2">
-                                        <separator string="Dates" colspan="2" />
-                                        <field name="create_date" invisible="1"/>
-                                        <field name="date"/>
-                                        <field name="date_expected"/>
-                                    </group>
-
-                                    <group colspan="2" col="4" groups="base.group_extended">
-                                        <separator string="Traceability" colspan="4" groups="base.group_extended"/>
-                                        <field name="tracking_id" groups="base.group_extended" colspan="3"/>
-                                        <button name="%(split_into)d" string="New pack" type="action"
-                                              groups="base.group_extended"
-                                              icon="terp-stock_effects-object-colorize"
-                                              states="draft,assigned,confirmed,done" colspan="1"/>
-                                        <field name="prodlot_id" groups="base.group_extended"
-                                            context="{'location_id':location_id, 'product_id':product_id}"
-                                            domain="[('product_id','=?',product_id)]"
-                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)" colspan="3"/>
-                                        <button name="%(track_line)d"
-                                              groups="base.group_extended"
-                                              states="draft,waiting,confirmed,assigned,done"
-                                              string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
-                                    </group>
-                                    <label string="" colspan="4"/>
-                                    <field name="state"/>
-                                    <group col="4" colspan="2">
-                                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-                                    </group>
-                                </form>
-                            </field>
-                            <group col="10" colspan="4">
-                                <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
-                                <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
-                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
-                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
-                            </group>
-                        </page>
-                        <page string="Additional info" groups="base.group_extended,base.group_multi_company">
-                            <field name="auto_picking" groups="base.group_extended"/>
-                            <field name="date_done" groups="base.group_extended"/>
-                            <field name="move_type" groups="base.group_extended"/>
-                            <field name="type" groups="base.group_extended"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="note" nolabel="1"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-       <record id="view_stock_delivery_filter" model="ir.ui.view">
-            <field name="name">stock.view_stock_delivery_filter.list.select</field>
-            <field name="model">stock.picking</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Stock Delivery">
-                    <group col="10" colspan="4">
-                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
-                        <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Is a Back Order" groups="base.group_extended"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="partner_id"/>
-                        <field name="origin"/>
-                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-personal" domain="[]"  context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_picking_tree_delivery" model="ir.actions.act_window">
-            <field name="name">Delivery Orders</field>
-            <field name="res_model">stock.picking</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar</field>
-            <field name="domain">[('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>
-        </record>
-        <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_picking_delivery_tree"/>
-            <field name="act_window_id" ref="action_picking_tree_delivery"/>
-        </record>
-        <record id="action_picking_tree_delivery_view2" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_picking_delivery_form"/>
-            <field name="act_window_id" ref="action_picking_tree_delivery"/>
-        </record>
-        <record id="action_picking_tree_delivery_view2_calendar" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="act_window_id" ref="action_picking_tree_delivery"/>
-        </record>
-        <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="7"/>
-
         <!--
         #
         # Sending Products
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index 48396019c6c..f6bcd60ad5e 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -3,7 +3,7 @@
 -
   !python {model: stock.location}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_13')], {}, {})
+    (data, format) = netsvc.LocalService('report.lot.stock.overview_all').create(cr, uid, [ref('stock.stock_location_stock')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'stock-overviewall'+format), 'wb+').write(data)
 -
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 4825fa9c47e..5c7fd3c9472 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -38,7 +38,7 @@ class stock_partial_move(osv.osv_memory):
             context={}
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if m.state in ('done', 'cancel'):
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delivery products  which are already delivered !'))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
 
 
             if 'move%s_product_id'%(m.id) not in self._columns:
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index d52198170a6..2d9ec901a8d 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -63,7 +63,7 @@ class stock_partial_picking(osv.osv_memory):
         _moves_arch_lst = """<form string="Deliver Products">
                         <separator colspan="4" string="Delivery Information"/>
                         <group colspan="4" col="4">
-                    	<field name="date"/>
+                        <field name="date"/>
                         </group>
                         <separator colspan="4" string="Move Detail"/>
                         """
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index e5d6f767975..875b3364152 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -76,16 +76,18 @@ product (i.e. the destination location of that procurement order).
 
     """,
     'author': 'OpenERP SA',
-    'depends': ['procurement','stock'],
+    'depends': ['procurement','stock','sale'],
     'init_xml': [],
     'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
-    'demo_xml': ['stock_location_demo.xml',],
-    
+    'demo_xml': [
+        'stock_location_demo_cpu1.xml',
+        'stock_location_demo_cpu3.yml',
+    ],
     'installable': True,
-    'test':[''
-            'test/stock_location_pull_flow.yml',
-            'test/stock_location_push_flow.yml',
-            ],
+    'test':[
+#            'test/stock_location_pull_flow.yml',
+#            'test/stock_location_push_flow.yml',
+    ],
     'active': False,
     'certificate': '0046505115101',
 }
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 5404946e3ee..baa9692ba75 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -26,20 +26,21 @@ import pooler
 
 class stock_location_path(osv.osv):
     _name = "stock.location.path"
+    _description = "Pushed Flows"
     _columns = {
         'name': fields.char('Operation', size=64),
         'company_id': fields.many2one('res.company', 'Company'),
         'product_id' : fields.many2one('product.product', 'Products', ondelete='cascade', select=1),
         'journal_id': fields.many2one('stock.journal','Journal'),
-        'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1),
-        'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1),
+        'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1, required=True),
+        'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1, required=True),
         'delay': fields.integer('Delay (days)', help="Number of days to do this transition"),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not from Picking")], "Invoice Status",
             required=True,),
-        'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
+        'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
         'auto': fields.selection(
             [('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],
             'Automatic Move',
@@ -71,7 +72,7 @@ class product_pulled_flow(osv.osv):
         'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
         'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Address'),
-        'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal'),('delivery','Delivery')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
+        'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
         'product_id':fields.many2one('product.product','Product'),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
diff --git a/addons/stock_location/stock_location_demo.xml b/addons/stock_location/stock_location_demo_cpu1.xml
similarity index 62%
rename from addons/stock_location/stock_location_demo.xml
rename to addons/stock_location/stock_location_demo_cpu1.xml
index a828eb76f2d..d6306254ad8 100644
--- a/addons/stock_location/stock_location_demo.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -4,86 +4,89 @@
          <record id="product.product_product_cpu1" model="product.product">
             <field name="description">This product is configured with example of push/pull flows</field>
         </record>
-        <record id="stock_location_input0" model="stock.location">
-            <field name="location_id" ref="stock.stock_location_company"/>
-            <field eval="0" name="scrap_location"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="usage">internal</field>
-            <field name="chained_location_type">none</field>
-            <field name="name">Input</field>
-            <field name="chained_auto_packing">manual</field>
+        <record id="stock_journal_quality" model="stock.journal">
+            <field name="name">Quality Control</field>
         </record>
+
         <record id="stock_location_qualitytest0" model="stock.location">
                 <field name="location_id" ref="stock.stock_location_company"/>
                 <field eval="0" name="scrap_location"/>
                 <field name="company_id" ref="base.main_company"/>
                 <field name="usage">internal</field>
                 <field name="chained_location_type">none</field>
-                <field name="name">Quality test</field>
+                <field name="name">Quality Control</field>
                 <field name="chained_auto_packing">manual</field>
         </record>
-        <record id="stock.warehouse0" model="stock.warehouse">
-            <field name="lot_input_id" ref="stock_location_input0"/>
-        </record>
-        <record id="stock_location_path_3" model="stock.location.path">
-            <field name="location_from_id" ref="stock.stock_location_suppliers"/>
-            <field name="product_id" ref="product.product_product_cpu1"/>
-            <field name="auto">auto</field>
-            <field name="invoice_state">none</field>
-            <field eval="1" name="delay"/>
-            <field model="stock.location" name="location_dest_id" search="[('name', '=', u'Input')]"/>
-            <field name="picking_type">out</field>
-        </record>
         <record id="stock_location_path_4" model="stock.location.path">
             <field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
             <field name="product_id" ref="product.product_product_cpu1"/>
-            <field name="auto">auto</field>
+            <field name="auto">transparent</field>
             <field name="invoice_state">none</field>
             <field eval="1" name="delay"/>
-            <field model="stock.location" name="location_dest_id" search="[('name', '=', u'Quality test')]"/>
-            <field name="picking_type">out</field>
+            <field name="name">Receptions to Quality Control</field>
+            <field name="location_dest_id" ref="stock_location_qualitytest0"/>
+            <field name="location_from_id" ref="stock.stock_location_stock"/>
+            <field name="picking_type">in</field>
         </record>
         <record id="stock_location_path_5" model="stock.location.path">
-            <field model="stock.location" name="location_from_id" search="[('name', '=', u'Quality test')]"/>
+            <field name="location_from_id" ref="stock_location_qualitytest0"/>
             <field name="product_id" ref="product.product_product_cpu1"/>
-            <field name="auto">auto</field>
+            <field name="auto">manual</field>
             <field name="invoice_state">none</field>
+            <field name="journal_id" ref="stock_journal_quality"/>
+            <field name="name">Store in Shelf</field>
             <field eval="5" name="delay"/>
-            <field name="location_dest_id" ref="stock.stock_location_stock"/>
-            <field name="picking_type">out</field>
+            <field name="location_dest_id" ref="stock.stock_location_14"/>
+            <field name="picking_type">internal</field>
         </record>
 
         <record id="product_pulled_flow_l0" model="product.pulled.flow">
             <field name="product_id" ref="product.product_product_cpu1"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="location_src_id" ref="stock.stock_location_intermediatelocation0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
             <field name="partner_address_id" ref="base.main_address"/>
             <field name="invoice_state">none</field>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="company_id" ref="stock.res_company_shop0"/>
             <field name="type_proc">move</field>
             <field eval="0" name="cancel_cascade"/>
-            <field name="procure_method">make_to_stock</field>
-            <field name="picking_type">internal</field>
-            <field name="name">L001</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="picking_type">in</field>
+            <field name="name">Receive from Warehouse</field>
         </record>
         <record id="product_pulled_flow_l1" model="product.pulled.flow">
             <field name="product_id" ref="product.product_product_cpu1"/>
-            <field name="location_id" ref="stock.stock_location_suppliers"/>
+            <field name="location_id" ref="stock.stock_location_intermediatelocation0"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="partner_address_id" ref="stock.res_partner_address_fabien0"/>
+            <field name="type_proc">move</field>
             <field name="invoice_state">none</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="type_proc">buy</field>
             <field eval="0" name="cancel_cascade"/>
             <field name="procure_method">make_to_stock</field>
             <field name="picking_type">out</field>
-            <field name="name">L002</field>
+            <field name="name">Deliver Shop</field>
         </record>
         <record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">20.0</field>
             <field name="product_min_qty">10.0</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
+            <field name="company_id" ref="stock.res_company_shop0"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
             <field model="product.product" name="product_id" ref="product.product_product_cpu1"/>
         </record>
+
+        <record id="sale_shop1" model="sale.shop">
+            <field name="name">Shop 1</field>
+            <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
+            <field name="company_id" ref="stock.res_company_shop0"/>
+            <field model="account.payment.term" name="payment_default_id" search="[]"/>
+        </record>
+        <record id="sale_shop2" model="sale.shop">
+            <field name="name">Shop 2</field>
+            <field name="warehouse_id" ref="stock.stock_warehouse_shop1"/>
+            <field name="company_id" ref="stock.res_company_tinyshop0"/>
+            <field model="account.payment.term" name="payment_default_id" search="[]"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/stock_location/stock_location_demo_cpu3.yml b/addons/stock_location/stock_location_demo_cpu3.yml
new file mode 100644
index 00000000000..74c9998b1b6
--- /dev/null
+++ b/addons/stock_location/stock_location_demo_cpu3.yml
@@ -0,0 +1,55 @@
+-
+  !record {model: stock.journal, id: journal_pick}:
+    name: Pick List
+-
+  !record {model: stock.journal, id: journal_pack}:
+    name: Packing
+-
+  !record {model: stock.journal, id: journal_gate_a}:
+    name: Delivery Gate A
+-
+  !record {model: stock.journal, id: journal_gate_b}:
+    name: Delivery Gate B
+- 
+  !record {model: stock.location, id: location_order}:
+    name: Order Processing
+    usage: internal
+    location_id: stock.stock_location_company
+- 
+  !record {model: stock.location, id: location_dispatch_zone}:
+    name: Dispatch Zone
+    usage: internal
+    location_id: location_order
+- 
+  !record {model: stock.location, id: location_gate_a}:
+    name: Gate A
+    usage: internal
+    location_id: location_dispatch_zone
+    chained_journal_id: journal_gate_a
+    chained_location_type: customer
+    chained_auto_packing: manual
+    chained_picking_type: out
+- 
+  !record {model: stock.location, id: location_pack_zone}:
+    name: Pack Zone
+    usage: internal
+    location_id: location_order
+    chained_journal_id: journal_pack
+    chained_location_id: location_gate_a
+    chained_location_type: fixed
+    chained_auto_packing: manual
+    chained_picking_type: internal
+- 
+  !record {model: stock.location, id: location_gate_b}:
+    name: Gate B
+    usage: internal
+    location_id: location_dispatch_zone
+- 
+  !record {model: stock.location.path, id: push_pick}:
+    name: Pick List
+    product_id: product.product_product_cpu3
+    journal_id: journal_pick
+    location_from_id: stock.stock_location_output
+    location_dest_id: location_pack_zone
+    picking_type: internal
+    auto: transparent
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 49c3a808e70..eca4ade39fa 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -43,10 +43,11 @@
                     <page string="Logistic Flow">
                         <field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
                             <tree string="Pulled flows">
-                              <field name="location_id"/>
-                              <field name="type_proc"/>
-                              <field name="company_id" groups="base.group_multi_company"/>
-                              <field name="name"/>
+                                <field name="location_id"/>
+                                <field name="type_proc"/>
+                                <field name="name"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="journal_id" groups="base.group_extended"/>
                             </tree>
                             <form string="Pulled Paths">
                                 <separator string="Conditions" colspan="4"/>
@@ -64,11 +65,12 @@
                                     <field name="procure_method"/>
                                     <field name="cancel_cascade"/>
                                     <field name="invoice_state"/>
+                                    <field name="journal_id" groups="base.group_extended"/>
                                 </group>
                             </form>
                         </field>
                         <field name="path_ids" editable="bottom" colspan="4" nolabel="1">
-                    	<field name="name"/>
+                        <field name="name"/>
                             <tree string="Pushed flows" editable="bottom">
                                 <field name="location_from_id"/>
                                 <field name="location_dest_id"/>
@@ -86,13 +88,14 @@
                                 <field name="name"/>
                                 <field name="invoice_state"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="journal_id" groups="base.group_extended"/>
                             </form>
                         </field>
                     </page>
                 </notebook>
             </field>
        </record>
-	</data>
+    </data>
 </openerp>
 
    
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index 989134c13bb..3f473026c8b 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -47,12 +47,12 @@
     path_ids:
       - auto: auto
         invoice_state: none
-        location_dest_id: stock_location.stock_location_input0
+        location_dest_id: stock.stock_location_stock
         location_from_id: stock.stock_location_suppliers
       - auto: auto
         invoice_state: none
         location_dest_id: stock_location.stock_location_qualitytest0
-        location_from_id: stock_location.stock_location_input0
+        location_from_id: stock.stock_location_stock
       - auto: auto
         invoice_state: none
         location_dest_id: stock.stock_location_stock
@@ -73,7 +73,7 @@
     invoice_state: none
     move_lines:
       - date_expected: '2010-10-08 15:36:53'
-        location_dest_id: stock_location.stock_location_input0
+        location_dest_id: stock.stock_location_stock
         location_id: stock.stock_location_suppliers
         name: 'HP CD writers'
         product_id: product_product_hpcdwriters0
diff --git a/addons/stock_no_autopicking/test/stock_no_autopicking.yml b/addons/stock_no_autopicking/test/stock_no_autopicking.yml
index 9732e17194c..34e20eeb6c4 100644
--- a/addons/stock_no_autopicking/test/stock_no_autopicking.yml
+++ b/addons/stock_no_autopicking/test/stock_no_autopicking.yml
@@ -86,7 +86,7 @@
 -
   !record {model: mrp.routing, id: mrp_routing_productionrouting0}:
     name: Production Routing
-    location_id: stock.stock_location_13
+    location_id: stock.stock_location_stock
     workcenter_lines:
       - cycle_nbr: 1.0
         hour_nbr: 0.5

From 9a2057c8018aedee7ce2073e23b78b0404b473fd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 00:20:15 +0200
Subject: [PATCH 579/632] fix

bzr revid: fp@tinyerp.com-20101011222015-yg8c5qfujutrrcei
---
 addons/product/product.py                          | 2 +-
 addons/stock/stock.py                              | 5 +++++
 addons/stock/stock_view.xml                        | 4 +---
 addons/stock_location/stock_location_demo_cpu1.xml | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 22f57ac981f..05ec8459bcd 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -386,7 +386,7 @@ class product_product(osv.osv):
     def _get_partner_code_name(self, cr, uid, ids, product, partner_id, context={}):
         for supinfo in product.seller_ids:
             if supinfo.name.id == partner_id:
-                return {'code': supinfo.product_code, 'name': supinfo.product_name, 'variants': ''}
+                return {'code': supinfo.product_code or product.default_code, 'name': supinfo.product_name or product.name, 'variants': ''}
         res = {'code': product.default_code, 'name': product.name, 'variants': product.variants}
         return res
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0d7767fe4c1..0b1bbe3695f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1655,6 +1655,11 @@ class stock_move(osv.osv):
                     self.write(cr, uid, [m.id], {
                         'date': newdate,
                         'location_dest_id': dest[0].id})
+                    if m.picking_id and (dest[3] or dest[5]):
+                        self.pool.get('stock.picking').write(cr, uid, [m.picking_id.id], {
+                            'stock_journal_id': dest[3] or m.picking_id.stock_journal_id.id,
+                            'type': dest[5] or m.picking_id.type
+                        }, context=context)
                     m.location_dest_id = dest[0]
                     res2 = self._chain_compute(cr, uid, [m], context=context)
                     for pick_id in res2.keys():
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dcee27a4b86..92d99c4bcc9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -652,7 +652,6 @@
                         <page string="Products">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
                                 <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="name" string="Move Name"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" string="UoM"/>
@@ -682,7 +681,6 @@
                                         states="draft,assigned,confirmed,done"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="date"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
                                 </tree>
@@ -1268,7 +1266,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner_address',"search_default_confirmed":1}</field>
+            <field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
 
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index d6306254ad8..01f711839d4 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -19,7 +19,7 @@
         </record>
         <record id="stock_location_path_4" model="stock.location.path">
             <field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>
-            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="product_id" ref="product.product_product_cpu3"/>
             <field name="auto">transparent</field>
             <field name="invoice_state">none</field>
             <field eval="1" name="delay"/>
@@ -30,7 +30,7 @@
         </record>
         <record id="stock_location_path_5" model="stock.location.path">
             <field name="location_from_id" ref="stock_location_qualitytest0"/>
-            <field name="product_id" ref="product.product_product_cpu1"/>
+            <field name="product_id" ref="product.product_product_cpu3"/>
             <field name="auto">manual</field>
             <field name="invoice_state">none</field>
             <field name="journal_id" ref="stock_journal_quality"/>

From 4e84e87b7f6de406b94e72580d0d31278cb717f3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 00:35:54 +0200
Subject: [PATCH 580/632] [IMP] improved meta data on __openerp__.py

bzr revid: fp@tinyerp.com-20101011223554-ad0mvm8s45inhmg3
---
 addons/stock_location/__openerp__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 875b3364152..5c2ae8e63e5 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -74,6 +74,15 @@ Technically, Pull flows allow to process procurement orders differently, not onl
 the product being considered, but also depending on which location holds the "need" for that
 product (i.e. the destination location of that procurement order).
 
+Use-Case
+--------
+
+You can use the demo data as follow:
+  CPU1: Sell some CPU1 from Shop 1 and run the scheduler
+     - Warehouse: delivery order, Shop 1: reception
+  CPU3:
+     - When receiving the product, it goes to Quality Control location then stored to shelf 2.
+     - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A
     """,
     'author': 'OpenERP SA',
     'depends': ['procurement','stock','sale'],
@@ -91,4 +100,3 @@ product (i.e. the destination location of that procurement order).
     'active': False,
     'certificate': '0046505115101',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 32b9ac6ddda2e334867b75b3833a76b16b738031 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 12 Oct 2010 04:51:03 +0000
Subject: [PATCH 581/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101012045103-4ym19xvsbzg84btl
---
 bin/addons/base/i18n/de.po | 56 ++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 7125ce3adae..593919a31b3 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.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: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-09-09 17:58+0000\n"
-"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-11 17:20+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -8062,75 +8062,76 @@ msgstr "2 Benuzter können nicht den gleichen Login Code haben!"
 #. module: base
 #: sql_constraint:ir.model.fields:0
 msgid "Size of the field can never be less than 1 !"
-msgstr ""
+msgstr "Die Feldlänge kann niemals kleiner als 1 sein!"
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr ""
+msgstr "Die Verknüpfung existiert bereits für dieses Menü!"
 
 #. module: base
 #: sql_constraint:ir.model.data:0
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
+"Mehrere Datensätze dürfen nicht die selbe ID für dasselbe Modul besitzen!"
 
 #. module: base
 #: sql_constraint:maintenance.contract:0
 msgid "Your maintenance contract is already subscribed in the system !"
-msgstr ""
+msgstr "Ihr Wartungsvertrag wurde bereits in Ihrem System registriert!"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 #: sql_constraint:ir.module.web:0
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "Der Name des Moduls muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:ir.module.module:0
 msgid "The certificate ID of the module must be unique !"
-msgstr ""
+msgstr "Die Zertifikats-ID muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.partner.function:0
 msgid "The Code of the Partner Function must be unique !"
-msgstr ""
+msgstr "Der Code der Partnerfunktion muss eindeutig sein."
 
 #. module: base
 #: sql_constraint:res.partner:0
 msgid "The name of the Partner must be unique !"
-msgstr ""
+msgstr "Der Name des Partners muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Der Name des Landes muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Der Code des Landes muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The name of the language must be unique !"
-msgstr ""
+msgstr "Der Name der Sprache muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.lang:0
 msgid "The code of the language must be unique !"
-msgstr ""
+msgstr "Der Code  der Sprache muss eindeutig sein!"
 
 #. module: base
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "Der Name der Gruppe muss eindeutig sein!"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "Abhängigkeitsfehler"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8141,6 +8142,12 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"Die Aktion kann nicht fertiggestellt werden, wahrscheinlich aufgrund einer "
+"der folgenden Fehler:\n"
+"- Löschen: Sie versuchen einen Datensatz zu löschen, auf den noch andere "
+"Datensätze referenzieren\n"
+"- Neu/Aktualisierung: Ein Pflicht-Feld wurde nicht oder nicht richtig "
+"ausgefüllt"
 
 #. module: base
 #: code:addons/osv/osv.py:0
@@ -8150,36 +8157,45 @@ msgid ""
 "\n"
 "[object with reference: %s - %s]"
 msgstr ""
+"\n"
+"\n"
+"[Objekt mit Referenz: %s - %s]"
 
 #. module: base
 #: code:addons/osv/osv.py:0
 #, python-format
 msgid "Integrity Error"
-msgstr ""
+msgstr "Datenintegritäts Fehler"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Benutzerfehler"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "Base Language 'en_US' can not be deleted !"
-msgstr ""
+msgstr "Basis Sprache 'en_US' kann nicht gelöscht werden !"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language !"
 msgstr ""
+"Eine Sprache, die in einer Benutzereinstellung definiert ist, kann nicht "
+"gelöscht werden."
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
 #, python-format
-msgid "You cannot delete the language which is Active !\nPlease de-activate the language first."
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
 msgstr ""
+"Eine aktive Sprache kann nicht gelöscht werden !\n"
+"Bitte diese vorher deaktivieren."
 
 #~ msgid "Attached ID"
 #~ msgstr "Sie können dieses Dokument nicht lesen ! (%s)"

From 4f9b180931d428a87cf7c71a5330c7aa36c95a23 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 12 Oct 2010 04:51:43 +0000
Subject: [PATCH 582/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101012045143-dafaof1g5r27tu29
---
 addons/account/i18n/de.po             |   6 +-
 addons/account/i18n/mn.po             |  20 +-
 addons/account_report/i18n/it.po      |   8 +-
 addons/analytic/i18n/de.po            |   6 +-
 addons/claim_from_delivery/i18n/de.po |   6 +-
 addons/crm/i18n/nl.po                 |   8 +-
 addons/crm_fundraising/i18n/nl.po     | 280 +++++++++++----------
 addons/crm_helpdesk/i18n/nl.po        | 244 +++++++++---------
 addons/decimal_precision/i18n/de.po   |   6 +-
 addons/hr_payroll/i18n/de.po          |   6 +-
 addons/point_of_sale/i18n/sr.po       | 311 +++++++++++------------
 addons/purchase/i18n/de.po            |   6 +-
 addons/resource/i18n/de.po            |   6 +-
 addons/resource/i18n/nl.po            | 341 ++++++++++++++++++++++++++
 addons/wiki_faq/i18n/de.po            |   6 +-
 addons/wiki_quality_manual/i18n/de.po |   6 +-
 addons/wiki_sale_faq/i18n/de.po       |   6 +-
 17 files changed, 824 insertions(+), 448 deletions(-)
 create mode 100644 addons/resource/i18n/nl.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 2f8b6aad6ae..94f0c92c017 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-10 10:37+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:18+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index ae02ec22007..82262de0ce2 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 04:27+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1983,7 +1983,7 @@ msgstr "Шилжүүлэлт"
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Ли."
 
 #. module: account
 #: wizard_view:account.chart,init:0
@@ -2262,7 +2262,7 @@ msgstr "Дансны мод"
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr ""
+msgstr "x Чекийн журнал"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
@@ -4413,7 +4413,7 @@ msgstr "Батлагдсан"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Орлогын тэмдэглэл"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4430,12 +4430,12 @@ msgstr "Нээлтийн бичилтийг цуцлах"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manually statement"
-msgstr ""
+msgstr "Гараар үүсгэсэн тайлан"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr ""
+msgstr "Сарын өдөр"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -4493,12 +4493,12 @@ msgstr ""
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл нээх"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "Set starting and ending balance for control"
-msgstr ""
+msgstr "Балансын удирдлагын эхлэл төгсгөлийг тохируулах"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 6be272f1b4b..58987e1ff3e 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 08:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 20:16+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -308,7 +308,7 @@ msgstr "Report per personale Contabile"
 #: model:ir.actions.act_window,name:account_report.action_account_report_form
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_form
 msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "Nuova Formula di Riporto Oggetti"
 
 #. module: account_report
 #: field:account.report.report,code:0
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 36f8cbaaa2d..1d151da2e95 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-10-10 10:41+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:17+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 48352c2b978..99f04fa4284 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:02+0000\n"
-"PO-Revision-Date: 2010-10-10 10:45+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:17+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index e21b5fdf4d9..d3da4ded812 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-10 08:54+0000\n"
+"PO-Revision-Date: 2010-10-11 13:45+0000\n"
 "Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -583,7 +583,7 @@ msgstr "Augustus"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr "Afsprakenboom"
+msgstr "Afspraken"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -4006,7 +4006,7 @@ msgstr "ICS bestand opslaan"
 #. module: crm
 #: wizard_field:caldav.crm.subscribe,init,url_path:0
 msgid "Provide path for remote calendar"
-msgstr "Geef het pas naar de remote agenda"
+msgstr "Geef het pad naar de remote agenda"
 
 #. module: crm
 #: view:crm.case.log:0
diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po
index b13dcec5d79..fe0003a7ecc 100644
--- a/addons/crm_fundraising/i18n/nl.po
+++ b/addons/crm_fundraising/i18n/nl.po
@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:29+0000\n"
-"PO-Revision-Date: 2010-09-10 14:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-11 09:58+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Verwachte omzet"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# Fondsen"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op.."
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,probability:0
 msgid "Avg. Probability"
-msgstr ""
+msgstr "Gemiddelde kans"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,canal_id:0
@@ -45,207 +45,211 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate                 "
 "    the canall which is this opportunity source."
 msgstr ""
+"De kanalen geven de verschillende beschikbare communicatievormen met de "
+"klant weer. Met elke kans kunt u het kanaal aangeven wat de oorsprong van de "
+"kans is."
 
 #. module: crm_fundraising
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Fondsenformulier"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Vertraging tot sluiting"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,company_id:0
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
 msgid "Fundraising Categories"
-msgstr ""
+msgstr "Fondscategorieën"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Email toeschouwers"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "This Year"
-msgstr ""
+msgstr "Dit jaar"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Cases"
-msgstr ""
+msgstr "Dossiers"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Hoogste"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobiel"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Notes"
-msgstr ""
+msgstr "Notities"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Bedrag"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,amount_revenue:0
 msgid "Est.Revenue"
-msgstr ""
+msgstr "Gesch. omzet"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contactpersoon relatie"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "My Case"
-msgstr ""
+msgstr "Mijn Fondsen"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Verwijzing"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Volgende actie"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Terugzetten naar Concept"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Extra informatie"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,partner_id:0
 #: field:crm.fundraising.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
-msgstr ""
+msgstr "Fondsenwerving Analyse"
 
 #. module: crm_fundraising
 #: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
 msgid "CRM Fundraising"
-msgstr ""
+msgstr "CRM Fondsenwerving"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Estimates"
-msgstr ""
+msgstr "Schattingen"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Afdeling"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Dates"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Verstuur nieuwe email"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
 msgstr ""
+"Sociale reïntegratie en ontwikkelingsstimulans niet-stedelijke gebieden"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Betalingsvorm"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reply"
-msgstr ""
+msgstr "Beantwoorden"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanaal"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Laagste"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -253,127 +257,127 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Wacht"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Uiterste datum"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
 msgid "Categories"
-msgstr ""
+msgstr "Categorieën"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History Information"
-msgstr ""
+msgstr "Historie Informatie"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_closed:0
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Gesloten"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "E-mail werknemer"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Leren en onderwijs"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Contact"
-msgstr ""
+msgstr "Contactpersoon"
 
 #. module: crm_fundraising
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Fund Description"
-msgstr ""
+msgstr "Fonds omschrijving"
 
 #. module: crm_fundraising
 #: help:crm.fundraising.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Aantal dagen om werving af te sluiten"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Fondsen"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Escalate"
-msgstr ""
+msgstr "Escaleren"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Wijzigingsdatum"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Creditcard"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
 msgid "Fundraising Stages"
-msgstr ""
+msgstr "Fondswerving fasen"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referentie 2"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -381,17 +385,17 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Kunst en cultuur"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Verwachte kosten"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_cc:0
@@ -400,145 +404,148 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Deze email adressen worden toegevoegd aan het CC veld van alle inkomende en "
+"uitgaande emails van dit record voordat het wordt verstuurd. Meerdere namen "
+"scheidt u met een komma (,)."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Laag"
 
 #. module: crm_fundraising
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 Dagen"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Fasen"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globale CC"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
 msgid "Funds"
-msgstr ""
+msgstr "Fondsen"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefoon"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Cheque"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_resource_act
 msgid "Resource Type"
-msgstr ""
+msgstr "Betalingsvorm"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Search"
-msgstr ""
+msgstr "Zoeken"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "#Fundraising"
-msgstr ""
+msgstr "# Fondsen"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Deze personen ontvangen email."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Gezondheidszorg"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bijlagen"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Misc"
-msgstr ""
+msgstr "Overig"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -546,24 +553,24 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Done"
-msgstr ""
+msgstr "Klaar"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Communication"
-msgstr ""
+msgstr "Communicatie"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -571,24 +578,25 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Open"
 
 #. module: crm_fundraising
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Current"
-msgstr ""
+msgstr "Actueel"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,section_id:0
@@ -596,57 +604,59 @@ msgid ""
 "Sales team to which Case belongs to. Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Verkoopteam waaraan dit fonds is toegewezen. Definieer de verantwoordelijke "
+"gebruiker en Email account voor de mail gateway."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
 msgid "CRM Fundraising Report"
-msgstr ""
+msgstr "CRM Fondsenwerving overzicht"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,type_id:0
 msgid "Fundraising Type"
-msgstr ""
+msgstr "Betalingsvorm"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,amount_revenue_prob:0
 msgid "Est. Rev*Prob."
-msgstr ""
+msgstr "Verw. omzet*kans"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,description:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Waarschijnlijkheid (%)"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Relatienaam"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "This Month"
-msgstr ""
+msgstr "Deze maand"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_resource_act
 msgid "Fundraising Resource Type"
-msgstr ""
+msgstr "Fondsenwerving betalingsvorm"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,state:0
@@ -659,86 +669,94 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"De status wordt op 'Concept' gezet als de aanvraag wordt gemaakt.            "
+"                  \n"
+"Als de aanvraag in behandeling is, wordt de status op 'Open' gezet.          "
+"                        \n"
+"Als de aanvraag klaar is, gaat de status naar 'Gereed'.                      "
+"            \n"
+"Als de aanvraag moet worden onderzocht, wordt de status op 'Behandeling' "
+"gezet."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Communication history"
-msgstr ""
+msgstr "Communicatiegeschiedenis"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Contant"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Fondsen op categorie"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "References"
-msgstr ""
+msgstr "Verwijzingen"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Incasso"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "Zoek fondsen"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
 msgid "High"
-msgstr ""
+msgstr "Hoog"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Verkoopteam"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Laatste actie"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duur"
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index 52032cb2be3..e1d802b6cf6 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -8,124 +8,124 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 13:01+0000\n"
-"PO-Revision-Date: 2010-09-10 09:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-11 08:22+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# Aanvragen"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op.."
 
 #. module: crm_helpdesk
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Today"
-msgstr ""
+msgstr "Vandaag"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Vertraging tot sluiting"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Emails toeschouwers"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "This Year"
-msgstr ""
+msgstr "Dit jaar"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Cases"
-msgstr ""
+msgstr "Aanvragen"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Hoogste"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Notes"
-msgstr ""
+msgstr "Notities"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contactpersoon relatie"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
 msgid "Helpdesk Analysis"
-msgstr ""
+msgstr "Helpdesk Analyse"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Verwijzing"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Volgende actie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Supports"
-msgstr ""
+msgstr "Helpdesk ondersteuning"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Extra info"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -133,30 +133,30 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_closed:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Gesloten"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Estimates"
-msgstr ""
+msgstr "Schattingen"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Afdeling"
 
 #. module: crm_helpdesk
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -164,60 +164,60 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Verstuur nieuwe email"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Won"
-msgstr ""
+msgstr "Gewonnen"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Reply"
-msgstr ""
+msgstr "Beantwoorden"
 
 #. module: crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
 msgid "Helpdesk report after Sales Services"
-msgstr ""
+msgstr "Helpdesk overzicht Nazorg"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanaal"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Laagste"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Terugzetten naar Concept"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Wacht"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -225,37 +225,37 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Uiterste datum"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "July"
-msgstr ""
+msgstr "July"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
 msgid "Helpdesk Categories"
-msgstr ""
+msgstr "Helpdesk categorieën"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
 msgid "Categories"
-msgstr ""
+msgstr "Categorieën"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History Information"
-msgstr ""
+msgstr "Historie informatie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Dates"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "#Helpdesk"
-msgstr ""
+msgstr "#Helpdesk"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_cc:0
@@ -264,187 +264,190 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Deze email addressen worden toegevoegd aan het CC veld van alle inkomende en "
+"uitgaande emails van dit record voordat het wordt verstuurd. Meerdere namen "
+"scheidt u met een komma (,)."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Escalate"
-msgstr ""
+msgstr "Escaleren"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Wijzigingsdatum"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Query"
-msgstr ""
+msgstr "Aanvraag"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referentie 2"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support"
-msgstr ""
+msgstr "Helpdesk ondersteuning"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Verwachte kosten"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,description:crm_helpdesk.module_meta_information
 msgid "Helpdesk Management"
-msgstr ""
+msgstr "Helpdesk management"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Search Helpdesk"
-msgstr ""
+msgstr "Zoek helpdesk"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Laag"
 
 #. module: crm_helpdesk
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 Dagen"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globale CC"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Verwachte omzet"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: crm_helpdesk
 #: model:ir.module.module,shortdesc:crm_helpdesk.module_meta_information
 msgid "CRM Helpdesk"
-msgstr ""
+msgstr "CRM Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
 msgid "Helpdesk Requests"
-msgstr ""
+msgstr "Helpdesk aanvragen"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Search"
-msgstr ""
+msgstr "Zoeken"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Deze personen ontvangen email."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bijlagen"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Misc"
-msgstr ""
+msgstr "Overig"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -452,17 +455,17 @@ msgstr ""
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "General"
-msgstr ""
+msgstr "Algemeen"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Send Reminder"
-msgstr ""
+msgstr "Verstuur herinnering"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
@@ -470,49 +473,52 @@ msgid ""
 "Sales team to which Case belongs to.                                 Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
+"Verkoopteam waaraan aanvraag is toegewezen. Definieer Verantwoordelijke "
+"gebruiker en Email account voor mail gateway."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Done"
-msgstr ""
+msgstr "Klaar"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Communication"
-msgstr ""
+msgstr "Communicatie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Open"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Helpdesk aanvragen"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Categorization"
-msgstr ""
+msgstr "Classificatie"
 
 #. module: crm_helpdesk
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -520,38 +526,38 @@ msgstr ""
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
 msgid "Helpdesk"
-msgstr ""
+msgstr "Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Current"
-msgstr ""
+msgstr "Actueel"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Waarschijnlijkheid (%)"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
@@ -559,11 +565,13 @@ msgid ""
 "The channels represent the different communication  modes available with the "
 "customer."
 msgstr ""
+"De kanalen geven de verschillende beschikbare communicatievormen met de "
+"klant weer."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "This Month"
-msgstr ""
+msgstr "Deze maand"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,state:0
@@ -576,76 +584,84 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"De status wordt op 'Concept' gezet als de aanvraag wordt gemaakt.            "
+"                  \n"
+"Als de aanvraag in behandeling is, wordt de status op 'Open' gezet.          "
+"                        \n"
+"Als de aanvraag klaar is, gaat de status naar 'Gereed'.                      "
+"            \n"
+"Als de aanvraag moet worden onderzocht, wordt de status op 'Behandeling' "
+"gezet."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Lost"
-msgstr ""
+msgstr "Verloren"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Communication history"
-msgstr ""
+msgstr "Communicatiegeschiedenis"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
 msgid "Helpdesk and Support"
-msgstr ""
+msgstr "Helpdesk en ondersteuning"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "References"
-msgstr ""
+msgstr "Verwijzingen"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Hoog"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: field:crm.helpdesk,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Verkoopteam"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Laatste actie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duur"
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index b306e019bb5..d2218ef9d4c 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:24+0000\n"
-"PO-Revision-Date: 2010-10-10 10:48+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:17+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 0f7cee2b8d1..0780f644296 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 13:16+0000\n"
-"PO-Revision-Date: 2010-10-10 11:08+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:18+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 420adea0d1a..98c46039a41 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,226 +8,226 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-28 10:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-11 21:13+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total paid"
-msgstr ""
+msgstr "Ukupno placanje"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Qty of product"
-msgstr ""
+msgstr "Kol.proizvoda"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Postavi za obradu"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr ""
+msgstr "Transakcija POS-a"
 
 #. module: point_of_sale
 #: wizard_view:pos.discount,init:0
 #: rml:pos.receipt:0
 msgid "Discount :"
-msgstr ""
+msgstr "Popust :"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_nb:0
 msgid "Piece number"
-msgstr ""
+msgstr "Br.Komada"
 
 #. module: point_of_sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: point_of_sale
 #: field:pos.order,name:0
 msgid "Order Description"
-msgstr ""
+msgstr "Opis Narudzbe"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_scan_product
 msgid "Scan Product"
-msgstr ""
+msgstr "Skeniraj Proizvod"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: point_of_sale
 #: wizard_view:pos.add_product,init:0
 msgid "Add product :"
-msgstr ""
+msgstr "Dodaj proizvod :"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Net Total"
-msgstr ""
+msgstr "Neto Ukupno"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2
 msgid "Orders of the day"
-msgstr ""
+msgstr "Dnevne narudzbe"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr ""
+msgstr "Prodaja(sumarno)"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
 msgid "This is the logged in user (not necessarily the salesman)."
-msgstr ""
+msgstr "Ovo je prijavljeni korisnik( ne nuzno prodavac)"
 
 #. module: point_of_sale
 #: wizard_view:pos.sale.get,init:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "Novi Nalog Prodaje"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Company"
-msgstr ""
+msgstr "Preduzeće"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum Fakture"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
 msgid "Details of Sales"
-msgstr ""
+msgstr "Detalji Prodaje"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Base"
-msgstr ""
+msgstr "Osnova"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
 msgid "Scan product"
-msgstr ""
+msgstr "Skeniraj proizvod"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Међурезултат"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Vezani partner"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+msgstr "Tel : + 32 (0) 2 231 04 35"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line Description"
-msgstr ""
+msgstr "Opis linije"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Prodavnica"
 
 #. module: point_of_sale
 #: wizard_button:pos.refund_order,init,refund_n_quit:0
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: field:pos.order,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Napomene"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
 msgid "Pos order"
-msgstr ""
+msgstr "Pos narudzba"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Detail of Sales"
-msgstr ""
+msgstr "Detalji Prodaje"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 #: rml:pos.lines:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
 msgid "Sale line"
-msgstr ""
+msgstr "Linija prodaje"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "No. Of Articles"
-msgstr ""
+msgstr "Br.Artikala"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
 #: rml:pos.details:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
 #: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
-msgstr ""
+msgstr "Rok Vazenja"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
-msgstr ""
+msgstr "Biranje"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.lines:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_refund
 msgid "Refund Orders"
-msgstr ""
+msgstr "Refundiraj narudzbe"
 
 #. module: point_of_sale
 #: field:pos.order,last_out_picking:0
 msgid "Last Output Picking"
-msgstr ""
+msgstr "Izlaz zadnjeg biranja"
 
 #. module: point_of_sale
 #: wizard_view:pos.config.journal,init:0
@@ -238,48 +238,48 @@ msgstr ""
 #: rml:pos.details:0
 #: rml:pos.receipt:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Logged in User"
-msgstr ""
+msgstr "Logovani korisnik"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 msgid "VAT(%)"
-msgstr ""
+msgstr "PDV(%)"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "Total Transaction"
-msgstr ""
+msgstr "Ukupna Transakcija"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 msgid "Disc"
-msgstr ""
+msgstr "Disk"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 #: rml:pos.receipt:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faks:"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
 msgid "Scan Barcode"
-msgstr ""
+msgstr "Skeniraj Bar-Kod"
 
 #. module: point_of_sale
 #: field:pos.order,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: point_of_sale
 #: field:pos.order,payments:0
@@ -289,94 +289,94 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Date :"
-msgstr ""
+msgstr "Datum :"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Ma_ke Payment"
-msgstr ""
+msgstr "Izvrsi Uplatu"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_confirm
 #: wizard_button:pos.sale.get,init,set:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr ""
+msgstr "POS Narudzbe"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Sales total"
-msgstr ""
+msgstr "Prodaja Ukupno"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Račun dobavljača"
 
 #. module: point_of_sale
 #: field:pos.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Sum of subtotals"
-msgstr ""
+msgstr "Suma Medjuzbirova"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_date:0
 msgid "Payment date"
-msgstr ""
+msgstr "Datum Isplate"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_name:0
 msgid "Payment name"
-msgstr ""
+msgstr "Naziv Isplate"
 
 #. module: point_of_sale
 #: field:pos.order,lines:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Stavke naloga"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Popust(%)"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
 msgid "Point Of Sale"
-msgstr ""
+msgstr "Mesto Prodaje"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
-msgstr ""
+msgstr "Izveštavanje"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS "
-msgstr ""
+msgstr "POS "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
@@ -386,7 +386,7 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno:"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal:0
@@ -406,19 +406,19 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config
 msgid "Configuration"
-msgstr ""
+msgstr "Podešavanje"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 #: rml:pos.lines:0
 #: field:pos.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena komada"
 
 #. module: point_of_sale
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day
@@ -428,7 +428,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
 msgid "Number of Print"
-msgstr ""
+msgstr "Br. za Stampu"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
@@ -438,12 +438,12 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrti računa"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -453,12 +453,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_add_product
 msgid "Add products"
-msgstr ""
+msgstr "Dodaj proizvod"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr ""
+msgstr "Ukupna kol."
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
@@ -483,18 +483,18 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr ""
+msgstr "Mesto Prodaje"
 
 #. module: point_of_sale
 #: field:pos.order,salesman_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Prodavac"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: selection:pos.order,state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturisani"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_rebate:0
@@ -510,27 +510,27 @@ msgstr ""
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total of the day"
-msgstr ""
+msgstr "Dnevni pazar"
 
 #. module: point_of_sale
 #: wizard_button:pos.scan_product,init,add:0
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Priprema"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Paid"
-msgstr ""
+msgstr "Plaćeni"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "PDV :"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -540,24 +540,24 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "E-mail :"
-msgstr ""
+msgstr "E-mail :"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total invoiced"
-msgstr ""
+msgstr "Ukupno fakturisano"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_today
 msgid "Sales of the day"
-msgstr ""
+msgstr "Dnevni promet"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -567,28 +567,28 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_discount
 msgid "Discount"
-msgstr ""
+msgstr "Popust"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Корисник"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_date:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Datum Isplate"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_name:0
 msgid "Payment Name"
-msgstr ""
+msgstr "Naziv Isplate"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
@@ -601,44 +601,44 @@ msgstr ""
 #: wizard_button:pos.add_product,init,add:0
 #: view:pos.order:0
 msgid "_Add product"
-msgstr ""
+msgstr "_Dodaj proizvod"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Period:"
-msgstr ""
+msgstr "Period:"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree
 msgid "All the sales"
-msgstr ""
+msgstr "Sve Prodaje"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Compute"
-msgstr ""
+msgstr "Izracunaj"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Ukupno:"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sumarno"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Create _Invoice"
-msgstr ""
+msgstr "Kreiraj_Fakturu"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,quantity:0
@@ -646,68 +646,68 @@ msgstr ""
 #: rml:pos.lines:0
 #: field:pos.order.line,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Refund"
-msgstr ""
+msgstr "Refundiraj"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of payment"
-msgstr ""
+msgstr "Nacin placanja"
 
 #. module: point_of_sale
 #: wizard_button:pos.payment,ask_pay,add_pay:0
 msgid "Ma_ke payment"
-msgstr ""
+msgstr "Izvrsi Isplatu"
 
 #. module: point_of_sale
 #: wizard_button:pos.discount,init,apply_discount:0
 msgid "Apply Discount"
-msgstr ""
+msgstr "Prihvati Popust"
 
 #. module: point_of_sale
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Cenovnik"
 
 #. module: point_of_sale
 #: wizard_field:pos.discount,init,discount:0
 msgid "Discount percentage"
-msgstr ""
+msgstr "Procenat popusta"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
 msgid "Receipt"
-msgstr ""
+msgstr "Racun"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
 msgid "Refund order :"
-msgstr ""
+msgstr "Redosled refundiranja:"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "Broj Transakcija"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Neto Ukupno"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Other"
-msgstr ""
+msgstr "Drugo"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
@@ -716,7 +716,7 @@ msgstr ""
 #: wizard_field:pos.payment,ask_pay,invoice_wanted:0
 #: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: point_of_sale
 #: wizard_button:pos.add_product,init,end:0
@@ -729,12 +729,12 @@ msgstr ""
 #: wizard_button:pos.sale.get,init,end:0
 #: wizard_button:pos.scan_product,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -750,34 +750,35 @@ msgstr ""
 #. module: point_of_sale
 #: wizard_view:pos.payment,ask_pay:0
 msgid "Add payment :"
-msgstr ""
+msgstr "Dodaj Placanje :"
 
 #. module: point_of_sale
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment
 msgid "Pos Payment"
-msgstr ""
+msgstr "POS Isplate"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "Popust Ukupno"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Kreiranje računa"
 
 #. module: point_of_sale
 #: wizard_view:pos.refund_order,init:0
 msgid "Refund "
-msgstr ""
+msgstr "Refunidraj "
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
@@ -787,25 +788,25 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr ""
+msgstr "Ukupan Iznos"
 
 #. module: point_of_sale
 #: wizard_field:pos.add_product,init,product:0
 #: rml:pos.details:0
 #: field:pos.order.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturisanje"
 
 #. module: point_of_sale
 #: field:pos.config.journal,journal_id:0
@@ -814,22 +815,22 @@ msgstr ""
 #: field:pos.payment,journal_id:0
 #: field:report.transaction.pos,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: point_of_sale
 #: wizard_field:pos.scan_product,init,gencod:0
 msgid "Barcode"
-msgstr ""
+msgstr "Bar-Kod"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Otkazani Racuni"
 
 #. module: point_of_sale
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
@@ -839,12 +840,12 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: point_of_sale
 #: field:pos.payment,payment_nb:0
 msgid "Piece Number"
-msgstr ""
+msgstr "Br. Komada"
 
 #. module: point_of_sale
 #: wizard_field:pos.config.journal,init,default_journal_gift:0
@@ -855,42 +856,42 @@ msgstr ""
 #: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
 msgid "Payment"
-msgstr ""
+msgstr "Isplata"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3
 msgid "All orders"
-msgstr ""
+msgstr "Sve porudzbine"
 
 #. module: point_of_sale
 #: wizard_field:pos.sale.get,init,picking_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Narudžbenica"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
 msgid "Sales of the month"
-msgstr ""
+msgstr "Mesecna prodaja"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "D_iscount"
-msgstr ""
+msgstr "P_opust"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Datum naručivanja"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Payments"
-msgstr ""
+msgstr "Isplate"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Povraćaj dobavljača"
 
 #. module: point_of_sale
 #: field:pos.config.journal,name:0
@@ -899,18 +900,18 @@ msgstr ""
 #: field:pos.payment,name:0
 #: rml:pos.receipt:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
 msgid "Account Entry"
-msgstr ""
+msgstr "Sadrzaj Naloga"
 
 #. module: point_of_sale
 #: wizard_field:pos.payment,ask_pay,payment_id:0
 #: field:pos.payment,payment_id:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja"
 
 #. module: point_of_sale
 #: rml:pos.invoice:0
@@ -918,12 +919,12 @@ msgstr ""
 #: wizard_field:pos.payment,ask_pay,amount:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Actions"
-msgstr ""
+msgstr "Radnje"
 
 #. module: point_of_sale
 #: help:pos.order,salesman_id:0
@@ -934,35 +935,35 @@ msgstr ""
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "Vrste Poreza"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Print Date:"
-msgstr ""
+msgstr "Datum Stampe"
 
 #. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Company:"
-msgstr ""
+msgstr "Firma:"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 msgid "Print Date"
-msgstr ""
+msgstr "Datum Stampe"
 
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "OPERATION N° :"
-msgstr ""
+msgstr "Br.OPERACIJE :"
 
 #. module: point_of_sale
 #: rml:pos.lines:0
 #: field:pos.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: point_of_sale
 #: rml:pos.details:0
@@ -970,4 +971,4 @@ msgstr ""
 #: rml:pos.lines:0
 #: rml:pos.receipt:0
 msgid "Price"
-msgstr ""
+msgstr "Cena"
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 32a041b8393..9beab0c4d59 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-10 10:52+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:17+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 60a08660213..6f3d120040d 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-10-10 10:52+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:17+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
new file mode 100644
index 00000000000..bfb0bc36ad2
--- /dev/null
+++ b/addons/resource/i18n/nl.po
@@ -0,0 +1,341 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-18 06:50+0000\n"
+"PO-Revision-Date: 2010-10-11 12:36+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"Language-Team: Dutch <nl@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: 2010-10-12 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+"Indien leeg, dan is dit een algemene vrije dag voor het bedrijf. Als de "
+"resource is gevuld dan geldt de afwezigheid alleen voor deze resource."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Vrijdag"
+
+#. module: resource
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Soort resource"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Afwezigheiddetail"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Afwezigheid resource"
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+msgid "Working Time"
+msgstr "Gewerkte tijd"
+
+#. module: resource
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave opbouw!"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Donderdag"
+
+#. module: resource
+#: view:resource.calendar:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Groepeer op.."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Zondag"
+
+#. module: resource
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ongeldige modelnaam in de definitie van de actie."
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Zoek resource"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Soort"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Resources"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Manager"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr "Zoek werkperiode"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Maandag"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Resource agenda"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Materiaal"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Dag v/d week"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Startdatum"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Zoek afwezigheid werkperiode"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Einddatum"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Dagen gesloten"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Resource"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"    Module voor resource beheer\n"
+"     Een resource vertegenwoordigt iets dat kan worden gepland\n"
+"     (een ontwikkelaar op een taak, een bewerkingsplaats op "
+"productieorders).\n"
+"     Deze module beheert een resource agenda gekoppeld aan elke resource.\n"
+"     Het beheert ook de afwezigheid van elke resource.\n"
+"\n"
+"    "
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+"Als het actief veld is aan staat, kunt u de resource verbergen zonder haar "
+"te verwijderen."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Woensdag"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr "Werkperiode"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Resource detail"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Resource's agenda"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+"Gekoppelde gebruikersnaam voor de resource om van haar toegang te beheren."
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Definieert de planning van de resource"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Werk vanaf"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Werk tot"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+"Dit veld toont de efficiency van de resource om taken te voltooien. bijv. "
+"resource alleen gedurende 5 dagen met 5 toegewezen taken zal standaard 100% "
+"belasting tonen, maar als we de efficiency op 200% zetten, dan zal zijn "
+"belasting slechts 50% zijn."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr "Werktijd"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+msgid "Resource Leaves"
+msgstr "Afwezigheid resource"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr "(vakantie)"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Efficiency factor"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Persoon"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Werk detail"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Startdatum"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Zaterdag"
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
index 24579de9728..b7849cc39cf 100644
--- a/addons/wiki_faq/i18n/de.po
+++ b/addons/wiki_faq/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 11:42+0000\n"
-"PO-Revision-Date: 2010-10-10 10:53+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:19+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
index c0925029a28..c0b73038993 100644
--- a/addons/wiki_quality_manual/i18n/de.po
+++ b/addons/wiki_quality_manual/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 11:48+0000\n"
-"PO-Revision-Date: 2010-10-10 10:54+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:19+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index bb66a8e23a4..a1e54fc3646 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 11:54+0000\n"
-"PO-Revision-Date: 2010-10-10 10:55+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"PO-Revision-Date: 2010-10-11 07:18+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: German <de@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: 2010-10-11 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq

From 95ebd8826dfc5d3c652448615c535bd4453923de Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 12 Oct 2010 10:35:27 +0530
Subject: [PATCH 583/632] [IMP] account_report:-code cleaning

bzr revid: mtr@mtr-20101012050527-f8gupk33laaaer3f
---
 addons/account_report/account.py | 92 ++++++++++++++++----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 6e5fbc94026..d95306403a6 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -32,18 +32,18 @@ class account_report(osv.osv):
     _description = "Account Reporting"
 
     def _amount_get(self, cr, uid, ids, field_name, arg, context={}):
-        obj_fy=self.pool.get('account.fiscalyear')
-        obj_period=self.pool.get('account.period')
+        obj_fy = self.pool.get('account.fiscalyear')
+        obj_period = self.pool.get('account.period')
 
-        def _calc_context(key,obj):
-            if key==0:
+        def _calc_context(key, obj):
+            if key == 0:
                 return obj.find(cr, uid, exception=False)
             else:
-                obj_key=obj.browse(cr, uid, obj.find(cr, uid, exception=False))
-                if isinstance(obj_key,list):
-                    obj_key=obj_key[0]
-                key_ids=obj.search(cr,uid,[('date_stop','<',obj_key.date_start)])
-                if len(key_ids)<abs(key):
+                obj_key = obj.browse(cr, uid, obj.find(cr, uid, exception=False))
+                if isinstance(obj_key, list):
+                    obj_key = obj_key[0]
+                key_ids = obj.search(cr, uid, [('date_stop','<',obj_key.date_start)])
+                if len(key_ids) < abs(key):
                     return False
                 return key_ids[key]
 
@@ -53,18 +53,18 @@ class account_report(osv.osv):
                 del context['fiscalyear']
             acc = self.pool.get('account.account')
             acc_id = acc.search(cr, uid, [('code','in',code)])
-            return reduce(lambda y,x=0: x.credit+y, acc.browse(cr, uid, acc_id, context),0.0)
+            return reduce(lambda y, x=0: x.credit+y, acc.browse(cr, uid, acc_id, context),0.0)
 
-        def _calc_debit(code,year=0):
-            context['fiscalyear']=_calc_context(year, obj_fy)
+        def _calc_debit(code, year=0):
+            context['fiscalyear'] = _calc_context(year, obj_fy)
             if not context['fiscalyear']:
                 del context['fiscalyear']
             acc = self.pool.get('account.account')
             acc_id = acc.search(cr, uid, [('code','in',code)])
-            return reduce(lambda y,x=0: x.debit+y, acc.browse(cr, uid, acc_id, context),0.0)
+            return reduce(lambda y, x=0: x.debit+y, acc.browse(cr, uid, acc_id, context), 0.0)
 
-        def _calc_balance(code,year=0):
-            context['fiscalyear']=_calc_context(year, obj_fy)
+        def _calc_balance(code, year=0):
+            context['fiscalyear'] = _calc_context(year, obj_fy)
             if not context['fiscalyear']:
                 del context['fiscalyear']
             acc = self.pool.get('account.account')
@@ -72,21 +72,21 @@ class account_report(osv.osv):
             for c in code:
                 for i in c.split('-'):
                     account_ids += acc.search(cr, uid, [('code', 'ilike', i)])
-            return reduce(lambda y,x=0: x.balance+y, acc.browse(cr, uid, account_ids, context),0.0)
+            return reduce(lambda y, x=0: x.balance+y, acc.browse(cr, uid, account_ids, context), 0.0)
 
         def _calc_report(*code):
             acc = self.pool.get('account.report.report')
-            acc_id = acc.search(cr, uid, [('code','in',code)])
-            return reduce(lambda y,x=0: x.amount+y, acc.browse(cr, uid, acc_id, context),0.0)
+            acc_id = acc.search(cr, uid, [('code', 'in', code)])
+            return reduce(lambda y, x=0: x.amount+y, acc.browse(cr, uid, acc_id, context),0.0)
 
-        def _calc_tax_code(code,period=0):
-            context['period_id']=_calc_context(period, obj_period)
+        def _calc_tax_code(code, period=0):
+            context['period_id'] = _calc_context(period, obj_period)
             if not context['period_id']:
                 return 0.00
-            context['period_id']=context['period_id'][0]
+            context['period_id'] = context['period_id'][0]
             acc = self.pool.get('account.tax.code')
-            acc_id = acc.search(cr, uid, [('code','in',code)])
-            return reduce(lambda y,x=0: x.sum_period+y, acc.browse(cr, uid, acc_id, context),0.0)
+            acc_id = acc.search(cr, uid, [('code', 'in', code)])
+            return reduce(lambda y, x=0: x.sum_period+y, acc.browse(cr, uid, acc_id, context), 0.0)
         result = {}
         for rep in self.browse(cr, uid, ids, context):
             objdict = {
@@ -97,18 +97,18 @@ class account_report(osv.osv):
                 'tax_code': _calc_tax_code,
             }
             try:
-                val = eval(getattr(rep,'expression'), objdict)
+                val = eval(getattr(rep, 'expression'), objdict)
             except:
                 val = 0.0
 
-            if field_name=='status':
-                if val<rep.badness_limit:
+            if field_name == 'status':
+                if val < rep.badness_limit:
                     result[rep.id] = 'very bad'
-                elif val==rep.badness_limit:
+                elif val == rep.badness_limit:
                     result[rep.id] = 'bad'
                 elif val<rep.goodness_limit:
                     result[rep.id] = 'normal'
-                elif val==rep.goodness_limit:
+                elif val == rep.goodness_limit:
                     result[rep.id] = 'good'
                 else:
                     result[rep.id] = 'very good'
@@ -117,10 +117,10 @@ class account_report(osv.osv):
         return result
 
     def onchange_parent_id(self, cr, uid, ids, parent_id):
-        v={}
+        v = {}
         if parent_id:
-            acc=self.pool.get('account.report.report').browse(cr, uid, parent_id)
-            v['type']=acc.type
+            acc = self.pool.get('account.report.report').browse(cr, uid, parent_id)
+            v['type'] = acc.type
         return {'value': v}
 
     _columns = {
@@ -135,8 +135,8 @@ class account_report(osv.osv):
             ('other','Others')],
             'Type', required=True),
         'expression': fields.char('Expression', size=240, required=True),
-        'badness_limit' :fields.float('Badness Indicator Limit', digits=(16,2), help='This Value sets the limit of badness.'),
-        'goodness_limit' :fields.float('Goodness Indicator Limit', digits=(16,2), help='This Value sets the limit of goodness.'),
+        'badness_limit': fields.float('Badness Indicator Limit', digits=(16,2), help='This Value sets the limit of badness.'),
+        'goodness_limit': fields.float('Goodness Indicator Limit', digits=(16,2), help='This Value sets the limit of goodness.'),
         'parent_id': fields.many2one('account.report.report', 'Parent'),
         'child_ids': fields.one2many('account.report.report', 'parent_id', 'Children'),
         'note': fields.text('Note'),
@@ -152,8 +152,8 @@ class account_report(osv.osv):
                 ('very good', 'Very Good')
             ],
             string='Status'),
-         'disp_tree':fields.boolean('Display Tree', help='When the indicators are printed, if one indicator is set with this field to True, then it will display one more graphs with all its children in tree'),
-         'disp_graph':fields.boolean('Display As Graph', help='If the field is set to True, information will be printed as a Graph, otherwise as an array.'),
+         'disp_tree': fields.boolean('Display Tree', help='When the indicators are printed, if one indicator is set with this field to True, then it will display one more graphs with all its children in tree'),
+         'disp_graph': fields.boolean('Display As Graph', help='If the field is set to True, information will be printed as a Graph, otherwise as an array.'),
     }
     _defaults = {
         'active': lambda *args: True,
@@ -162,9 +162,9 @@ class account_report(osv.osv):
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
-            args=[]
+            args = []
         if not context:
-            context={}
+            context = {}
         ids = []
         if name:
             ids = self.search(cr, user, [('code','=',name)]+ args, limit=limit, context=context)
@@ -183,12 +183,12 @@ account_report()
 class account_report_history(osv.osv):
 
     def _calc_value(self, cr, uid, ids, name, args, context):
-        acc_report_id=self.read(cr, uid, ids, ['tmp','period_id'])
-        tmp_ids={}
+        acc_report_id = self.read(cr, uid, ids, ['tmp','period_id'])
+        tmp_ids = {}
         for a in acc_report_id:
-            period_val=pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [a['period_id'][0]])[0]
-            period_id=pooler.get_pool(cr.dbname).get('account.period').search(cr, uid, [('date_start','<=',period_val['date_start']),('fiscalyear_id','=',period_val['fiscalyear_id'][0])])
-            tmp_ids[a['id']] = pooler.get_pool(cr.dbname).get('account.report.report').read(cr, uid, [a['tmp']], context={'periods':period_id})[0]['amount']
+            period_val = pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [a['period_id'][0]])[0]
+            period_id = pooler.get_pool(cr.dbname).get('account.period').search(cr, uid, [('date_start', '<=', period_val['date_start']),('fiscalyear_id', '=', period_val['fiscalyear_id'][0])])
+            tmp_ids[a['id']] = pooler.get_pool(cr.dbname).get('account.report.report').read(cr, uid, [a['tmp']], context={'periods': period_id})[0]['amount']
         return tmp_ids
 
     _name = "account.report.history"
@@ -197,11 +197,11 @@ class account_report_history(osv.osv):
     _auto = False
     _order='name'
     _columns = {
-        'period_id': fields.many2one('account.period','Period', readonly=True, select=True),
-        'fiscalyear_id': fields.many2one('account.fiscalyear','Fiscal Year', readonly=True, select=True),
-        'name': fields.many2one('account.report.report','Indicator', readonly=True, select=True),
+        'period_id': fields.many2one('account.period', 'Period', readonly=True, select=True),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True, select=True),
+        'name': fields.many2one('account.report.report', 'Indicator', readonly=True, select=True),
         'val': fields.function(_calc_value, method=True, string='Value', readonly=True),
-        'tmp' : fields.integer(string='temp',readonly=True)
+        'tmp' : fields.integer(string='temp', readonly=True)
     }
 
     def init(self, cr):

From b1c90cee3cfe41e6d71eb25f913e6e66b1646bb0 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 12 Oct 2010 10:41:23 +0530
Subject: [PATCH 584/632] [FIX] account_payment: Automated test
 account_payment/test/account_payment.yml

bzr revid: psi@tinyerp.co.in-20101012051123-b6on1m0oslst1990
---
 addons/account_payment/wizard/account_payment_pay.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 132ab33af2c..09ea68e7d30 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -21,8 +21,8 @@
 from osv import fields, osv
 
 class account_payment_make_payment(osv.osv_memory):
-    _name = 'account.payment.make.payment'
-    _description = 'Account make payment'
+    _name = "account.payment.make.payment"
+    _description = "Account make payment"
 
     def launch_wizard(self, cr, uid, ids, context=None):
         """
@@ -33,7 +33,7 @@ class account_payment_make_payment(osv.osv_memory):
 #        obj_model = self.pool.get('ir.model.data')
 #        obj_act = self.pool.get('ir.actions.act_window')
 #        order = obj_payment_order.browse(cr, uid, context['active_id'], context)
-        obj_payment_order.set_done(cr, uid, context['active_id'], context)
+        obj_payment_order.set_done(cr, uid, [context['active_id']], context)
         return {}
 #        t = order.mode and order.mode.type.code or 'manual'
 #        if t == 'manual':

From 2146a270f34adde54a4e9b3a0fcd3c6108fca7ef Mon Sep 17 00:00:00 2001
From: vth <vth@tinyerp.com>
Date: Tue, 12 Oct 2010 10:47:13 +0530
Subject: [PATCH 585/632] [REF] account

bzr revid: vth@tinyerp.com-20101012051713-0p5yd1mzdvvx894f
---
 addons/account/account.py                         |  4 ++--
 addons/account/invoice.py                         | 12 +++++++-----
 addons/account/project/report/analytic_balance.py |  2 +-
 addons/account/wizard/account_move_journal.py     |  4 ++--
 addons/account_followup/account_followup.py       |  4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b0271a4fee1..ac50c25cd6b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -278,7 +278,7 @@ class account_account(osv.osv):
             # ON l.account_id = tmp.id
             # or make _get_children_and_consol return a query and join on that
             request = ("SELECT l.account_id as id, " +\
-                       ' , '.join(map(mapping.__getitem__, field_names)) +
+                       ', '.join(map(mapping.__getitem__, field_names)) +
                        " FROM account_move_line l" \
                        " WHERE l.account_id IN %s " \
                             + filters +
@@ -1538,7 +1538,7 @@ class account_tax_code(osv.osv):
         if context is None:
             context = {}
         move_state = ('posted', )
-        if context.get('state', False) == 'all':
+        if context.get('state', 'all') == 'all':
             move_state = ('draft', 'posted', )
         if context.get('fiscalyear_id', False):
             fiscalyear_id = context['fiscalyear_id']
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index b5b6fe5977e..4cdaeab9a49 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1078,7 +1078,9 @@ class account_invoice(osv.osv):
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
         invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
-
+        obj_invoice_line = self.pool.get('account.invoice.line')
+        obj_invoice_tax = self.pool.get('account.invoice.tax')
+        obj_journal = self.pool.get('account.journal')
         new_ids = []
         for invoice in invoices:
             del invoice['id']
@@ -1090,18 +1092,18 @@ class account_invoice(osv.osv):
                 'in_refund': 'in_invoice',   # Supplier Refund
             }
 
-            invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
+            invoice_lines = obj_invoice_line.read(cr, uid, invoice['invoice_line'])
             invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines)
 
-            tax_lines = self.pool.get('account.invoice.tax').read(cr, uid, invoice['tax_line'])
+            tax_lines = obj_invoice_tax.read(cr, uid, invoice['tax_line'])
             tax_lines = filter(lambda l: l['manual'], tax_lines)
             tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
             if journal_id:
                 refund_journal_ids = [journal_id]
             elif invoice['type'] == 'in_invoice':
-                refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase_refund')])
+                refund_journal_ids = obj_journal.search(cr, uid, [('type','=','purchase_refund')])
             else:
-                refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')])
+                refund_journal_ids = obj_journal.search(cr, uid, [('type','=','sale_refund')])
 
             if not date:
                 date = time.strftime('%Y-%m-%d')
diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py
index 01cefdd03c8..42e36744cb8 100644
--- a/addons/account/project/report/analytic_balance.py
+++ b/addons/account/project/report/analytic_balance.py
@@ -119,12 +119,12 @@ class account_analytic_balance(report_sxw.rml_parse):
         return (debit-credit)
 
     def _sum_all(self, accounts, date1, date2, option):
+        account_analytic_obj = self.pool.get('account.analytic.account')
         ids = map(lambda x: x['id'], accounts)
         if not ids:
             return 0.0
 
         if not self.acc_sum_list:
-            account_analytic_obj = self.pool.get('account.analytic.account')
             ids2 = account_analytic_obj.search(self.cr, self.uid,[('parent_id', 'child_of', ids)])
             self.acc_sum_list = ids2
         else:
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index fc0953b93fa..02cd614ee5d 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -91,9 +91,9 @@ class account_move_journal(osv.osv_memory):
         <form string="Standard entries">
             <separator string="Open Journal Items !" colspan="4"/>
             <group colspan="4" >
-                <label width="300" string="Journal : %s"/>
+                <label width="300" string="Journal: %s"/>
                 <newline/>
-                <label width="300" string="Period :  %s"/>
+                <label width="300" string="Period:  %s"/>
             </group>
             <group colspan="4" col="4">
                 <label string ="" colspan="2"/>
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 1d0ca8a500c..5bbfe80cc24 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -62,12 +62,12 @@ account_move_line()
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
-        'follow_up_msg' : fields.text('Follow-up Message', translate=True),
+        'follow_up_msg': fields.text('Follow-up Message', translate=True),
     }
 
     _defaults = {
         'overdue_msg': '''
-Date : %(date)s
+Date: %(date)s
 
 Dear %(partner_name)s,
 

From 3678e09a807ddb606309a00196fa856e69321362 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 10:49:30 +0530
Subject: [PATCH 586/632] [MOD/IMP] hr_* : Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101012051930-h37amb58eps2bzf0
---
 addons/hr_holidays/hr_holidays_view.xml | 12 ++++++------
 addons/hr_payroll/hr_payroll_view.xml   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 124e424f620..b1225f04609 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -90,8 +90,8 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
@@ -133,11 +133,11 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2">
+                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                             <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                             <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                         </group>
                     </page>
@@ -161,11 +161,11 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                    <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
@@ -191,10 +191,10 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
+                                <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
                                 <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
@@ -221,10 +221,10 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
@@ -248,10 +248,10 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
+                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
                     <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                     <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
                 </tree>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0b06790407d..9d99be20b8a 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -985,11 +985,11 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state"/>
+                        <button string="Cancel" name="cancel_sheet" icon="gtk-cancel" states="draft,hr_check,accont_check,confirm" type="object"/>
                         <button string="Compute" name="compute_sheet" states="new" icon="terp-document-new" type="object"/>
                         <button string="Verify Sheet" icon="gtk-ok" name="verify_sheet" states="draft" type="object"/>
                         <button string="Complete HR Checking"  icon="gtk-apply" name="final_verify_sheet" type="object" states="hr_check"/>
                         <button string="Pay Salary" icon="gtk-apply"  name="process_sheet" states="confirm" type="object" />
-                        <button string="Cancel" name="cancel_sheet" icon="gtk-cancel" states="draft,hr_check,accont_check,confirm" type="object"/>
                         <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" />
                     </group>
                 </form>

From 69147e278f1a4f14963cebf5332787c9463e713c Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 12 Oct 2010 10:57:02 +0530
Subject: [PATCH 587/632] [FIX] base : Translations Corrected

bzr revid: ach@tinyerp.com-20101012052702-qrka8uld1apdpwg0
---
 bin/addons/base/i18n/am.po     |  9 ++-------
 bin/addons/base/i18n/ar.po     |  9 ++-------
 bin/addons/base/i18n/base.pot  |  2 +-
 bin/addons/base/i18n/bg.po     | 19 ++++---------------
 bin/addons/base/i18n/bs.po     |  9 ++-------
 bin/addons/base/i18n/ca.po     | 19 ++++---------------
 bin/addons/base/i18n/cs.po     |  9 ++-------
 bin/addons/base/i18n/da.po     |  9 ++-------
 bin/addons/base/i18n/de.po     | 32 ++++++--------------------------
 bin/addons/base/i18n/el.po     | 19 ++++---------------
 bin/addons/base/i18n/en_GB.po  | 18 ++++--------------
 bin/addons/base/i18n/es.po     | 19 ++++---------------
 bin/addons/base/i18n/es_AR.po  | 14 +++-----------
 bin/addons/base/i18n/es_EC.po  | 19 ++++---------------
 bin/addons/base/i18n/et.po     | 14 +++-----------
 bin/addons/base/i18n/eu.po     |  9 ++-------
 bin/addons/base/i18n/fa.po     | 19 ++++---------------
 bin/addons/base/i18n/fi.po     | 33 ++++++---------------------------
 bin/addons/base/i18n/fr.po     | 14 +++-----------
 bin/addons/base/i18n/gl.po     |  9 ++-------
 bin/addons/base/i18n/he.po     | 13 +++----------
 bin/addons/base/i18n/hr.po     | 14 +++-----------
 bin/addons/base/i18n/hu.po     |  9 ++-------
 bin/addons/base/i18n/id.po     |  9 ++-------
 bin/addons/base/i18n/is.po     |  9 ++-------
 bin/addons/base/i18n/it.po     | 19 ++++---------------
 bin/addons/base/i18n/ja.po     |  9 ++-------
 bin/addons/base/i18n/ko.po     | 13 +++----------
 bin/addons/base/i18n/lt.po     |  9 ++-------
 bin/addons/base/i18n/lt_LT.po  |  5 ++---
 bin/addons/base/i18n/lv.po     | 25 +++++--------------------
 bin/addons/base/i18n/mn.po     | 18 ++++--------------
 bin/addons/base/i18n/nb.po     |  9 ++-------
 bin/addons/base/i18n/nl.po     | 19 ++++---------------
 bin/addons/base/i18n/nl_BE.po  |  9 ++-------
 bin/addons/base/i18n/nl_NL.po  | 14 +++-----------
 bin/addons/base/i18n/pl.po     | 19 ++++---------------
 bin/addons/base/i18n/pt.po     | 18 ++++--------------
 bin/addons/base/i18n/pt_BR.po  | 19 ++++---------------
 bin/addons/base/i18n/ro.po     |  9 ++-------
 bin/addons/base/i18n/ru.po     | 19 ++++---------------
 bin/addons/base/i18n/sk.po     | 14 +++-----------
 bin/addons/base/i18n/sl.po     |  9 ++-------
 bin/addons/base/i18n/sq.po     |  9 ++-------
 bin/addons/base/i18n/sr.po     | 14 +++-----------
 bin/addons/base/i18n/sv.po     |  9 ++-------
 bin/addons/base/i18n/th.po     |  9 ++-------
 bin/addons/base/i18n/tlh.po    |  9 ++-------
 bin/addons/base/i18n/tr.po     | 18 ++++--------------
 bin/addons/base/i18n/uk.po     |  9 ++-------
 bin/addons/base/i18n/uk_UA.po  |  5 ++---
 bin/addons/base/i18n/vi.po     |  9 ++-------
 bin/addons/base/i18n/zh_CN.po  | 16 ++++------------
 bin/addons/base/i18n/zh_TW.po  | 12 +++---------
 bin/addons/base/ir/ir_model.py |  2 +-
 55 files changed, 161 insertions(+), 574 deletions(-)

diff --git a/bin/addons/base/i18n/am.po b/bin/addons/base/i18n/am.po
index dc910dc47d4..2c1cb0945d4 100644
--- a/bin/addons/base/i18n/am.po
+++ b/bin/addons/base/i18n/am.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po
index fd857b54e67..7949bf77f5e 100644
--- a/bin/addons/base/i18n/ar.po
+++ b/bin/addons/base/i18n/ar.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot
index d279fc3e271..a29409e69b2 100644
--- a/bin/addons/base/i18n/base.pot
+++ b/bin/addons/base/i18n/base.pot
@@ -3103,7 +3103,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid "\"%s\" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index b1b2096348b..f81214368cc 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -1405,14 +1405,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Въведете поле/израз, който връща списък. Например, изберете поръчка за "
-"продажба в обект и ще може да имате цикъл върху редовете от поръчка за "
-"продажба. Израз = 'object.order_line'."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Въведете поле/израз, който връща списък. Например, изберете поръчка за продажба в обект и ще може да имате цикъл върху редовете от поръчка за продажба. Израз = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3250,13 +3244,8 @@ msgstr "Групиране по"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" съдържа твърде много точки. XML-идентификаторите не трябва да "
-"съдържат точки! Те се използват за свързване към данни от други модули, "
-"например в module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' съдържа твърде много точки. XML-идентификаторите не трябва да съдържат точки! Те се използват за свързване към данни от други модули, например в module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po
index 22bda14c6e2..72df0ea0c8d 100644
--- a/bin/addons/base/i18n/bs.po
+++ b/bin/addons/base/i18n/bs.po
@@ -1382,10 +1382,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3186,9 +3183,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index b33243184f4..b0963e20e96 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -1405,14 +1405,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduïu el camp/expressió que tornarà la llista. Per ex. si seleccioneu "
-"la comanda de venda en Objecte podrà realitzar un bucle sobre les línies del "
-"comanda de venda. Expressió = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduïu el camp/expressió que tornarà la llista. Per ex. si seleccioneu la comanda de venda en Objecte podrà realitzar un bucle sobre les línies del comanda de venda. Expressió = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3249,13 +3243,8 @@ msgstr "Agrupa per"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"% s\" conté massa punts. ¡Els ids l'XML no haurien de contenir punts! Els "
-"punts es fan servir per referir-se a dades d'altres mòduls, per exemple "
-"mòdul.referència_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' conté massa punts. ¡Els ids l'XML no haurien de contenir punts! Els punts es fan servir per referir-se a dades d'altres mòduls, per exemple mòdul.referència_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po
index 72ca59fd5dc..3b9e2719025 100644
--- a/bin/addons/base/i18n/cs.po
+++ b/bin/addons/base/i18n/cs.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3171,9 +3168,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po
index 6902704935d..590d4b7d804 100644
--- a/bin/addons/base/i18n/da.po
+++ b/bin/addons/base/i18n/da.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po
index 593919a31b3..b6e59ea5a83 100644
--- a/bin/addons/base/i18n/de.po
+++ b/bin/addons/base/i18n/de.po
@@ -1409,15 +1409,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Eingabe des Feldes/Ausdruckes, das die Liste erzeugt. \r\n"
-"zB Auswahl von \"sale order\" in Objekt und alle Averkaufsauftragszeilen "
-"werden ausgewählt.\r\n"
-"Ausdruck = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Eingabe des Feldes/Ausdruckes, das die Liste erzeugt. zB Auswahl von sale order in Objekt und alle Averkaufsauftragszeilen werden ausgewählt.Ausdruck = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3250,13 +3243,8 @@ msgstr "Gruppiere nach"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" beinhaltet zu viele Punkte. XML IDs sollen keine Punkte enthalten. "
-"Punkte werdfen verwendet um andere Module zu ferferenzieren wie zB. "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' beinhaltet zu viele Punkte. XML IDs sollen keine Punkte enthalten. Punkte werdfen verwendet um andere Module zu ferferenzieren wie zB. module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -4418,16 +4406,8 @@ msgstr "Objekt"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment:0
-msgid ""
-"This is the filename of the attachment used to store the printing result. "
-"Keep empty to not save the printed reports. You can use a python expression "
-"with the object and time variables."
-msgstr ""
-"Das ist der Dateiname des Anhanges unter dem Ausdrucke gespeichert "
-"werden.\r\n"
-"Leer lassen, wenn Ausdrucke nicht gespeichert wreden sollen.\r\n"
-"Die Verwendung von Python Ausdrücken sowie Objekt und Zeitvariablen ist "
-"möglich."
+msgid "This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables."
+msgstr "Das ist der Dateiname des Anhanges unter dem Ausdrucke gespeichert werden. Leer lassen, wenn Ausdrucke nicht gespeichert wreden sollen. Die Verwendung von Python Ausdrücken sowie Objekt und Zeitvariablen ist möglich."
 
 #. module: base
 #: model:res.country,name:base.ng
diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po
index 0b4ab975a2f..cd8089d36d0 100644
--- a/bin/addons/base/i18n/el.po
+++ b/bin/addons/base/i18n/el.po
@@ -1405,14 +1405,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3254,13 +3248,8 @@ msgstr "Ομαδοποίηση Ανά"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" περιέχει πολλές τελείες. Οι XML ταυτότητες (ids) δεν πρέπει να "
-"περιέχουν τελείες! Οι τελείες χρησιμοποιούνται σε αναφορές σε άλλες ενότητες "
-"όπως στο module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' περιέχει πολλές τελείες. Οι XML ταυτότητες (ids) δεν πρέπει να περιέχουν τελείες! Οι τελείες χρησιμοποιούνται σε αναφορές σε άλλες ενότητες όπως στο module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/en_GB.po b/bin/addons/base/i18n/en_GB.po
index 213c82427a4..68d70c6c092 100644
--- a/bin/addons/base/i18n/en_GB.po
+++ b/bin/addons/base/i18n/en_GB.po
@@ -1402,14 +1402,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3243,12 +3237,8 @@ msgstr "Group By"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 5d9dcbac646..6e5c5d3ca68 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione "
-"el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del "
-"pedido de venta. Expresión = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del pedido de venta. Expresión = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3253,13 +3247,8 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contiene demasiados puntos. ¡Los ids del XML no deberían contener "
-"puntos! Los puntos se usan para referirse a datos de otros módulos, por "
-"ejemplo módulo.referencia_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contiene demasiados puntos. ¡Los ids del XML no deberían contener puntos! Los puntos se usan para referirse a datos de otros módulos, por ejemplo módulo.referencia_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po
index 07f8596dc29..f22db5e97a5 100644
--- a/bin/addons/base/i18n/es_AR.po
+++ b/bin/addons/base/i18n/es_AR.po
@@ -1401,14 +1401,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione "
-"el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del "
-"pedido de venta. Expresión = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del pedido de venta. Expresión = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3225,9 +3219,7 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po
index bb83aeb18f6..edd17754b3a 100644
--- a/bin/addons/base/i18n/es_EC.po
+++ b/bin/addons/base/i18n/es_EC.po
@@ -1407,14 +1407,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione "
-"el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del "
-"pedido de venta. Expresión = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Introduzca el campo/expresión que devolverá la lista. Por ej. si seleccione el pedido de venta en Objeto podrá realizar un bucle sobre las líneas del pedido de venta. Expresión = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3251,13 +3245,8 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contiene demasiados puntos. ¡Los ids del XML no deberían contener "
-"puntos! Los puntos se usan para referirse a datos de otros módulos, por "
-"ejemplo módulo.referencia_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contiene demasiados puntos. ¡Los ids del XML no deberían contener puntos! Los puntos se usan para referirse a datos de otros módulos, por ejemplo módulo.referencia_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po
index 0b97344fc9f..46bbbbbaa59 100644
--- a/bin/addons/base/i18n/et.po
+++ b/bin/addons/base/i18n/et.po
@@ -1391,14 +1391,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Sisesta väli/avaldis, mis tagastab nimekirja. Nt vali müügikorraldus "
-"objektis ja sul saab olla kordus müügikorralduse real. Avaldis = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Sisesta väli/avaldis, mis tagastab nimekirja. Nt vali müügikorraldus objektis ja sul saab olla kordus müügikorralduse real. Avaldis = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3230,9 +3224,7 @@ msgstr "Rühmitamine"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/eu.po b/bin/addons/base/i18n/eu.po
index caafabcff62..18076ad3f73 100644
--- a/bin/addons/base/i18n/eu.po
+++ b/bin/addons/base/i18n/eu.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/fa.po b/bin/addons/base/i18n/fa.po
index 6de36341b09..cc76d6182e3 100644
--- a/bin/addons/base/i18n/fa.po
+++ b/bin/addons/base/i18n/fa.po
@@ -1402,14 +1402,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"فیلد/عبارتی که فهرست را باز خواهد گرداند وارد کنید. برای نمونه برگزیدن سفارش "
-"فروش در شی، بنابراین شما می‌توانید در ردیف‌های سفارشات فروش حلقه داشته "
-"باشید. عبارت = 'object.order_line'."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "فیلد/عبارتی که فهرست را باز خواهد گرداند وارد کنید. برای نمونه برگزیدن سفارش فروش در شی، بنابراین شما می‌توانید در ردیف‌های سفارشات فروش حلقه داشته باشید. عبارت = 'object.order_line'."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3244,13 +3238,8 @@ msgstr "گروه‌بندی برمبنای"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" دارای تیک نقطه بیش از حد است. شناسه‌های XML نباید دارای نقطه باشنتد! "
-"آنها برای ارجاع به داده‌های پیمانه‌های دیگر آنگونه که در module.reference_id "
-"آمده، هستند."
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' دارای تیک نقطه بیش از حد است. شناسه‌های XML نباید دارای نقطه باشنتد!آنها برای ارجاع به داده‌های پیمانه‌های دیگر آنگونه که در module.reference_id آمده، هستند."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po
index b939177cb59..165b6a929a6 100644
--- a/bin/addons/base/i18n/fi.po
+++ b/bin/addons/base/i18n/fi.po
@@ -1395,14 +1395,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Syötä kenttä tai lauseke joka palauttaa listan. Esim. valitse myyntitilaus "
-"objektista ja voit luoda silmukan myyntitilauksen rivistä. Lauseke = "
-"\"object.order_line\"."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Syötä kenttä tai lauseke joka palauttaa listan. Esim. valitse myyntitilaus objektista ja voit luoda silmukan myyntitilauksen rivistä. Lauseke = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3238,13 +3232,8 @@ msgstr "Ryhmittele"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" sisältää liikaa pisteitä. XML ids eivät saa sisältää pisteitä ! Näitä "
-"käytetään viittaamaan toisten moodulien tietoihin kuten module.reference_id "
-"kerrotaan"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' sisältää liikaa pisteitä. XML ids eivät saa sisältää pisteitä ! Näitä käytetään viittaamaan toisten moodulien tietoihin kuten module.reference_id kerrotaan"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -7750,18 +7739,8 @@ msgstr "Logo - Käytä kokoa noin 450x150 pikseliä."
 
 #. module: base
 #: help:res.lang,grouping:0
-msgid ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
-msgstr ""
-"Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa "
-"erottelun.\r\n"
-"Esimerkiksi luku 106500 (tuhaterottimena on käytetty pilkkua):\r\n"
-"[3,2,-1] esittää sen muodossa 1,06,500;\r\n"
-"[1,2,-1] esittää sen muodossa 106,50,0;\r\n"
-"[3] esittää sen muodossa 106,500."
+msgid "The Separator Format should be like [,n] where 0 < n :starting from Unit digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be 1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as 106,500. Provided ',' as the thousand separator in each case."
+msgstr "Erottimen formaatin tulisi olla muotoa [,n] jossa n > 0 ja -1 lopettaa erottelun. Esimerkiksi luku 106500 (tuhaterottimena on käytetty pilkkua):[3,2,-1] esittää sen muodossa 1,06,500;[1,2,-1] esittää sen muodossa 106,50,0;[3] esittää sen muodossa 106,500."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form_new
diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 0471bd12dff..cbc62e30b72 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Entrez le champ/expression qui retournera la liste. Exemple: sélectionnez la "
-"commande client dans l'objet, et vous pourrez boucler sur les lignes de "
-"commandes client. Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Entrez le champ/expression qui retournera la liste. Exemple: sélectionnez la commande client dans l'objet, et vous pourrez boucler sur les lignes de commandes client. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3255,9 +3249,7 @@ msgstr "Grouper par"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 "\"%s\" contient trop de points. Les ids XML ne devraient pas contenir de "
 "points! Les points sont utilisés pour faire référence à des données d'autres "
diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po
index 63971b2bae2..109008d3c71 100644
--- a/bin/addons/base/i18n/gl.po
+++ b/bin/addons/base/i18n/gl.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 2b18b4be7c8..e172c6283f3 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -1386,13 +1386,8 @@ msgstr "אשף זה יזהה הגדרות חדשות בישום כך שתוכל
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"הקש את השדה/ביטוי אשר ישיב את הרשימה. לדוגמא בחר את הזמנת מכירה באובייקט, "
-"ותוכל לקבל לולאה בשורת הזמנת מכירה. לדוגמא = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "הקש את השדה/ביטוי אשר ישיב את הרשימה. לדוגמא בחר את הזמנת מכירה באובייקט, ותוכל לקבל לולאה בשורת הזמנת מכירה. לדוגמא = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3211,9 +3206,7 @@ msgstr "קבץ לפי"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index c5200db8b0c..39dd99a30dd 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -1393,14 +1393,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Unesite polje/izraz koji će kreirati listu. Npr. odaberite narudžbenicu kao "
-"objekt, tako da možete koristiti petlju nad stavkama narudžbe. Izraz = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Unesite polje/izraz koji će kreirati listu. Npr. odaberite narudžbenicu kao objekt, tako da možete koristiti petlju nad stavkama narudžbe. Izraz = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3214,9 +3208,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po
index 1bf33c12905..c6827ed551b 100644
--- a/bin/addons/base/i18n/hu.po
+++ b/bin/addons/base/i18n/hu.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po
index d1ae581da0f..fd1d550a731 100644
--- a/bin/addons/base/i18n/id.po
+++ b/bin/addons/base/i18n/id.po
@@ -1376,10 +1376,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3180,9 +3177,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po
index a26de9e9d24..d9c2ff923a5 100644
--- a/bin/addons/base/i18n/is.po
+++ b/bin/addons/base/i18n/is.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 723842010b0..473adcfb865 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Inserire il campo/espressione che ritornerà la lista. Per esempio, "
-"selezionare l'ordine di vendita fra gli oggetti, è possibile evere un loop "
-"nelle righe dellìordine di vendita. Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Inserire il campo/espressione che ritornerà la lista. Per esempio, selezionare l'ordine di vendita fra gli oggetti, è possibile evere un loop nelle righe dellìordine di vendita. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3252,13 +3246,8 @@ msgstr "Raggruppa per"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contiene troppi punti. Gli IDS XML non devono contenere punti! Questi "
-"sono usati per riferisti ad altri modelli di dato, come in: "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contiene troppi punti. Gli IDS XML non devono contenere punti! Questi sono usati per riferisti ad altri modelli di dato, come in: module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index c0ff2af0662..6be669380ff 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -1367,10 +1367,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3171,9 +3168,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po
index d23167e32c0..aafabe7154b 100644
--- a/bin/addons/base/i18n/ko.po
+++ b/bin/addons/base/i18n/ko.po
@@ -1376,13 +1376,8 @@ msgstr "이 위저드는 어플리케이션의 새로운 용어들을 탐지하
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"리스트를 돌려 줄 필드/표현식을 입력하십시오. 가령, 오브젝트에서 판매 주문을 선택하면, 판매 주문 라인 상의 루프를 얻을 수 있습니다 "
-"표현식 = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "리스트를 돌려 줄 필드/표현식을 입력하십시오. 가령, 오브젝트에서 판매 주문을 선택하면, 판매 주문 라인 상의 루프를 얻을 수 있습니다 표현식 = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3194,9 +3189,7 @@ msgstr "그룹 방식"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po
index 62683dae0ba..80733609733 100644
--- a/bin/addons/base/i18n/lt.po
+++ b/bin/addons/base/i18n/lt.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po
index 6a90402e113..7aee4518a19 100644
--- a/bin/addons/base/i18n/lt_LT.po
+++ b/bin/addons/base/i18n/lt_LT.po
@@ -3033,8 +3033,7 @@ msgstr ""
 #. module: base
 #: code:addons/osv/orm.py:0
 #, python-format
-msgid "You try to write on an record that doesn\'t exist ' \\n"
-"                                        '(Document type: %s)."
+msgid "You try to write on an record that doesn't exist\n(Document type: %s)."
 msgstr ""
 
 #. module: base
@@ -3087,7 +3086,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "\"%s\" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po
index 404d7096f1c..c5aca228c86 100644
--- a/bin/addons/base/i18n/lv.po
+++ b/bin/addons/base/i18n/lv.po
@@ -785,15 +785,8 @@ msgstr ">="
 
 #. module: base
 #: view:res.lang:0
-msgid ""
-"%W - Week number of the year (Monday as the first day of the week) as a "
-"decimal number [00,53]. All days in a new year preceding the first Monday "
-"are considered to be in week 0."
-msgstr ""
-"%W - gada nedēļas numurs kā decimāls skaitlis (pirmdiena kā pirmā nedēļas "
-"diena).\r\n"
-"Visas jauna gada dienas, kas iekrīt pirms pirmās pirmdienas tiek ieskaitītas "
-"0 nedēļā."
+msgid "%%W - Week number of the year (Monday as the first day of the week) as a decimal number [00,53]. All days in a new year preceding the first Monday are considered to be in week 0."
+msgstr "%%W - gada nedēļas numurs kā decimāls skaitlis (pirmdiena kā pirmā nedēļas diena).Visas jauna gada dienas, kas iekrīt pirms pirmās pirmdienas tiek ieskaitītas 0 nedēļā."
 
 #. module: base
 #: field:res.partner.event,planned_cost:0
@@ -1396,14 +1389,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Ievadiet lauku/izteiksmi, kas atspoguļos sarakstu. Piem., izvēloties tirdzn. "
-"pasūtījumu noteiktā objektā, var iegūt \"cilpu\" tirdzniecības saraksta "
-"rindai. Izteiksme = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Ievadiet lauku/izteiksmi, kas atspoguļos sarakstu. Piem., izvēloties tirdzn. pasūtījumu noteiktā objektā, var iegūt \"cilpu\" tirdzniecības saraksta rindai. Izteiksme = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3244,9 +3231,7 @@ msgstr "Grupēt pēc"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po
index 4b50a04b63d..93b90ef3e82 100644
--- a/bin/addons/base/i18n/mn.po
+++ b/bin/addons/base/i18n/mn.po
@@ -1399,14 +1399,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Жагсаалт гаргах талбар эсвэл илэрхийлэл бичнэ. Жнь. Object дээр борлуулалтын "
-"захиалгыг сонговол борлуулалтын захиалгын мөрүүдээр гүйх боломжтой болно. "
-"Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Жагсаалт гаргах талбар эсвэл илэрхийлэл бичнэ. Жнь. Object дээр борлуулалтын захиалгыг сонговол борлуулалтын захиалгын мөрүүдээр гүйх боломжтой болно. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3232,12 +3226,8 @@ msgstr "Бүлэглэх"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" нь хэт олон цэг агуулж байна. XML id цэг агуулах ёсгүй ! Бусад "
-"модульд байгаа өгөгдлийг module.reference_id байдлаар заахад цэгийг хэрэглэнэ"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' нь хэт олон цэг агуулж байна. XML id цэг агуулах ёсгүй ! Бусад модульд байгаа өгөгдлийг module.reference_id байдлаар заахад цэгийг хэрэглэнэ"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 722fd43ae3a..06e432cc71d 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po
index 6be0a162fc6..d364e1b388d 100644
--- a/bin/addons/base/i18n/nl.po
+++ b/bin/addons/base/i18n/nl.po
@@ -1408,14 +1408,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Voer het veld/expressie in die de lijst teruggeeft. Bijv. kies verkooporder "
-"in object, en u kunt een lus hebben op verkoopopdrachtregel. Expressie = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Voer het veld/expressie in die de lijst teruggeeft. Bijv. kies verkooporder in object, en u kunt een lus hebben op verkoopopdrachtregel. Expressie = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3252,13 +3246,8 @@ msgstr "Groeperen op"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" bevat teveel punten. XML-ids behoren geen punten te bevatten ! Punten "
-"worden gebruikt om te verwijzen naar gegevens in andere modules, zoals in "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' bevat teveel punten. XML-ids behoren geen punten te bevatten ! Punten worden gebruikt om te verwijzen naar gegevens in andere modules, zoals in module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po
index 607e803bbc4..6038df85cef 100644
--- a/bin/addons/base/i18n/nl_BE.po
+++ b/bin/addons/base/i18n/nl_BE.po
@@ -1393,10 +1393,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3196,9 +3193,7 @@ msgstr "Groeperen op"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po
index 2be89d2adb3..704c25a9d46 100644
--- a/bin/addons/base/i18n/nl_NL.po
+++ b/bin/addons/base/i18n/nl_NL.po
@@ -1409,14 +1409,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Voer het veld/expressie in die de lijst retourneerd. Bijv. Kies verkooporder "
-"in Object, en u kunt een loop hebben op verkooporder regel. Expressie = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Voer het veld/expressie in die de lijst retourneerd. Bijv. Kies verkooporder in Object, en u kunt een loop hebben op verkooporder regel. Expressie = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3239,9 +3233,7 @@ msgstr "Groeperen op"
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index 534179e69a4..2f772243af9 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -1404,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Wprowadź pole/wyrażenie, które zwróci listę. Tzn. wybierz zamówienie "
-"sprzedaży w obiekcie, a będziesz mógł uzyskać pętlę na pozycjach zamówienia "
-"sprzedaży. Wyrażenie = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Wprowadź pole/wyrażenie, które zwróci listę. Tzn. wybierz zamówienie sprzedaży w obiekcie, a będziesz mógł uzyskać pętlę na pozycjach zamówienia sprzedaży. Wyrażenie = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3245,13 +3239,8 @@ msgstr "Pogrupuj wg"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" zawiera zbyt dużo kropek. XML ids nie powinno zawierać kropek ! "
-"Kropki są stosowane di budowania odnośników do innych modułów jak "
-"module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' zawiera zbyt dużo kropek. XML ids nie powinno zawierać kropek ! Kropki są stosowane di budowania odnośników do innych modułów jak module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po
index f85e164b29f..0886f8cacdc 100644
--- a/bin/addons/base/i18n/pt.po
+++ b/bin/addons/base/i18n/pt.po
@@ -1404,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Preencha o campo/expressão que irá devolver a lista. Ex: Seleccione a ordem "
-"da venda no Objecto e terá acesso às linhas da ordem de venda. Expressão = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Preencha o campo/expressão que irá devolver a lista. Ex: Seleccione a ordem da venda no Objecto e terá acesso às linhas da ordem de venda. Expressão = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3244,12 +3238,8 @@ msgstr "Agrupar por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contem demasiados pontos. Ids XML não devem conter pontos! Pontos são "
-"usados para referir dados de outros módulos, como em module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contem demasiados pontos. Ids XML não devem conter pontos! Pontos são usados para referir dados de outros módulos, como em module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po
index 0a2023ded93..ffd25625bfb 100644
--- a/bin/addons/base/i18n/pt_BR.po
+++ b/bin/addons/base/i18n/pt_BR.po
@@ -1404,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Entre com campo / expressão que devolverá a lista. Por exemplo. Selecione o "
-"pedido de vendas no objeto, e voce terá as linhas dos itens. Expressão = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Entre com campo / expressão que devolverá a lista. Por exemplo. Selecione o pedido de vendas no objeto, e voce terá as linhas dos itens. Expressão = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3248,13 +3242,8 @@ msgstr "Agrupar Por"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" contem muitos pontos. Identificações XML não devem conter ponto "
-"final! Estes devem ser utilizados para referência a dados de outros módulos "
-"como em: module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' contem muitos pontos. Identificações XML não devem conter ponto final! Estes devem ser utilizados para referência a dados de outros módulos como em: module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 39e081f347e..830eb654b1d 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -1384,10 +1384,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3188,9 +3185,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index 766d4c8bce6..3a10ca26aaa 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -698,10 +698,7 @@ msgstr "STOCK_FILE"
 #. module: base
 #: model:res.country,name:base.gu
 msgid "Guam (USA)"
-msgstr ""
-"Территория Гуам (США)\r\n"
-"С 1 июня 2009 года взамен территории Гуам появится Марианский архипелаг, "
-"территория США."
+msgstr "Территория Гуам (США)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_grid
@@ -1407,14 +1404,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Введите поле/выражение, которое возвращает список. Например, выберите счёт в "
-"Object, и Вы сможете получить все позиции в счёте на оплату. Выражение = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Введите поле/выражение, которое возвращает список. Например, выберите счёт в Object, и Вы сможете получить все позиции в счёте на оплату. Выражение = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3252,9 +3243,7 @@ msgstr "Группировать по"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 "\"%s\" содержит слишком много точек. XML идентификаторы не должны содержать "
 "точки! Они используются для ссылки на данные в других модулях, например, "
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index f348b8e3f63..112480d8c72 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -1401,14 +1401,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Zadajte pole / výraz, ktorý vráti zoznam. Napr.: vyberte objednávku v "
-"objekte a môžete si vytvoriť slučku na riadky objednávky. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Zadajte pole / výraz, ktorý vráti zoznam. Napr.: vyberte objednávku v objekte a môžete si vytvoriť slučku na riadky objednávky. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3217,9 +3211,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po
index 4aaa81cd3dc..afabce32ddd 100644
--- a/bin/addons/base/i18n/sl.po
+++ b/bin/addons/base/i18n/sl.po
@@ -1373,10 +1373,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3189,9 +3186,7 @@ msgstr "Združi po"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po
index c177b83a443..7b5c9cc61aa 100644
--- a/bin/addons/base/i18n/sq.po
+++ b/bin/addons/base/i18n/sq.po
@@ -1370,10 +1370,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3174,9 +3171,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po
index 6b741b11629..41d758b3bde 100644
--- a/bin/addons/base/i18n/sr.po
+++ b/bin/addons/base/i18n/sr.po
@@ -1398,14 +1398,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Unesite polje/izraz koji će da vrati listu. Npr. odaberite nalog za prodaju "
-"u objektu, pa možete da imate petlju na redovima naloga za prodaju. Izraz = "
-"'object.order_line'"
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Unesite polje/izraz koji će da vrati listu. Npr. odaberite nalog za prodaju u objektu, pa možete da imate petlju na redovima naloga za prodaju. Izraz = 'object.order_line'"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3240,9 +3234,7 @@ msgstr "Grupiši po"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index d778e62a3ae..ccef6132d96 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -1375,10 +1375,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3182,9 +3179,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po
index 9d49e96a260..10450913054 100644
--- a/bin/addons/base/i18n/th.po
+++ b/bin/addons/base/i18n/th.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po
index 4b1e0544a1e..a9179aa7262 100644
--- a/bin/addons/base/i18n/tlh.po
+++ b/bin/addons/base/i18n/tlh.po
@@ -1364,10 +1364,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3168,9 +3165,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index 35fdcc33b43..3bd4bcc0d76 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -1402,13 +1402,8 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"Bu listeyi gönderecek alan/ifade. Örneğin, Object'de satış emrini seçin,  ve "
-"satış emri satırında döngü yapabilirsiniz. Expression = `object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "Bu listeyi gönderecek alan/ifade. Örneğin, Object'de satış emrini seçin,  ve satış emri satırında döngü yapabilirsiniz. Expression = `object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3239,13 +3234,8 @@ msgstr "Gruplama Anahtarı"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"\"%s\" çok fazla nokta içermektedir. XML belirteçlerinde nokta bulunmaz ! "
-"Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, "
-"module.reference_id ."
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s' çok fazla nokta içermektedir. XML belirteçlerinde nokta bulunmaz ! Nokta diğer modüllerin verilerine atıfta bulunmak için kullanılır. Örneğin, module.reference_id ."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index e0c660f9291..f19050aa194 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -1398,10 +1398,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3226,9 +3223,7 @@ msgstr "Групувати За"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po
index 45b170df689..c1923fd44a9 100644
--- a/bin/addons/base/i18n/uk_UA.po
+++ b/bin/addons/base/i18n/uk_UA.po
@@ -3051,8 +3051,7 @@ msgstr ""
 #. module: base
 #: code:addons/osv/orm.py:0
 #, python-format
-msgid "You try to write on an record that doesn\'t exist ' \\n"
-"                                        '(Document type: %s)."
+msgid "You try to write on an record that doesn't exist.\n(Document type: %s)."
 msgstr ""
 
 #. module: base
@@ -3105,7 +3104,7 @@ msgstr ""
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
-msgid "\"%s\" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po
index c7cc46edca9..19998e865db 100644
--- a/bin/addons/base/i18n/vi.po
+++ b/bin/addons/base/i18n/vi.po
@@ -1365,10 +1365,7 @@ msgstr ""
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
 msgstr ""
 
 #. module: base
@@ -3169,9 +3166,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 9f43500c238..6a9e40ba413 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -1372,12 +1372,8 @@ msgstr "本向导将自动检测应用程序中的新术语以便您手工更新
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"输入返回列表的字段／表达式。比如当选择的对象是销售订单，那么您可以在销售订单明细中使用循环，表达式：`object.order_line`。"
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "输入返回列表的字段／表达式。比如当选择的对象是销售订单，那么您可以在销售订单明细中使用循环，表达式：`object.order_line`。"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3181,12 +3177,8 @@ msgstr "分组方式"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
-msgstr ""
-"“%s“包含太多点。XML 标识符不应该包括点！\r\n"
-"其作用是引用到其他模块数据，如module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
+msgstr "'%s'包含太多点。XML 标识符不应该包括点！其作用是引用到其他模块数据，如module.reference_id"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po
index cc4e92b4da0..da90f77a409 100644
--- a/bin/addons/base/i18n/zh_TW.po
+++ b/bin/addons/base/i18n/zh_TW.po
@@ -1372,12 +1372,8 @@ msgstr "本項倒將自動偵測程式中的新的詞彙，您可在稍後手動
 
 #. module: base
 #: help:ir.actions.server,expression:0
-msgid ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
-msgstr ""
-"輸入返回列表的欄位／表達式。比如當選擇的對象是銷售訂單，那麼您可以在銷售訂單明細中使用循環，表達式：`object.order_line`。"
+msgid "Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."
+msgstr "輸入返回列表的欄位／表達式。比如當選擇的對象是銷售訂單，那麼您可以在銷售訂單明細中使用循環，表達式：`object.order_line`。"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -3183,9 +3179,7 @@ msgstr "分組方式"
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
-msgid ""
-"\"%s\" contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
 msgstr ""
 
 #. module: base
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 4e974abc9fa..6f6668af7fa 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -432,7 +432,7 @@ class ir_model_data(osv.osv):
         if not context:
             context = {}
         if xml_id and ('.' in xml_id):
-            assert len(xml_id.split('.'))==2, _('"%s" contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id') % (xml_id)
+            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
             warning = False
             module, xml_id = xml_id.split('.')
         if (not xml_id) and (not self.doinit):

From dca7bdf46921f80c8f5a44c3042447d4b495ddec Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 12 Oct 2010 11:03:20 +0530
Subject: [PATCH 588/632] [FIX] Event: Regression on event

bzr revid: mra@mra-laptop-20101012053320-qy61b4tiel470ip0
---
 addons/event/event.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 16bf5f8677d..5c510ede613 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -159,10 +159,11 @@ class event_event(osv.osv):
             if reg_ids:
                 cr.execute('SELECT SUM(nb_register) FROM event_registration WHERE id IN %s', (tuple(reg_ids),))
                 number = cr.fetchone()
+
             if 'register_current' in fields:
-                res[event.id]['register_current'] = len(reg_ids)
+                res[event.id]['register_current'] = number and number[0] or 0.0
             if 'register_prospect' in fields:
-                res[event.id]['register_prospect'] = len(reg_ids)
+                res[event.id]['register_prospect'] = number and number[0] or 0.0
 
         return res
 

From 4be1e3bd9c72143bbde534280fc7cd5416d6c471 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 11:05:13 +0530
Subject: [PATCH 589/632] [MOD/IMP] procurement/project_* : Cancel Button Set
 on left side

bzr revid: dbr@tinyerp.com-20101012053513-bkml0c84s2wplcco
---
 addons/procurement/procurement_view.xml             | 2 +-
 addons/project/project_view.xml                     | 8 ++++----
 addons/project_issue/project_issue_view.xml         | 6 +++---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 addons/project_planning/project_planning_view.xml   | 7 +++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 03a4c5aad82..3c9bff9be9c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -72,9 +72,9 @@
                         <field colspan="4" name="message" readonly="1"/>
                         <field name="state" readonly="1"/>
                         <group col="7" colspan="2">
+                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
                             <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
                             <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                            <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
                             <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
                         </group>
                     </page>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6b4796cc099..91564583729 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,11 +46,11 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
                                 <field name="state" select="1" readonly="1"/>
+                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                                 <button
                                     string="New Project Based on Template"
@@ -242,13 +242,13 @@
                             <newline/>
                             <group col="11" colspan="4">
                                 <field name="state" select="1"/>
+                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations">
@@ -323,10 +323,10 @@
                     <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
-                    <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>                    
+					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                     <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
-                    <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a5032047c2a..4623f968c05 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -84,10 +84,10 @@
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                             <field name="state" />
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                             <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                             <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                             </group>
@@ -191,9 +191,9 @@
                     <field name="assigned_to"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
@@ -290,9 +290,9 @@
                     <field name="version_id"/>
                     <field name="user_id"/>
                     <field name="state"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fa645af4127..f2e4c6efd68 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -146,11 +146,11 @@
                             <separator string="" colspan="4"/>
                             <group col="12" colspan="4">
                                 <field name="state" select="1"/>
+                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
                                 <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Task Detail">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ff354c69ccd..8e14631fb2c 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -104,14 +104,13 @@
                                                     <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                                                     <group col="11" colspan="4">
                                                         <field name="state" select="1"/>
+                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                                                         <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                                         <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                                         <button name="%(project.action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
-                                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-
                                                     </group>
                                                  </page>
                                                 <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
@@ -139,12 +138,12 @@
                     <group col="6" colspan="4">
                         <field name="state" select="1"
                             readonly="1" />
+                        <button name="action_cancel" states="draft,open"
+                            string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="action_open" states="draft"
                             string="Open" type="object" icon="gtk-yes" />
                         <button name="action_done" states="open"
                             string="Done" type="object" icon="gtk-jump-to" />
-                        <button name="action_cancel" states="draft,open"
-                            string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="action_draft" states="done,cancel"
                             string="Reset to Draft" type="object" icon="gtk-convert" />
                     </group>

From 16293307bb550edae82282a4e7afc62075942fc9 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 12 Oct 2010 11:17:10 +0530
Subject: [PATCH 590/632] [IMP]:account:improved centerlized general

bzr revid: apa@tinyerp.com-20101012054710-dke2gfnhb5nzag86
---
 addons/account/report/account_central_journal.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 1f4fe48fa79..28cb68fcce3 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -293,7 +293,7 @@
 		<td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -314,7 +314,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
-      <blockTable colWidths="50.0,270.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>

From e97a67e45cc768ed74c13ac9da9eeba8d843e956 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 11:21:58 +0530
Subject: [PATCH 591/632] [MOD/IMP] product/stock/survey : Cancel Button Set on
 left side

bzr revid: dbr@tinyerp.com-20101012055158-3j94wwwe8d75fe3h
---
 .../purchase_requisition_view.xml                    |  4 ++--
 addons/stock/stock_view.xml                          | 12 ++++++------
 addons/survey/survey_view.xml                        |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index de25b07ff9d..d209ef6b3fd 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -61,10 +61,10 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="1" readonly ="1"/>
+                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
                         <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
                         <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
                         <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
                     </group>
                     </page>
                     <page string="Quotations">
@@ -78,9 +78,9 @@
                                 <field name="minimum_planned_date"/>
                                 <field name="origin"/>
                                 <field name="state"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>								
 								<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
                             </tree>
                          </field>
                         <separator colspan="4" string=""/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fa81b7534c3..649031a4572 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -134,9 +134,9 @@
                     </notebook>
                     <field name="state"/>
                     <group col="4" colspan="2">
+                        <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                        <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
                     </group>
 
                 </form>
@@ -734,10 +734,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -812,8 +812,8 @@
                     <field name="min_date"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the delivery.    Do you want to continue?"/>
+                    <button name="%(action_partial_picking)d" states="assigned" type="action" icon="gtk-go-forward" string="Approve Delivery"/>
                 </tree>
             </field>
         </record>
@@ -923,10 +923,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1142,10 +1142,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
@@ -1357,10 +1357,10 @@
                                     <label string="" colspan="4"/>
                                     <field name="state"/>
                                     <group col="4" colspan="2">
+                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                         <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                         <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        <button name="action_cancel" states="assigned" string="_Cancel" type="object" icon="gtk-cancel"/>
                                     </group>
                                 </form>
                             </field>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 576ef37885e..44bcb4475b5 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -183,6 +183,8 @@
                             </field>
                             <group col="9" colspan="4">
                                 <field name="state"/>
+                                <button name="survey_cancel"
+                                    string="Cancel" states="open" type="object" icon="gtk-cancel"/>
                                 <button name="survey_draft"
                                     string="Set to draft" states="cancel,close" type="object"
                                     icon="gtk-new"/>
@@ -190,8 +192,6 @@
                                     states="draft" type="object" icon="gtk-go-forward"/>
                                 <button name="survey_close"
                                     string="Close" states="open" type="object" icon="gtk-close"/>
-                                <button name="survey_cancel"
-                                    string="Cancel" states="open" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Other">

From bce8ba79aee4719774d766efaa798f266f7c2cbe Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 12 Oct 2010 11:41:15 +0530
Subject: [PATCH 592/632] [REF] base : Corrections

bzr revid: ach@tinyerp.com-20101012061115-mlr5laakmficmoal
---
 bin/addons/base/i18n/zh_CN.po  | 6 +-----
 bin/addons/base/ir/ir_model.py | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 6a9e40ba413..038d1fb7c8a 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -8018,7 +8018,7 @@ msgstr ""
 #: code:addons/base/res/res_lang.py:0
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "用户错误"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:0
@@ -9096,10 +9096,6 @@ msgstr ""
 #~ "defined !"
 #~ msgstr "该供应商的 付款方式未定义（计算）付款方式明细！"
 
-#, python-format
-#~ msgid "User Error"
-#~ msgstr "用户错误"
-
 #, python-format
 #~ msgid "not implemented"
 #~ msgstr "尚未实现"
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 6f6668af7fa..b87e8bc9801 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -235,7 +235,6 @@ class ir_model_access(osv.osv):
     }
 
     def check_groups(self, cr, uid, group):
-        res = False
         grouparr  = group.split('.')
         if not grouparr:
             return False
@@ -427,13 +426,11 @@ class ir_model_data(osv.osv):
         return id
 
     def _update(self,cr, uid, model, module, values, xml_id=False, store=True, noupdate=False, mode='init', res_id=False, context=None):
-        warning = True
         model_obj = self.pool.get(model)
         if not context:
             context = {}
         if xml_id and ('.' in xml_id):
             assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id)
-            warning = False
             module, xml_id = xml_id.split('.')
         if (not xml_id) and (not self.doinit):
             return False
@@ -520,7 +517,6 @@ class ir_model_data(osv.osv):
         return True
 
     def ir_set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None, xml_id=False):
-        obj = self.pool.get('ir.values')
         if type(models[0])==type([]) or type(models[0])==type(()):
             model,res_id = models[0]
         else:

From c5cd260e746c666fb3e0beff7262480aa0d873d5 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 12 Oct 2010 11:41:18 +0530
Subject: [PATCH 593/632] [REF] event: typo on demo data

bzr revid: mra@mra-laptop-20101012061118-j0qr2zz3rj2miedn
---
 addons/event/event_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 3bf58691c0f..4603a9cf141 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -86,8 +86,8 @@
 		<field name="user_id" ref="base.user_root"/>
 		<field name="mail_auto_registr">True</field>
 		<field name="mail_auto_confirm">True</field>
-		<field name="mail_registr">Thanks for registrering. We will keep you informed of the modalities.</field>
-		<field name="mail_confirm">Thanks for registrering. The conference will begin at 2 PM and will be given by Mister Pinckaers.</field>
+		<field name="mail_registr">Thanks for registration. We will keep you informed of the modalities.</field>
+		<field name="mail_confirm">Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers.</field>
 	</record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
     <function model="event.event" name="button_done" eval="[ref('event_2')]"/>

From fe95af9cb17e72980570528fffe114e9167b259d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 12 Oct 2010 11:51:18 +0530
Subject: [PATCH 594/632] [IMP] account:-improvements in the account_period

bzr revid: mtr@mtr-20101012062118-becppnmojeegnjtc
---
 addons/account/account.py                           | 2 +-
 addons/account/account_end_fy.xml                   | 2 +-
 addons/account/account_view.xml                     | 2 +-
 addons/account/wizard/account_period_close_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ac50c25cd6b..bf5e25a6f69 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -838,7 +838,7 @@ class account_period(osv.osv):
         'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),
         'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
         'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index a33544ffacc..76d40bc89dc 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -6,8 +6,8 @@
             <field name="name">Close a Period</field>
             <field name="res_model">account.period</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','=','draft')]</field>
             <field name="view_id" ref="view_account_period_tree"/>
+            <field name="context">{'search_default_draft': 1}</field>
             <field name="help"> After closing a period, you will no longer be able to post entries to the period once it has been closed.</field>
         </record>
         <menuitem
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 27fd0d65b14..6612f628292 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -129,7 +129,7 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="Draft" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="code"/>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 161a3f424fc..5d3351246a3 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -34,7 +34,7 @@
         <record id="action_idea_post_vote_values" model="ir.values">
             <field name="model_id" ref="model_account_period" />
             <field name="object" eval="1" />
-            <field name="name"></field>
+            <field name="name">Close a Period</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
             <field name="key">action</field>

From 8333b60a6e3d8c2ab817674b49c528b1574a908e Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 12 Oct 2010 11:52:50 +0530
Subject: [PATCH 595/632] [IMP] event: Button on form view of event=> draft
 button only visible with cancel state now, cancel button put left side on all
 case

bzr revid: mra@mra-laptop-20101012062250-i39s646lk4o82n7w
---
 addons/event/event_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 185b1d33ec9..72ccb0f51f1 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -76,10 +76,10 @@
                         <field name="note" colspan="4" nolabel="1"/>
                         <field name="state" select="1"/>
                         <group col="4" colspan="2">
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                            <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
                     <page string="Speakers">

From 11d492dc4ff805bf1762cd610fc153949ab06002 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 12:05:53 +0530
Subject: [PATCH 596/632] [MOD/IMP]: Cancel Button Set on left side

bzr revid: dbr@tinyerp.com-20101012063553-uk5qj6ubu6ddd090
---
 addons/account/account_view.xml                       | 4 ++--
 addons/account_voucher/account_voucher_view.xml       | 2 +-
 addons/marketing_campaign/marketing_campaign_view.xml | 6 +++---
 addons/mrp/mrp_view.xml                               | 2 +-
 addons/mrp_operations/mrp_operations_view.xml         | 6 +++---
 addons/project_scrum/project_scrum_view.xml           | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 17c5ebbc393..a5b77baa3fd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1334,8 +1334,8 @@
                             <field name="narration" colspan="4" nolabel="1" height="50"/>
                             <group col="4" colspan="4">
                                 <field name="state" select="1"/>
-                                <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                                 <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                             </group>
                         </page>
                     </notebook>
@@ -2570,9 +2570,9 @@
                     </group>
                     <group col="8" colspan="4">
                         <field name="state" colspan="4"/>
+                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                         <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 1ad3edd0760..79509542015 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -77,9 +77,9 @@
                     <group col="10" colspan="4">
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
+                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 614055dddcd..b23826969a8 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -36,10 +36,10 @@
                 <separator string="" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" />
+                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                 </group>
               </form>
         </field>
@@ -161,9 +161,9 @@
                 <separator string="" colspan="4"/>
                 <group col="6" colspan="4">
                     <field name="state" readonly="1"/>
+                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
                 </group>
             </form>
@@ -382,9 +382,9 @@
                 <separator string="" colspan="4"/>
                 <group colspan="4" col="11">
                     <field name="state" readonly="True"/>
+                    <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                     <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
                     <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                    <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
                 </group>
             </form>
         </field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7addfbc3194..efe7900f56b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -627,12 +627,12 @@
                             <separator colspan="4"/>
                             <group col="9" colspan="4">
                                 <field name="state"/>
+                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
                                 <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
                                 <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
-                                <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
                             </group>
                         </page>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9a93b67a36f..62298f4aa5f 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -14,10 +14,10 @@
 	       <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/form/field[@name='hour']" position="after">
 	           <group colspan="8" col="8">
                    <field name="state"/>
+	               <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
                    <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert" help="Set to Draft"/>
 	               <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr" help="Start Working"/>
 	               <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause" help="Resume Work Order"/>
-	               <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop" help="Cancel Order"/>
 	               <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause" help="Pause Work Order"/>
 	               <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close" help="Finish Order"/>
                </group>
@@ -32,10 +32,10 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
+                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                 <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                 <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                 <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                 <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
                 <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
                 <field name="state"/>
@@ -114,10 +114,10 @@
                     <separator string="" colspan="4"/>
                     <group colspan="8" col="8">
                         <field name="state"/>
+                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                         <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
                         <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
                         <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
                         <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
                         <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
                     </group>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..7ae07d9eea8 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -113,12 +113,12 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state" select="1" readonly="1"/>
+                        <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
                         <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                         <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"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                        <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
                     </group>
                 </form>
             </field>

From 09a5900b5f3005e5acfb3cf4e1b8367592c83782 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 12 Oct 2010 12:19:58 +0530
Subject: [PATCH 597/632] [IMP] event: partner and responsible should be
 readonly when the registration is confirmed

bzr revid: mra@mra-laptop-20101012064958-uiu1ohr0da5xsc14
---
 addons/event/event_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 72ccb0f51f1..c34d6cfe475 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -319,8 +319,8 @@
                         <field name="event_id" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
                         <field name="create_date" string="Registration Date"/>
                         <field name="name"/>
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
-                        <field name="user_id"/>
+                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
+                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}" />
                         <field name="tobe_invoiced"/>
                     </group>
                     <notebook colspan="4">

From 852979228b05818f1822dd28694e9cfbd3fe65e1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 09:08:22 +0200
Subject: [PATCH 598/632] fix

bzr revid: fp@tinyerp.com-20101012070822-i14gascmf97noos4
---
 addons/procurement/schedulers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 88dbafc3c62..94fad9f68b0 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -25,6 +25,7 @@ from mx import DateTime
 from osv import osv
 import netsvc
 import pooler
+from tools.translate import _
 
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'

From ae1653e63ccc04702058bdaf9c0ebe681e1eb108 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 09:08:57 +0200
Subject: [PATCH 599/632] [fix] multi-company visibility

bzr revid: fp@tinyerp.com-20101012070857-9ix6fu732ml1o3rt
---
 bin/addons/base/res/res_security.xml | 4 ++--
 bin/addons/base/res/res_user.py      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index f2ff90a804a..ea7b541b9a1 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -17,7 +17,7 @@
         <field name="name">company rule</field>
         <field model="ir.model" name="model_id" ref="model_res_company"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('user_ids','=',user.id),('parent_id','=',user.company_id.id)]</field>
+        <field name="domain_force">['|', ('child_ids', 'child_of', [company_id]), ('parent_id', 'child_of', [company_id])]</field>
     </record>
 
     <!-- Record Rule For User -->
@@ -25,7 +25,7 @@
         <field name="name">user rule</field>
         <field model="ir.model" name="model_id" ref="model_res_users"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|',('company_id','=',user.company_id.id),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
 
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index fa3e87aab74..094a1f26b25 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -356,11 +356,13 @@ class users(osv.osv):
         if ids == [uid]:
             for key in values.keys():
                 if not (key in self.SELF_WRITEABLE_FIELDS or key.startswith('context_')):
+                    print 'Not Found', key
                     break
             else:
-                # check that user is not selecting an invalid company_id
-                if 'company_id' not in values or (values.get('company_id') in self.read(cr, uid, uid, ['company_ids'], context=context)['company_ids']):
-                    uid = 1 # safe fields only, so we write as super-user to bypass access rights
+                if 'company_id' in values:
+                    if not (values['company_id'] in self.read(cr, uid, uid, ['company_ids'], context=context)['company_ids']):
+                        del values['company_id']
+                uid = 1 # safe fields only, so we write as super-user to bypass access rights
 
         res = super(users, self).write(cr, uid, ids, values, context=context)
 

From f91c52e84cc21dbdaa90898ff8b266fe559e3c5b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 09:12:27 +0200
Subject: [PATCH 600/632] fix

bzr revid: fp@tinyerp.com-20101012071227-khzuqvg1jfc3st7x
---
 bin/addons/base/ir/ir_rule.py        | 1 +
 bin/addons/base/res/res_security.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 799a411c15f..ba1eaca3f8d 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -35,6 +35,7 @@ class ir_rule(osv.osv):
         for rule in self.browse(cr, uid, ids, context):
             eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
                             'time':time}
+            print rule.domain_force
             res[rule.id] = eval(rule.domain_force, eval_user_data)
         return res
 
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index ea7b541b9a1..3ca0685baee 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -17,7 +17,7 @@
         <field name="name">company rule</field>
         <field model="ir.model" name="model_id" ref="model_res_company"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|', ('child_ids', 'child_of', [company_id]), ('parent_id', 'child_of', [company_id])]</field>
+        <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field>
     </record>
 
     <!-- Record Rule For User -->

From 5ba8d704991309c2e60ba451e915322c8aa61694 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 10:36:13 +0200
Subject: [PATCH 601/632] [FIX] remove stray debugging print

bzr revid: xmo@openerp.com-20101012083613-dhil3g2k06i6lf60
---
 bin/addons/base/res/res_user.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 094a1f26b25..10d4b0f9ce9 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -356,7 +356,6 @@ class users(osv.osv):
         if ids == [uid]:
             for key in values.keys():
                 if not (key in self.SELF_WRITEABLE_FIELDS or key.startswith('context_')):
-                    print 'Not Found', key
                     break
             else:
                 if 'company_id' in values:

From c49dadba38e7c46cd754cb9dce93a63150d38443 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 10:47:48 +0200
Subject: [PATCH 602/632] [FIX] missing import in procurement.schedulers

bzr revid: xmo@openerp.com-20101012084748-thncj5nmcjpjbh05
---
 addons/procurement/schedulers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 88dbafc3c62..831e07b726f 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -23,6 +23,7 @@ import time
 from mx import DateTime
 
 from osv import osv
+from tools.translate import _
 import netsvc
 import pooler
 

From da1523806ea301ebd613e6f449d6a2669951b280 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Oct 2010 11:17:52 +0200
Subject: [PATCH 603/632] [FIX] delivery: finish removal of Delivery Picking
 form, replaced by Outgoing Order with dedicated journal

bzr revid: odo@openerp.com-20101012091752-69thk0p0j0zw4nfx
---
 addons/delivery/delivery_view.xml | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 91513709e03..5cdaedfd08a 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -175,22 +175,6 @@
             </field>
         </record>
 
-        <record id="view_picking_withcarrier_delivery_form" model="ir.ui.view">
-            <field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
-            <field name="type">form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
-            <field name="arch" type="xml">
-                <field name="address_id" position="after">
-                    <field name="carrier_id"/>
-                    <field name="carrier_tracking_ref" groups="base.group_extended"/>
-                    <field name="number_of_packages" groups="base.group_extended"/>
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </field>
-            </field>
-        </record>
-
         <record id="action_picking_tree4" model="ir.actions.act_window">
             <field name="name">Picking to be invoiced</field>
             <field name="res_model">stock.picking</field>
@@ -242,19 +226,6 @@
             </field>
         </record>
 
-        <record id="view_picking_withcarrier_delivery_move_form" model="ir.ui.view">
-            <field name="name">delivery.stock.picking_withcarrier.delivery.move.form.view</field>
-            <field name="type">form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </xpath>
-            </field>
-        </record>
-
         <record id="view_move_withweight_form" model="ir.ui.view">
             <field name="name">stock.move.form.weight</field>
             <field name="type">form</field>

From bac3fe249ac6afd4ec657218aea610f6a37ef260 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 11:37:45 +0200
Subject: [PATCH 604/632] merg

bzr revid: fp@tinyerp.com-20101012093745-kpfyjls7h8ftczjm
---
 addons/purchase/security/ir.model.access.csv |  5 +++--
 addons/stock/wizard/stock_splitinto.py       | 22 ++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 86784a34351..77a0aff7bb4 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -31,8 +31,9 @@
 "access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
 "access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
-"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,1,1,0
-"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,1,1,1
+"access_account_journal_period","account.journal.period","account.model_account_journal_period","group_purchase_user",1,1,1,0
+"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,0,0,0
+"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0
 "access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
 "access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
 "access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index a54e6a485c2..c514c9714eb 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -41,14 +41,14 @@ class stock_split_into(osv.osv_memory):
         quantity = self.browse(cr, uid, data[0], context).quantity or 0.0
         for move in move_obj.browse(cr, uid, rec_id):
             quantity_rest = move.product_qty - quantity
-            if move.tracking_id :
-                raise osv.except_osv(_('Error!'),  _('The current move line is already assigned to a pack, please remove it first if you really want to change it ' \
-                                    'for this product: "%s" (id: %d)') % \
-                                    (move.product_id.name, move.product_id.id,))                  
+            #if move.tracking_id :
+            #    raise osv.except_osv(_('Error!'),  _('The current move line is already assigned to a pack, please remove it first if you really want to change it ' \
+            #                        'for this product: "%s" (id: %d)') % \
+            #                        (move.product_id.name, move.product_id.id,))
             if quantity > move.product_qty:
                 raise osv.except_osv(_('Error!'),  _('Total quantity after split exceeds the quantity to split ' \
                                     'for this product: "%s" (id: %d)') % \
-                                    (move.product_id.name, move.product_id.id,))              
+                                    (move.product_id.name, move.product_id.id,))
             if quantity > 0:
                 move_obj.setlast_tracking(cr, uid, [move.id], context=context)
                 move_obj.write(cr, uid, [move.id], {
@@ -63,12 +63,12 @@ class stock_split_into(osv.osv_memory):
                     move_obj.write(cr, uid, [move.id], {'tracking_id': tracking_id})
                 else:    
                     default_val = {
-                    'product_qty': quantity_rest,
-                    'product_uos_qty': quantity_rest,
-                    'tracking_id': tracking_id,
-                    'state': move.state,
-                    'product_uos': move.product_uom.id
-                }
+                        'product_qty': quantity_rest,
+                        'product_uos_qty': quantity_rest,
+                        'tracking_id': tracking_id,
+                        'state': move.state,
+                        'product_uos': move.product_uom.id
+                    }
                     move_obj.copy(cr, uid, move.id, default_val)
         return {}
 stock_split_into()

From 53ae3b4d103b6c24acafd0a0e865dbc8821f8f7a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Oct 2010 11:38:55 +0200
Subject: [PATCH 605/632] [FIX] delivery: removed incorrect reference to
 date_planned field of stock.move

bzr revid: odo@openerp.com-20101012093855-t9zg66lu06al09f3
---
 addons/delivery/test/delivery_report.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml
index a88b6bd1942..53b06a9d36a 100644
--- a/addons/delivery/test/delivery_report.yml
+++ b/addons/delivery/test/delivery_report.yml
@@ -12,7 +12,6 @@
     invoice_state: none
     move_lines:
       - company_id: base.main_company
-        date_planned: '2010-05-11 15:18:57'
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers

From 66cf3ab7dd952648578096b09a87bf260cca8854 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Tue, 12 Oct 2010 15:10:42 +0530
Subject: [PATCH 606/632] [MOD/IMP] hr_timesheet : Improvement in data by
 default product service and timesheet jounral

bzr revid: amp@tinyerp.com-20101012094042-5lzwzvy2fxsg94n0
---
 addons/hr_timesheet/hr_timesheet.py       | 25 +++++++++++++++++++++++
 addons/hr_timesheet/hr_timesheet_view.xml |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 75ad6101e11..b1175634981 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -33,6 +33,31 @@ class hr_employee(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', help="Specifies employee's designation as a product with type 'service'."),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal')
     }
+    
+    def _getAnalyticJournal(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+        if id:
+            journal = self.browse(cr, uid, id[0], context=context)
+            if journal.journal_id:
+                return journal.journal_id.id
+        return False
+    
+    def _getEmployeeProduct(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
+        if id:
+            prod = self.browse(cr, uid, id[0], context=context)
+            if prod.product_id:
+                return prod.product_id.id
+        return False
+        
+    _defaults = {
+        'journal_id' : _getAnalyticJournal,
+        'product_id' : _getEmployeeProduct    
+    }
 hr_employee()
 
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a47fbf24685..664587b75a3 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -111,7 +111,7 @@
                 <page string="Categories" position="after">
                     <page string="Timesheets">
                         <field name="product_id" domain="[('type','=','service')]"/>
-                        <field name="journal_id"/>
+                        <field name="journal_id" widget="selection"/>
                     </page>
                 </page>
             </field>

From 53ffef5ee051f9ea94042560efa6576c242fa5f4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 11:41:47 +0200
Subject: [PATCH 607/632] fix

bzr revid: fp@tinyerp.com-20101012094147-4f7ecedzkm2sml0z
---
 bin/addons/base/ir/ir_rule.py        | 1 +
 bin/addons/base/res/res_security.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index ba1eaca3f8d..06f382ce054 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -138,6 +138,7 @@ class ir_rule(osv.osv):
     def domain_get(self, cr, uid, model_name, mode='read', context={}):
         dom = self._compute_domain(cr, uid, model_name, mode=mode)
         if dom:
+            print 'Domain', dom, model_name
             query = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
             return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index 3ca0685baee..fb9743fbe86 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -17,7 +17,8 @@
         <field name="name">company rule</field>
         <field model="ir.model" name="model_id" ref="model_res_company"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field>
+        <!-- <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field> -->
+        <field name="domain_force">[]</field>
     </record>
 
     <!-- Record Rule For User -->

From aa7772940c8aae9c5c386aca20ef0fae2a014109 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Oct 2010 11:42:50 +0200
Subject: [PATCH 608/632] [IMP] display more informations about XML parse
 errors (file and line number of troubled element)

bzr revid: xmo@openerp.com-20101012094250-n43amm773c43o9e6
---
 bin/tools/convert.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 6e534fe0400..6059d4a54ec 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -216,6 +216,7 @@ class assertion_report(object):
         return res
 
 class xml_import(object):
+    __logger = logging.getLogger('tools.convert.xml_import')
     @staticmethod
     def nodeattr2bool(node, attr, default=False):
         if not node.get(attr):
@@ -847,7 +848,10 @@ form: module.record_id""" % (xml_id,)
                         try:
                             self._tags[rec.tag](self.cr, rec, n)
                         except:
-                            self.logger.notifyChannel("init", netsvc.LOG_ERROR, '\n'+etree.tostring(rec))
+                            self.__logger.error('Parse error in %s:%d: \n%s',
+                                                rec.getroottree().docinfo.URL,
+                                                rec.sourceline,
+                                                etree.tostring(rec).strip())
                             self.cr.rollback()
                             raise
         return True

From 432f72d2808fa910acff244271c2303689036d43 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Oct 2010 11:57:51 +0200
Subject: [PATCH 609/632] [FIX] ir_rule: removed debugging print statements

bzr revid: odo@openerp.com-20101012095751-ittevizmcxqd1b29
---
 bin/addons/base/ir/ir_rule.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 06f382ce054..fe32664c1ca 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -34,8 +34,7 @@ class ir_rule(osv.osv):
         res = {}
         for rule in self.browse(cr, uid, ids, context):
             eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
-                            'time':time}
-            print rule.domain_force
+                              'time':time}
             res[rule.id] = eval(rule.domain_force, eval_user_data)
         return res
 
@@ -138,7 +137,6 @@ class ir_rule(osv.osv):
     def domain_get(self, cr, uid, model_name, mode='read', context={}):
         dom = self._compute_domain(cr, uid, model_name, mode=mode)
         if dom:
-            print 'Domain', dom, model_name
             query = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
             return query.where_clause, query.where_clause_params, query.tables
         return [], [], ['"'+self.pool.get(model_name)._table+'"']

From b7d9aa6a50d72d1aea553b00394a4228411a4f0c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 12 Oct 2010 11:58:04 +0200
Subject: [PATCH 610/632] [FIX] reports: fixed yaml_import for new file
 attribute in report tag processing - convert.py was fixed earlier

bzr revid: odo@openerp.com-20101012095804-bdfqqn5qxhya53on
---
 bin/tools/yaml_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 7f271767a04..7b3c5edc6e1 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -675,7 +675,7 @@ class YamlInterpreter(object):
         for dest, f in (('name','string'), ('model','model'), ('report_name','name')):
             values[dest] = getattr(node, f)
             assert values[dest], "Attribute %s of report is empty !" % (f,)
-        for field,dest in (('rml','report_rml'),('file','report_file'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+        for field,dest in (('rml','report_rml'),('file','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
             if getattr(node, field):
                 values[dest] = getattr(node, field)
         if node.auto:

From 6a2408f6cfa17c1f38126cec3453bdd24547e945 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 12 Oct 2010 16:09:32 +0530
Subject: [PATCH 611/632] [MOD/IMP]: Usability Improvenment in Create Invoice
 Button Icon

bzr revid: dbr@tinyerp.com-20101012103932-c0x02udpb2t04vqy
---
 addons/auction/auction_view.xml                           | 2 +-
 .../wizard/auction_lots_make_invoice_buyer_view.xml       | 2 +-
 addons/auction/wizard/auction_lots_make_invoice_view.xml  | 2 +-
 .../wizard/hr_timesheet_invoice_create_final_view.xml     | 4 ++--
 .../wizard/hr_timesheet_invoice_create_view.xml           | 2 +-
 addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml | 2 +-
 addons/sale/sale_view.xml                                 | 2 +-
 addons/sale/wizard/sale_line_invoice.xml                  | 2 +-
 addons/sale/wizard/sale_make_invoice.xml                  | 4 ++--
 addons/sale/wizard/sale_make_invoice_advance.xml          | 4 ++--
 addons/stock/stock_view.xml                               | 8 ++++----
 addons/stock/wizard/stock_invoice_onshipping_view.xml     | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index a3fb7b5a28a..43de651e554 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -123,7 +123,7 @@
                         </group>
                         <separator string="" colspan="4"/>
                         <field name="state"/>
-                        <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="gtk-yes"/>
+                        <button name="close" states="draft" string="Create Invoices" type="object" colspan="2" icon="terp-gtk-go-back-rtl"/>
                     </page>
                     <page string="Accounting" >
                         <group colspan="4" col="4">
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index 8ec4746dcf8..42eb72c18ff 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -19,7 +19,7 @@
                     <group colspan="4" col="6">
                         <label string=" " colspan="2"/>
                     	<button icon="gtk-close" special="cancel" string="Close"/>
-                    	<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index 56903865e5f..4399c689f25 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -18,7 +18,7 @@
                     <group colspan="2" col="2"/>
                     <group colspan="2" col="2">
                     	<button icon="gtk-close" special="cancel" string="Close"/>
-                    	<button icon="gtk-yes" string="Create invoices" name="makeInvoices" type="object"/>
+                    	<button icon="terp-gtk-go-back-rtl" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 7b3f5ed4d6a..b45deeae8a2 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -20,7 +20,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+					<button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
 				</group>
 			</form>
             </field>
@@ -46,4 +46,4 @@
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index fc6d6da911e..c50e1b6974a 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -26,7 +26,7 @@
                 <separator colspan="4"/>
                 <group col="2" colspan="4">
                     <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="gtk-execute"/>
+                    <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
                 </group>
             </form>
             </field>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 982ee5d4bc0..4c3f6ede30d 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -17,7 +17,7 @@
                 		<button icon="gtk-stop" special="cancel"
                 			string="Cancel" />
                 		<button name="make_invoices" string="Create Invoice"
-                			colspan="1" type="object" icon="terp-dolar" />
+                			colspan="1" type="object" icon="terp-gtk-go-back-rtl" />
                 	</group>
                 </form>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 913dfa1f82d..e2d43dc405f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -205,7 +205,7 @@
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward" type="object"/>
+                                <button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-gtk-go-back-rtl" type="object"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index c1e9d9c3b89..774759c82c7 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -9,7 +9,7 @@
              <form string="Create invoices">
                  <separator colspan="4" string="Do you really want to create the invoice(s) ?" />
                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                 <button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+                 <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
             </form>
             </field>
         </record>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 106e6945207..e8e698e56b9 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -13,7 +13,7 @@
                     <field name="invoice_date"/>
                     <separator string="" colspan="6"/>
                     <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                    <button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+                    <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
                </form>
             </field>
         </record>
@@ -38,4 +38,4 @@
             <field name="model">sale.order</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 3257d1aafe8..6e192d31108 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -15,7 +15,7 @@
                     <separator string="" colspan="4"/>
                     <label string=""  colspan="2" />
 					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-					<button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
+					<button name="create_invoices" string="Create Partial Invoice" type="object" icon="terp-gtk-go-back-rtl"/>
                 </form>
             </field>
         </record>
@@ -55,4 +55,4 @@
             <field name="target">new</field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 649031a4572..6755cefd3eb 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -748,7 +748,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -937,7 +937,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1156,7 +1156,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1371,7 +1371,7 @@
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index eddffb594aa..6284121553c 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -17,7 +17,7 @@
 					<field name="invoice_date" />
 			   	    <separator string="" colspan="4" />
 					<button special="cancel" string="_Cancel" icon='gtk-cancel'/>
-			       	<button name="create_invoice" string="Create Invoices" type="object" icon="gtk-ok"/>
+			       	<button name="create_invoice" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
              </form>
             </field>
 		</record>

From 499793ae415ffd183fcec068b93362428e74d498 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Tue, 12 Oct 2010 16:14:08 +0530
Subject: [PATCH 612/632] [FIX] Delivery : context corrected for SO view

bzr revid: jvo@tinyerp.com-20101012104408-1p69jj12v8itbpd9
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5cdaedfd08a..3d03235d872 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -258,7 +258,7 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                     <xpath expr="/form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
-                         <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':id}"/>                    
+                         <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>                    
                     </xpath>
             </field>
         </record>

From e1f829b0eba128971ce36f8774c9cfb5fbfeda8d Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 12 Oct 2010 17:39:08 +0530
Subject: [PATCH 613/632] [FIX] Export & Synchronize Translations Corrected

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

bzr revid: ach@tinyerp.com-20101012120908-1u5n29r040drhhzs
---
 bin/tools/translate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index b9ce95cdaaa..64c30af5600 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -605,7 +605,7 @@ def trans_generate(lang, modules, dbname=None):
             if fname and obj.report_type in ('pdf', 'xsl'):
                 try:
                     d = etree.parse(tools.file_open(fname))
-                    for t in parse_func(d):
+                    for t in parse_func(d.iter()):
                         push_translation(module, report_type, name, 0, t)
                 except (IOError, etree.XMLSyntaxError):
                     logging.getLogger("i18n").exception("couldn't export translation for report %s %s %s", name, report_type, fname)

From be2fa62439f5f5901256f882a83e37e2b828b699 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 12 Oct 2010 17:48:06 +0530
Subject: [PATCH 614/632] [ADD] hr : Set administrator as employee

bzr revid: vir@tinyerp.com-20101012121806-1mtpbqgmbp49ju3b
---
 addons/hr/hr_data.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index f76d1457aa1..ae8e30b23f0 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -16,5 +16,10 @@
             <field name="name">Widower</field>
         </record>
 
+        <record id="employee" model="hr.employee">
+            <field name="name">Administrator</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
     </data>
 </openerp>

From ed83a07b9965575232ee7328f05fe9856f6a85af Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Tue, 12 Oct 2010 18:04:30 +0530
Subject: [PATCH 615/632] [IMP] Sale : SO should have an act_window to see
 relevant pikcings (similar to PO)

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

bzr revid: jvo@tinyerp.com-20101012123430-x89y3r932auw0szo
---
 addons/sale/stock_view.xml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 93529fd3b7d..dddcad07932 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -23,7 +23,30 @@
                     <field name="sale_line_id" colspan="2"/>
                 </xpath>
             </field>
-        </record>        
+        </record>
+        
+        <act_window
+            domain="[('sale_id', '=', active_id)]"
+            id="act_sale_order_2_stock_picking"
+            name="Picking"
+            res_model="stock.picking"
+            src_model="sale.order"
+            context="{'contact_display': 'partner'}" />
+       
+       <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="stock.view_picking_out_tree"/>
+            <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
+        </record>
+        
+        <record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="stock.view_picking_out_form"/>
+            <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
+        </record>
+        
         <!-- Adding Sale Order Reference to outgoing picking -->
         
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">

From 28f89ae44c6f28c5b66a47342af9f98e75f48ead Mon Sep 17 00:00:00 2001
From: niv <niv@niv-laptop>
Date: Tue, 12 Oct 2010 14:56:34 +0200
Subject: [PATCH 616/632] [FIX] Fixed inconsistency in search view of outgoing
 products.

bzr revid: niv@niv-laptop-20101012125634-09d39edhx88z901q
---
 addons/stock/stock_view.xml | 44 +++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 92d99c4bcc9..af4942f8a50 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1589,8 +1589,8 @@
             </field>
         </record>
 
-        <record id="view_move_search_reception_picking" model="ir.ui.view">
-            <field name="name">stock.move.search2</field>
+        <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
+            <field name="name">stock.move.incoming.search2</field>
             <field name="model">stock.move</field>
             <field name="type">search</field>
             <field eval="6" name="priority"/>
@@ -1625,6 +1625,42 @@
             </field>
         </record>
 
+        <record id="view_move_search_reception_outcoming_picking" model="ir.ui.view">
+            <field name="name">stock.move.outgoing.search2</field>
+            <field name="model">stock.move</field>
+            <field name="type">search</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+                <search string="Stock Moves">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-check" name="received" string="Done" domain="[('state','=','done')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="origin"/>
+                        <field name="partner_id" string="Partner"/>
+                        <field name="product_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="Customer" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Extended options..." groups="base.group_extended">
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
@@ -1634,7 +1670,7 @@
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{"search_default_receive":1}</field>
-            <field name="search_view_id" ref="view_move_search_reception_picking"/>
+            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
@@ -1768,7 +1804,7 @@
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{"search_default_receive":1}</field>
-            <field name="search_view_id" ref="view_move_search_reception_picking"/>
+            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_out_picking_tree">

From fc3b34ccc0f0ee1206d726cf1b1f538980870f07 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 12 Oct 2010 18:55:46 +0530
Subject: [PATCH 617/632] [MOD] hr_timesheet_invoice : improvements

bzr revid: vir@tinyerp.com-20101012132546-c7sq4k1b0602o6w0
---
 .../hr_timesheet_invoice_view.xml              |  2 +-
 .../hr_timesheet_invoice_create_view.xml       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index a284523665c..4a70a80f381 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -80,7 +80,7 @@
             <field name="arch" type="xml">
                 <filter name="others" position="after">
                     <separator orientation="vertical"/>
-                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-sale"/>
+                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
                 </filter>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index c50e1b6974a..82276553edd 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -10,13 +10,17 @@
             <form string="Invoice analytic lines">
                 <notebook colspan="4">
                     <page string="Billing Data">
-                        <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-                        <field name="date"/>
-                        <field name="time"/>
-                        <field name="name"/>
-                        <field name="price"/>
-                        <separator string="Force to use a specific product" colspan="4"/>
-                        <field name="product"/>
+	                   <group col="4" colspan="4">
+	                       <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+		                        <field name="date"/>
+		                        <field name="time"/>
+		                        <field name="name"/>
+		                        <field name="price"/>
+	                       </group>
+	                    <group col="2" colspan="4" groups="base.group_extended">
+	                        <separator string="Force to use a specific product" colspan="4" />
+	                        <field name="product"/>
+	                    </group>
                     </page>
                     <page string="Filter on Accounts" groups="base.group_extended">
                         <separator string="Choose accounts you want to invoice" colspan="4"/>

From e5bf4fa551b60e82af644e78ea296394b3f31208 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 16:08:05 +0200
Subject: [PATCH 618/632] [IMP] mrp_repair: usability improvements

bzr revid: qdp-launchpad@tinyerp.com-20101012140805-uhb008v7c0pe2t97
---
 addons/mrp_repair/mrp_repair_view.xml | 60 +++++++++++++--------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 04c9587b6c5..15878ec1b37 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -2,24 +2,24 @@
 <openerp>
     <data>
 
-	<record id="view_repair_order_tree" model="ir.ui.view">
-            <field name="name">mrp.repair.tree</field>
-            <field name="model">mrp.repair</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
-                     <field name="name" select="1" />
-                     <field name="product_id" select="1" />
-                     <field name="move_id"/>
-                     <field name="partner_id"/>
-                     <field name="address_id"/>
-                     <field name="location_id"/>
-                     <field name="location_dest_id"/>
-                     <field name="guarantee_limit"/>
-                     <field name="state"/>
-                </tree>
-            </field>
-        </record>
+    <record id="view_repair_order_tree" model="ir.ui.view">
+        <field name="name">mrp.repair.tree</field>
+        <field name="model">mrp.repair</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
+                <field name="name" select="1" />
+                <field name="product_id" select="1" />
+                <field name="move_id"/>
+                <field name="partner_id"/>
+                <field name="address_id"/>
+                <field name="location_id"/>
+                <field name="location_dest_id"/>
+                <field name="guarantee_limit"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
     <record id="view_repair_order_form" model="ir.ui.view">
         <field name="name">mrp.repair.form</field>
@@ -177,30 +177,30 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
-              	<group col='4' colspan='4'>
-              	       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>   
+                  <group col='4' colspan='4'>
+                       <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>   
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-dolar" string="invoiced" domain="[('invoiced','=',True)]"/>
                        <separator orientation="vertical"/>
-	              		<field name="name"/>
-	                    <field name="product_id"/>
-	                    <field name="partner_id"/>
-	                    <field name="state" />
-              	</group>
-              	<newline/>
-                  <group expand="0" string="Group By..." colspan="10" col="8" groups="base.group_extended">
-                      <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                       <field name="name"/>
+                       <field name="product_id"/>
+                       <field name="partner_id"/>
+                       <field name="state" />
+                  </group>
+                  <newline/>
+                  <group expand="0" string="Group By..." colspan="10" col="8">
+                      <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <separator orientation="vertical"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                       <separator orientation="vertical"/>
-                      <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}"/>
+                      <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'guarantee_limit'}" help="Guarantee limit"/>
                   </group>
              </search>
           </field>
-	</record>
+    </record>
 
         
 

From bbeb2f743e6ed4a7daab71942152261ad9718d9f Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 16:49:32 +0200
Subject: [PATCH 619/632] [IMP] account, analytic entries analysis: usability
 improvements

bzr revid: qdp-launchpad@tinyerp.com-20101012144932-0wnanfcqovwmwg0x
---
 .../account/report/account_analytic_entries_report_view.xml  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 6f1094599b5..578e55b2737 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -58,8 +58,7 @@
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                     <filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
@@ -67,6 +66,8 @@
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"//>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>

From b5509fa4cda54529d13b3d016ef383322ecf43e6 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 17:25:40 +0200
Subject: [PATCH 620/632] [FIX] account:
 account_analytic_entries_report_view.xml view

bzr revid: qdp-launchpad@tinyerp.com-20101012152540-w55jexg8t5mxg1tg
---
 addons/account/report/account_analytic_entries_report_view.xml | 2 +-
 addons/stock/report/report_stock_move_view.xml                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 578e55b2737..6e1ba112606 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -66,7 +66,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"//>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index e1db3ebfa49..1d9dc4a5ce4 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -74,7 +74,6 @@
                 <filter icon="terp-go-month"
                  string="Month-1"
                  name="month-1"
-                 separator="1"
                  domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>
                 <filter icon="terp-go-month" string="Month"

From 7878416d56ee755149a0691e7b5324132cfb984b Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 18:08:48 +0200
Subject: [PATCH 621/632] [IMP] stock: usability improvements in product form
 view

bzr revid: qdp-launchpad@tinyerp.com-20101012160848-g9spxni88jhs0m59
---
 addons/stock/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 561bb9f2206..60fab009d0e 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -61,8 +61,8 @@
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
                     <group col="4" colspan="2">
-                        <field name="standard_price" readonly="True"/>
-                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
+                        <field name="standard_price" readonly="1"/>
+                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute" attrs="{'readonly':[('cost_method','=','average')]}"/>
                     </group>
                 </field>
             </field>

From 4ac173c566dc9efd042536432b3bd422b15ab44c Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 12 Oct 2010 18:19:59 +0200
Subject: [PATCH 622/632] [IMP] mrp: usabilty improvement

bzr revid: qdp-launchpad@tinyerp.com-20101012161959-xe9bypowozh9snus
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7addfbc3194..dcc24fc8e4f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -604,7 +604,7 @@
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
                                        widget="one2many_list" mode="tree,form" height="275">
-                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Consumed Products" editable="bottom">
+                                   <tree colors="red:scrapped==True;blue:state in('draft');black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel') " string="Consumed Products" editable="bottom">
                                        <field name="product_id" readonly="1"/>
                                        <field name="product_qty" readonly="1" string="Qty"/>
                                        <field name="product_uom" readonly="1" string="UOM" widget="selection"/>

From e61f615c7b892b10c291f8e43cb27f000cc3d6db Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 19:27:25 +0200
Subject: [PATCH 623/632] [FIX] improve new employee for timesheet

bzr revid: fp@tinyerp.com-20101012172725-5zo9c43yezol5woj
---
 addons/hr_timesheet/hr_timesheet.py       | 30 +++++++++++------------
 addons/hr_timesheet/hr_timesheet_data.xml | 12 +++++++++
 addons/hr_timesheet/hr_timesheet_demo.xml | 14 -----------
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index b1175634981..84e7db409ab 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -35,25 +35,23 @@ class hr_employee(osv.osv):
     }
     
     def _getAnalyticJournal(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
-        if id:
-            journal = self.browse(cr, uid, id[0], context=context)
-            if journal.journal_id:
-                return journal.journal_id.id
+        md = self.pool.get('ir.model.data')
+        try:
+            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+            return result[1]
+        except ValueError, e:
+            pass
         return False
-    
+
     def _getEmployeeProduct(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        id = self.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
-        if id:
-            prod = self.browse(cr, uid, id[0], context=context)
-            if prod.product_id:
-                return prod.product_id.id
+        md = self.pool.get('ir.model.data')
+        try:
+            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'product_consultant')
+            return result[1]
+        except ValueError, e:
+            pass
         return False
-        
+
     _defaults = {
         'journal_id' : _getAnalyticJournal,
         'product_id' : _getEmployeeProduct    
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 08a769d7ee6..e7cb3d5e0d4 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -6,5 +6,17 @@
             <field name="name">Timesheet Journal</field>
             <field name="type">general</field>
         </record>
+
+        <record id="product_consultant" model="product.product">
+            <field name="list_price">75.0</field>
+            <field name="standard_price">30.0</field>
+            <field name="uom_id" ref="product.uom_hour"/>
+            <field name="uom_po_id" ref="product.uom_hour"/>
+            <field name="name">Service on Timesheet</field>
+            <field name="categ_id" ref="product.cat0"/>
+            <field name="type">service</field>
+            <field eval="False" name="purchase_ok"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index f344b60c83e..e7ba5c91342 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -2,20 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="product_consultant" model="product.product">
-            <field name="default_code">DEV</field>
-            <field name="list_price">75.0</field>
-            <field name="standard_price">30.0</field>
-            <field name="uom_id" ref="product.uom_hour"/>
-            <field name="uom_po_id" ref="product.uom_hour"/>
-            <field name="name">Consultancy - Senior Developer</field>
-            <field name="categ_id" ref="product.product_category_10"/>
-            <field name="type">service</field>
-            <field name="supply_method">produce</field>
-            <field name="procure_method">make_to_order</field>
-            <field eval="False" name="purchase_ok"/>
-        </record>
-
         <!-- complete our example employee -->
         <record id="hr.employee1" model="hr.employee">
             <field name="product_id" ref="product_consultant"/>

From a2bd94fb4162e6bbc92af229016c56d0f28f08a2 Mon Sep 17 00:00:00 2001
From: "Jan Verlaan (Veritos)" <>
Date: Wed, 13 Oct 2010 01:56:56 +0530
Subject: [PATCH 624/632] [FIX] Stock : Cancelled move lines should not be
 allowed for Invoice creation

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

bzr revid: jvo@tinyerp.com-20101012202656-o67bt1v2x0xy43uh
---
 addons/stock/stock.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0b1bbe3695f..5717143c1a6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -980,6 +980,8 @@ class stock_picking(osv.osv):
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
             for move_line in picking.move_lines:
+                if move_line.state == 'cancel':
+                    continue
                 origin = move_line.picking_id.name or ''
                 if move_line.picking_id.origin:
                     origin += ':' + move_line.picking_id.origin

From b3a6611ee0fb0dbc3fb8f86e9c9e72dc8898758c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 12 Oct 2010 23:59:40 +0200
Subject: [PATCH 625/632] [IMP] better useability

bzr revid: fp@tinyerp.com-20101012215940-yvnh0sog8voxiz85
---
 addons/account/account_installer.xml          |   2 +-
 addons/analytic/analytic.py                   |   2 +-
 addons/hr/board_hr_view.xml                   |   2 +-
 addons/hr/hr.py                               |   2 +-
 addons/hr/hr_view.xml                         |   8 +-
 addons/hr/installer.py                        |   4 -
 addons/hr_attendance/hr_attendance_view.xml   |  16 ++-
 .../board_hr_evaluation_view.xml              |  15 +--
 addons/hr_expense/board_hr_expense_view.xml   |   8 +-
 addons/hr_expense/hr_expense_view.xml         |   2 +-
 addons/hr_holidays/__openerp__.py             |   1 +
 addons/hr_holidays/board_hr_holidays_view.xml |  40 +++---
 addons/hr_holidays/hr_holidays.py             |   6 +-
 addons/hr_holidays/hr_holidays_data.xml       |  26 ++++
 addons/hr_holidays/hr_holidays_demo.xml       |  14 --
 addons/hr_holidays/hr_holidays_view.xml       |  44 +++---
 .../hr_timesheet_invoice.py                   |   3 +-
 .../wizard/hr_timesheet_invoice_create.py     |  30 ++---
 .../hr_timesheet_invoice_create_view.xml      |  26 ++--
 addons/hr_timesheet_sheet/__openerp__.py      |   1 -
 .../board_hr_timesheet_view.xml               |  47 +------
 addons/hr_timesheet_sheet/report/__init__.py  |   2 -
 .../report/timesheet_report.py                | 123 -----------------
 .../report/timesheet_report_view.xml          | 126 ------------------
 addons/project/board_project_view.xml         |  12 +-
 addons/project/project_view.xml               |  18 +--
 .../project_timesheet_view.xml                |   6 +-
 27 files changed, 144 insertions(+), 442 deletions(-)
 create mode 100644 addons/hr_holidays/hr_holidays_data.xml
 delete mode 100644 addons/hr_timesheet_sheet/report/timesheet_report.py
 delete mode 100644 addons/hr_timesheet_sheet/report/timesheet_report_view.xml

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 2b736a514c3..495b4f4e5ba 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -45,7 +45,7 @@
                                         <field name="account_type"/>
                                         <field name="currency_id" widget="selection" groups="base.group_extended"/>
                                     </form>
-                                    <tree editable="bottom" string="">
+                                    <tree editable="bottom" string="Your bank and cash accounts">
                                         <field name="acc_name"/>
                                         <field name="account_type"/>
                                         <field name="currency_id" widget="selection" groups="base.group_extended"/>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5f68cf98c1a..bfaa59adf2d 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -187,7 +187,7 @@ class account_analytic_account(osv.osv):
         'credit': fields.function(_credit_calc, method=True, type='float', string='Credit'),
         'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'),
         'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
-        'partner_id': fields.many2one('res.partner', 'Associated Partner'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
         'contact_id': fields.many2one('res.partner.address', 'Contact'),
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 58204352ac4..c740114789a 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -7,7 +7,7 @@
             name="Human Resources"
             parent="base.dashboard"/>
 
-	<!-- This board view will be complete by other hr_* modules-->
+    <!-- This board view will be complete by other hr_* modules-->
         <record id="board_hr_form" model="ir.ui.view">
             <field name="name">board.hr.form</field>
             <field name="model">board.board</field>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 655b9d9bfd1..c05836c393a 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -97,7 +97,7 @@ class hr_job(osv.osv):
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
+        'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
     }
     _defaults = {
         'expected_employees': 1,
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e171f2dfba7..2b1cd596024 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -340,10 +340,10 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-                      <field name="state"/>
-                      <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-                <button name="job_open" string="Open" states="old,recruit" type="object" icon="terp-camera_test"/>
-                            <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+                        <field name="state"/>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
+                        <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
+                        <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 1bd615b8699..cdeb2ca77a3 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -48,10 +48,6 @@ class hr_installer(osv.osv_memory):
         'hr_payroll_account': fields.boolean('Payroll Accounting',
             help="Generic Payroll system Integrated with Accountings."),
         }
-    _defaults = {
-        'hr_holidays': True,
-        'hr_expense': True,
-    }
 hr_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 44d09bec6cd..7070db1d5b2 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -52,11 +52,11 @@
                 <search string="Hr Attendance Search">
                     <filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today" domain="[('name::date','=',current_date)]" />
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name::date','=',current_date)]" />
                     <separator orientation="vertical"/>
-                    <field name="employee_id"   />
-                    <field name="name"    />
-                    <field name="action"   />
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="action"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
@@ -72,7 +72,7 @@
             <field name="res_model">hr.attendance</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{"search_default_employee":1}</field>
+            <field name="context">{"search_default_today":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
             <field name="help">Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features.</field>
         </record>
@@ -81,7 +81,7 @@
 
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="4"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="3"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -116,7 +116,9 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances" />
+        <menuitem 
+            sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendances"
+            groups="base.group_extended"/>
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 5a67fe1945d..70d6245b1ee 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -14,19 +14,14 @@
         <record id="board_hr_evaluation_form" model="ir.ui.view">
             <field name="name">board.hr.evaluation.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" height="220" name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"  width="510"/>
-			</xpath>
+            <xpath expr="/form/hpaned/child1" position="inside"> 
+                <action colspan="4" height="220" name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"  width="510"/>
+            </xpath>
             </field>
         </record>
-        <menuitem
-            action="hr.open_board_hr"
-            icon="terp-graph"
-            id="base.menu_hr_project"
-            parent="base.menu_hr_dasboard"
-            sequence="4"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 69dbad767d9..e79f581dce0 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -20,12 +20,12 @@
         <record id="board_hr_expense_form" model="ir.ui.view">
             <field name="name">board.hr.expense.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
-				 <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
-			</xpath>
+                <xpath expr="/form/hpaned/child1" position="inside"> 
+                     <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 5f07333787e..5d22113272c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -168,7 +168,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_user_id":uid,"search_default_department_id": department_id,"search_default_this":1}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
             <field name="help">The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.</field>
         </record>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 435465e3ddd..f06b41e69da 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -56,6 +56,7 @@
         'security/ir.model.access.csv',
         'hr_holidays_workflow.xml',
         'hr_holidays_view.xml',
+        'hr_holidays_data.xml',
         'hr_holidays_wizard.xml',
         'hr_holidays_report.xml',
         'report/hr_holidays_report_view.xml',
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 86786ad1baf..00412073532 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -22,36 +22,36 @@
         <record id="board_hr_holidays_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child1" position="inside"> 
-					<action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
-				</xpath>
+                <xpath expr="/form/hpaned/child1" position="inside"> 
+                    <action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
+                </xpath>
             </field>
         </record>
         
-        	<!-- Need to merge in above view -->
+            <!-- Need to merge in above view -->
 
-		<record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
-	        <field name="name">Leaves by Month</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">available.holidays.report</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="domain">[('user_id','=',uid)]</field>
+        <record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
+            <field name="name">Leaves by Month</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">available.holidays.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
-	        <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
-		</record>
-		<record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
+            <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
+        </record>
+        <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
             <field name="model">board.board</field>
- 			<field name="type">form</field>            
-			<field name="inherit_id" ref="hr.board_hr_form"/>           
+            <field name="type">form</field>            
+            <field name="inherit_id" ref="hr.board_hr_form"/>           
             <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child2" position="inside">            
-				 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves by Month" />
-				</xpath>  
+                <xpath expr="/form/hpaned/child2" position="inside">            
+                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves by Month" />
+                </xpath>  
             </field>
         </record>
     </data>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 356d697f2c1..eca3c02f301 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -110,9 +110,9 @@ class hr_holidays_status(osv.osv):
 
     # To do: we can add remaining_leaves_category field to display remaining leaves for particular type
     _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True),
+        'name': fields.char('Leave Type', size=64, required=True, translate=True),
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
-        'color_name': fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
+        'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
         'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
@@ -162,7 +162,7 @@ class hr_holidays(osv.osv):
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
         'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
-        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category'),
+        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
     }
 
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
new file mode 100644
index 00000000000..54f53f47a32
--- /dev/null
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <!-- Casual leave -->
+    <record model="hr.holidays.status" id="holiday_status_cl">
+      <field name="name">Casual Leave</field>
+      <field name="double_validation">True</field>
+      <field name="color_name">black</field>
+    </record>
+
+    <!-- Legal Holidays -->
+    <record model="hr.holidays.status" id="holiday_status_sl">
+      <field name="name">Legal Holidays</field>
+      <field name="color_name">blue</field>
+    </record>
+
+    <!-- Sick leave -->
+    <record model="hr.holidays.status" id="holiday_status_sl">
+      <field name="name">Sick Leave</field>
+      <field name="limit">True</field>
+      <field name="color_name">red</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index e59bd5a0353..e12d7de16b5 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -2,13 +2,6 @@
 <openerp>
   <data noupdate="1">
 
-    <!-- Casual leave -->
-    <record model="hr.holidays.status" id="holiday_status_cl">
-      <field name="name">Casual Leave</field>
-      <field name="double_validation">True</field>
-      <field name="color_name">black</field>
-    </record>
-
     <record model="hr.holidays" id="hr_holidays_employee1_allocation_cl">
         <field name="name">Casual Leave for Fabien Pinckaers</field>
         <field name="holiday_status_id" ref="holiday_status_cl"/>
@@ -27,13 +20,6 @@
       <field name="employee_id" ref="hr.employee1"/>
     </record>
 
-    <!-- Sick leave -->
-    <record model="hr.holidays.status" id="holiday_status_sl">
-      <field name="name">Sick Leave</field>
-      <field name="limit">True</field>
-      <field name="color_name">red</field>
-    </record>
-
     <record model="hr.holidays" id="hr_holidays_employee1_sl">
       <field name="name">Doctor Appointment</field>
       <field name="holiday_status_id" ref="holiday_status_sl"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b1225f04609..6a644d4ec18 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -15,10 +15,15 @@
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
-                       <filter string="This Month" icon="terp-go-month" name="This Month"
+                        <filter string="This Month" icon="terp-go-month" name="This Month"
                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id"/>
+                        <field name="employee_id">
+                            <filter icon="terp-personal"
+                                name="my_leaves"
+                                domain="[('employee_id.user_id','=', uid)]"
+                                help="My Leaves" />
+                        </field>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]" />
@@ -32,14 +37,14 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
-                        <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>                        
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>                        
-                         <separator orientation="vertical"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
+                        <separator orientation="vertical"/>
+                        <filter name="group_type" string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'holiday_status_id'}"
                             default="context.get('report', False)"/>
-                        <separator orientation="vertical"/>                            
-                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>                   
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -89,7 +94,7 @@
                             <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
                             <field name="state" colspan="2"/>
-                            <group colspan="2">
+                            <group colspan="2" col="6">
                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                                 <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
@@ -112,7 +117,7 @@
             <form string="Allocation Request">
                 <group col="8" colspan="4">
                     <field name="name" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_extended"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
@@ -269,7 +274,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
-            <field name="context">{"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_department_id": department_id, "search_default_my_leaves": 1}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
@@ -303,7 +308,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_user_id':uid,'type':'add',"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_my_leaves": 1,'type':'add',"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -331,7 +336,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'allocation_type':'company', 'report':True,"search_default_department_id": department_id}</field>
+            <field name="context">{'search_default_group_employee': 1, 'search_default_group_type': 1}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
@@ -349,12 +354,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type">
-                    <field colspan="4" name="name" />
-                    <field name="limit"/>
-                    <field name="active"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="color_name"/>
-                    <field name="double_validation" />
+                    <group colspan="4" col="6">
+                        <field name="name" />
+                        <field name="color_name"/>
+                        <field name="categ_id" widget="selection" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="limit"/>
+                        <field name="double_validation"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 7f79051edce..f605fd760be 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -63,7 +63,8 @@ class account_analytic_account(osv.osv):
 
     _inherit = "account.analytic.account"
     _columns = {
-        'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
+        'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist', 
+            help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
         'amount_max': fields.float('Max. Invoice Price'),
         'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
             help="Total invoiced"),
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 1bb7765b372..475315068ae 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -35,31 +35,14 @@ class hr_timesheet_invoice_create(osv.osv_memory):
     _name = 'hr.timesheet.invoice.create'
     _description = 'Create invoice from timesheet'
     _columns = {
-        'accounts': fields.many2many('account.analytic.account', 'invoice_id', 'account_id', 'Analytic Accounts', required=True),
         'date': fields.boolean('Date', help='The real date of each work will be displayed on the invoice'),
         'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
         'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'),
         'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
         'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
-                }
-
-    def _get_accounts(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if not len(context['active_ids']):
-            return {}
-        #Checking whether the analytic line is invoiced or not
-        analytic_line_obj = self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context)
-        for obj_acc in analytic_line_obj:
-            if obj_acc.invoice_id and obj_acc.invoice_id.state !='cancel':
-                raise osv.except_osv(_('Warning'),_('The analytic entry "%s" is already invoiced!')%(obj_acc.name,))
-
-        cr.execute("SELECT distinct(account_id) from account_analytic_line where id IN %s",(tuple(context['active_ids']),))
-        account_ids = cr.fetchall()
-        return [x[0] for x in account_ids]
+    }
 
     _defaults = {
-         'accounts': _get_accounts,
          'date': lambda *args: 1,
          'name': lambda *args: 1
     }
@@ -82,12 +65,17 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         data = self.read(cr, uid, ids, [], context=context)[0]
-        account_ids = data['accounts']
+
+        account_ids = {}
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context):
+            account_ids[line.account_id.id] = True
+
+        account_ids = account_ids.keys() #data['accounts']
         for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
             partner = account.partner_id
             if (not partner) or not (account.pricelist_id):
                 raise osv.except_osv(_('Analytic Account incomplete'),
-                        _('Please fill in the Associate Partner and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
+                        _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
 
             if not partner.address:
                 raise osv.except_osv(_('Partner incomplete'),
@@ -190,7 +178,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
                 invoice_line_obj.create(cr, uid, curr_line, context=context)
                 cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id, tuple(context['active_ids'])))
 
-        invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
+            invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
 
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 82276553edd..c02215cf742 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -10,21 +10,17 @@
             <form string="Invoice analytic lines">
                 <notebook colspan="4">
                     <page string="Billing Data">
-	                   <group col="4" colspan="4">
-	                       <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
-		                        <field name="date"/>
-		                        <field name="time"/>
-		                        <field name="name"/>
-		                        <field name="price"/>
-	                       </group>
-	                    <group col="2" colspan="4" groups="base.group_extended">
-	                        <separator string="Force to use a specific product" colspan="4" />
-	                        <field name="product"/>
-	                    </group>
-                    </page>
-                    <page string="Filter on Accounts" groups="base.group_extended">
-                        <separator string="Choose accounts you want to invoice" colspan="4"/>
-                        <field name="accounts" colspan="4" nolabel="1"/>
+                       <group col="4" colspan="4">
+                           <separator string="Do you want to show details of work in invoice ?" colspan="4"/>
+                                <field name="date"/>
+                                <field name="time"/>
+                                <field name="name"/>
+                                <field name="price" groups="base.group_extended"/>
+                           </group>
+                        <group col="2" colspan="4" groups="base.group_extended">
+                            <separator string="Force to use a specific product" colspan="4" />
+                            <field name="product"/>
+                        </group>
                     </page>
                 </notebook>
                 <separator colspan="4"/>
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 1b554a6b242..7b114d46387 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -53,7 +53,6 @@ The validation can be configured in the company:
         'hr_timesheet_sheet_view.xml',
         'hr_timesheet_workflow.xml',
         'process/hr_timesheet_sheet_process.xml',
-        'report/timesheet_report_view.xml',
         'board_hr_timesheet_view.xml',
         'report/hr_timesheet_report_view.xml',
         'wizard/hr_timesheet_current_view.xml',
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index f299cb94298..a50042c3dfb 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+    <menuitem
+        id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" 
+        sequence="0" groups="base.group_hr_manager"/>
     <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
@@ -9,16 +11,6 @@
             parent="base.menu_hr_dasboard"
             sequence="4"/>
 
-    <record id="action_timesheet_report_all" model="ir.actions.act_window">
-            <field name="name">Timesheets by Month</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('user_id','=',uid), ('month', '=' , time.strftime('%m')), ('year', '=', time.strftime('%Y'))]</field>
-            <field name="view_id" ref="hr_timesheet_sheet.view_timesheet_report_graph"/>
-        </record>
-
         <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
             <field name="name">Timesheets</field>
             <field name="type">ir.actions.act_window</field>
@@ -28,39 +20,6 @@
             <field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
         </record>
 
-        <record id="view_employee_attendance_graph" model="ir.ui.view">
-            <field name="name">Employee Attendance Graph</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Employee Attendances" type="bar">
-                    <field name="user_id" />
-                    <field name="total_attendance" operator="+"/>
-                    <field name="total_timesheet" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="action_employee_attendance_graph" model="ir.actions.act_window">
-            <field name="name">Employee Attendance Graph</field>
-            <field name="res_model">timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_employee_attendance_graph"/>
-        </record>
-
-        <record id="board_hr_timesheet_form" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.form</field>
-            <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child2" position="inside">
-                    <action colspan="4" height="220" name="%(action_employee_attendance_graph)d" string="Employee Attendances" />
-                </xpath>
-            </field>
-        </record>
-
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py
index b06b0608356..8dac73f07ec 100644
--- a/addons/hr_timesheet_sheet/report/__init__.py
+++ b/addons/hr_timesheet_sheet/report/__init__.py
@@ -19,7 +19,5 @@
 #
 ##############################################################################
 
-import timesheet_report
 import hr_timesheet_report
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
deleted file mode 100644
index 6688c747983..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import tools
-from osv import fields,osv
-
-class timesheet_report(osv.osv):
-    _name = "timesheet.report"
-    _description = "Timesheet"
-    _auto = False
-    _columns = {
-        'year': fields.char('Year',size=64,required=False, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'name': fields.char('Description', size=64,readonly=True),
-        'product_id' : fields.many2one('product.product', 'Product'),
-        'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
-        'employee_id': fields.many2one('hr.employee', 'Employee',readonly=True),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
-        'nbr': fields.integer('#Nbr',readonly=True),
-        'total_diff': fields.float('#Total Diff',readonly=True),
-        'total_timesheet': fields.float('#Total Timesheet',readonly=True),
-        'total_attendance': fields.float('#Total Attendance',readonly=True),
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),
-        'department_id':fields.many2one('hr.department','Department',readonly=True),
-        'date_from': fields.date('Date from',readonly=True,),
-        'date_to': fields.date('Date to',readonly=True),
-        'date_current': fields.date('Current date', required=True),
-        'state' : fields.selection([
-            ('new', 'New'),
-            ('draft','Draft'),
-            ('confirm','Confirmed'),
-            ('done','Done')], 'State', readonly=True),
-        'quantity': fields.float('#Quantity',readonly=True),
-        'cost': fields.float('#Cost',readonly=True),
-        }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'timesheet_report')
-        cr.execute("""
-            create or replace view timesheet_report as (
-                    select 
-			min(aal.id) as id,
-                        htss.date_current,
-                        htss.name,
-                        htss.date_from,
-                        htss.date_to,
-                        to_char(htss.date_current,'YYYY') as year,
-                        to_char(htss.date_current,'MM') as month,
-                        to_char(htss.date_current, 'YYYY-MM-DD') as day,
-                        count(*) as nbr,
-                        aal.unit_amount as quantity,
-                        aal.amount as cost,
-                        aal.account_id,
-                        aal.product_id,
-                        (SELECT   sum(day.total_difference)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
-                        (SELECT sum(day.total_timesheet)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
-                        (SELECT sum(day.total_attendance)
-                            FROM hr_timesheet_sheet_sheet AS sheet 
-                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
-                        aal.to_invoice,
-                        aal.general_account_id,
-                        htss.employee_id as employee_id,
-                        htss.company_id,
-                        htss.department_id,
-                        htss.state
-		from hr_timesheet_sheet_sheet as htss
-		left join hr_analytic_timesheet as hat ON (hat.create_uid=htss.create_uid)
-		left join account_analytic_line as aal ON (hat.line_id=aal.id)
-		group by
-                        to_char(htss.date_current,'YYYY'),
-                        to_char(htss.date_current,'MM'),
-                        to_char(htss.date_current, 'YYYY-MM-DD'),
-                        aal.account_id,
-                        htss.date_from,
-                        htss.date_to,
-                        aal.unit_amount,
-                        aal.amount,
-                        htss.date_current,
-                        aal.to_invoice,
-                        aal.product_id,
-                        aal.general_account_id,
-                        htss.name,
-                        htss.company_id,
-                        htss.state,
-                        htss.id,
-                        htss.department_id,
-                        htss.employee_id
-  
-            )
-        """)
-timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
deleted file mode 100644
index 0bdc4527da5..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_timesheet_report_graph" model="ir.ui.view">
-            <field name="name">timesheet.report.graph</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Timesheet" type="bar">
-                    <field name="employee_id" />
-                    <field name="quantity" operator = "+"/>
-                    <field name="state" group = "True"/>
-                </graph>
-            </field>
-        </record>
-        <record id="view_timesheet_report_tree" model="ir.ui.view">
-            <field name="name">timesheet.report.tree</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
-                    <field name="date_current" invisible="1"/>
-                    <field name="name" invisible="1"/>
-                    <field name="employee_id" invisible="1"/>
-                    <field name="date_from" invisible="1"/>
-                    <field name="date_to" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="department_id" invisible="1"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="to_invoice" invisible="1"/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="general_account_id" invisible="1"/>
-                    <field name="year" invisible="1"/>
-                    <field name="day" invisible="1"/>
-                    <field name="month" invisible="1"/>
-					<field name="total_attendance" sum="#Total Attendance"/>
-                    <field name="total_timesheet" sum="#Total Timesheet"/>
-                    <field name="total_diff" sum="#Total Diff"/>
-                    <field name="quantity" sum="#Quantity"/>
-                    <field name="cost" sum="#Cost"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_timesheet_report_search" model="ir.ui.view">
-            <field name="name">timesheet.report.search</field>
-            <field name="model">timesheet.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Timesheet">
-                    <group col="10" colspan="12">
-                        <filter icon="terp-go-year" string=" Year "
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current year"/>
-                        <filter icon="terp-go-month" string=" Month "
-                                name="month"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date_current','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-document-new"
-                                string="Draft"
-                                domain="[('state','=','draft')]"/>
-                        <filter icon="terp-camera_test"
-                                string="Confirmed"
-                                domain="[('state','=','confirm')]"/>
-                        <filter icon="terp-dialog-close"
-                                    string="Done"
-                                    domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
-                      <field name="employee_id" />
-                      <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="general_account_id"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="product_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="department_id" widget="selection"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <newline/>
-                        <field name="date_to"/>
-                        <field name="date_from"/>
-                    </group>
-                    <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Employee" name="Employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
-                        <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_timesheet_report_stat_all" model="ir.actions.act_window">
-            <field name="name">Timesheet Sheet Analysis</field>
-            <field name="res_model">timesheet.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_Employee_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="search_view_id" ref="view_timesheet_report_search"/>
-        </record>
-        <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
-                parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
-    </data>
-</openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 275a969cbe9..71b5d87aa1f 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -88,16 +88,10 @@
                         <child1>
                             <action colspan="4"  height="100" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
                             <action colspan="4"  height="100" name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
-                   		</child1>
+                        </child1>
                         <child2>
-                        <vpaned>
-                        	<child1>
-                        		<action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
-                        	</child1>
-                        	<child2>
-                        		<action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
-                        	</child2>
-                        </vpaned>
+                            <action colspan="4"  height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
+                            <action colspan="4"  height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 91564583729..6fd11bd245f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -27,7 +27,7 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" groups="base.group_extended">
                                 <separator colspan="2" string="Scheduling"/>
                                 <field name="priority"/>
                                 <field name="active"/>
@@ -67,16 +67,18 @@
                                 </tree>
                             </field>
                         </page>
-                        <page groups="base.group_extended" string="Accounting">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                        <page string="Billing" groups="account.group_account_invoice">
+                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
                             <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
                             <field name="warn_customer"/>
                             <newline/>
-                            <separator colspan="2" string="Mail Header"/>
-                            <separator colspan="2" string="Mail Footer"/>
-                            <field name="warn_header" nolabel="1" colspan="2"/>
-                            <field name="warn_footer" nolabel="1" colspan="2"/>
-                            <group col="3" colspan="4">
+                            <group colspan="4" col="4" groups="base.group_extended">
+                                <separator colspan="2" string="Mail Header"/>
+                                <separator colspan="2" string="Mail Footer"/>
+                                <field name="warn_header" nolabel="1" colspan="2"/>
+                                <field name="warn_footer" nolabel="1" colspan="2"/>
+                            </group>
+                            <group col="3" colspan="4" groups="base.group_extended">
                                 <separator string="Automatic variables for headers and footer. Use exactly the same notation." colspan="4"/>
                                 <label string="Task: %%(name)s"/>
                                 <label string="User: %%(user_id)s"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2a1b94620a8..61834abbe66 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -11,9 +11,9 @@
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Invoicing Data"/>
                         <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
-                        <field name="to_invoice" widget="selection"/>
-                        <field name="amount_max"/>
-                        <field name="amount_invoiced"/>
+                        <field name="to_invoice" widget="selection" string="Invoice Task Work"/>
+                        <field name="amount_max" groups="base.group_extended"/>
+                        <field name="amount_invoiced" groups="base.group_extended"/>
                     </group>
                 </field>
             </field>

From e2467286958d97b07feefc4fb1267f930271d852 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 13 Oct 2010 00:31:43 +0200
Subject: [PATCH 626/632] imp

bzr revid: fp@tinyerp.com-20101012223143-huzvwfo7jtea7hk3
---
 addons/hr_contract/hr_contract_view.xml               | 2 +-
 addons/hr_holidays/hr_holidays_view.xml               | 2 +-
 addons/hr_holidays/report/hr_holidays_report_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index bfcd9ff8b76..1ad05582d47 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -105,7 +105,7 @@
                     <page string="Miscellaneous">
                         <group colspan="2" col="2">
                         <separator string="Personal Info" colspan="2"/>
-                        <field name="bank_account"/>
+                        <field name="bank_account_id"/>
                         <field name="place_of_birth"/>
                         <field name="children"/>
                         </group>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6a644d4ec18..1f57b25d402 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -336,7 +336,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_group_employee': 1, 'search_default_group_type': 1}</field>
+            <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index b2fa98a7720..e2ffc0fc0e9 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -98,7 +98,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1, 'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
+        <field name="context">{'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 

From d54048c6d795b9928fc24489d1ac19f12cc1354b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 13 Oct 2010 04:59:18 +0000
Subject: [PATCH 627/632] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101013045918-hlirree3j3xy4ga9
---
 addons/account/i18n/de.po                |   2 +-
 addons/account/i18n/hr.po                |  32 +-
 addons/account/i18n/mn.po                |   4 +-
 addons/account/i18n/sr.po                | 736 ++++++++++++-----------
 addons/account_report/i18n/it.po         |   6 +-
 addons/analytic/i18n/de.po               |   2 +-
 addons/analytic_user_function/i18n/mn.po |  12 +-
 addons/base_vat/i18n/fr.po               |  14 +-
 addons/claim_from_delivery/i18n/de.po    |   2 +-
 addons/crm/i18n/nl.po                    |   6 +-
 addons/crm_fundraising/i18n/nl.po        |   6 +-
 addons/crm_helpdesk/i18n/nl.po           |   6 +-
 addons/decimal_precision/i18n/de.po      |   2 +-
 addons/document_webdav/i18n/da.po        |  31 +
 addons/hr_payroll/i18n/de.po             |   2 +-
 addons/idea/i18n/tr.po                   |  14 +-
 addons/point_of_sale/i18n/sr.po          |   8 +-
 addons/procurement/i18n/mn.po            |  86 ++-
 addons/purchase/i18n/de.po               |   2 +-
 addons/report_intrastat/i18n/it.po       |  50 +-
 addons/resource/i18n/de.po               |   2 +-
 addons/resource/i18n/nl.po               |   6 +-
 addons/wiki_faq/i18n/de.po               |   2 +-
 addons/wiki_quality_manual/i18n/de.po    |   2 +-
 addons/wiki_sale_faq/i18n/de.po          |   2 +-
 25 files changed, 579 insertions(+), 458 deletions(-)
 create mode 100644 addons/document_webdav/i18n/da.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 94f0c92c017..dfcd273c439 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index ac5de3c9c51..9d97a299adf 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:55+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 16:53+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -411,7 +411,7 @@ msgstr "Zatvaranje plaćanja"
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -640,12 +640,12 @@ msgstr "Uvjeti plaćanja za partnera"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "Zatvaranje stavke"
+msgstr "Zatvaranje stavke konta"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr "Otvor za zatvaranje banke"
+msgstr "Otvoreno za zatvaranje banke"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -830,6 +830,8 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -1040,7 +1042,7 @@ msgstr "Podređeni"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1063,7 +1065,7 @@ msgstr "Izlazni račun"
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr "Odaberite poreznu godinu"
+msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1079,7 +1081,7 @@ msgstr "Ispiši analitičke dnevnike"
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1129,7 +1131,7 @@ msgstr "Novi analitički konto"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1145,17 +1147,17 @@ msgstr "Razdoblje od:"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "Iznos u drugoj valuti."
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2081,7 +2083,7 @@ msgstr "Proces izlacnog računa"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2144,7 +2146,7 @@ msgstr "Nova pretplata"
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr "Izračun"
+msgstr "Proračun"
 
 #. module: account
 #: view:account.analytic.line:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 82262de0ce2..a2e5ce8ef6b 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 07:18+0000\n"
+"PO-Revision-Date: 2010-10-12 07:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index a2514f02d24..19a1204ca17 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 17:21+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -41,12 +41,12 @@ msgstr "Enkodiranje unosa"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Poruka na opomenama za neplaćene račune."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Potvrdi izvode iz pripreme"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -56,12 +56,12 @@ msgstr "Sredstvo"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Valuta upotrebljena pri unosu izvoda"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -74,6 +74,8 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"Ovaj ce se nalog koristiti da vrednuje ulazni magacin za vazecu kategoriju "
+"proizvoda"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -83,24 +85,24 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Rezultat zatvaranja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "Nesnimljeni unos"
+msgstr "Otvorene stavke"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Osnovna Šifra"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr "Statistike računa"
+msgstr "Knjigovodstvene statistike"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
@@ -116,7 +118,7 @@ msgstr "Roditelj"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Nalog za knjiženje"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -129,18 +131,18 @@ msgstr "Ostatak"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Predznak šifre osnovice"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Ponisti stavke"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Greska! Dužina period(a) je loša/netačna. "
+msgstr "Greška! Trajanje razdoblja je pogrešno. "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -150,7 +152,7 @@ msgstr "Greska! Dužina period(a) je loša/netačna. "
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "Unosi"
+msgstr "Stavke"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -160,7 +162,7 @@ msgstr "Centralizacija Dugovanja"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Potvrdi nacrtne fakture"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -170,18 +172,18 @@ msgid ""
 "it's based on the beginning of the month)."
 msgstr ""
 "Dan u mesecu, podesiti na -1 za poslednji dan tekućeg meseca. Ako je "
-"pozitivan, daje dan u sledećem mesecu. Podešen na 0 za ukupan broj dana (u "
+"pozitivan, daje dan u sledećem mesecu. Podesi na 0 za ukupan broj dana (u "
 "suprotnom zasnovan je na početku meseca)."
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Ukupno duguje"
+msgstr "Ukupno potrazuje"
 
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr "Kontni plan"
+msgstr "Kontni planovi"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -194,12 +196,12 @@ msgstr "Premesti izabranu liniju"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Entry label"
-msgstr ""
+msgstr "Oznaka stavke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Stavke modela"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -210,23 +212,23 @@ msgstr "Zbir perioda"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Izracunaj Kod ( if type= code) *programiranje"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Stavke knjiženja"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Bruto bilanca"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr ""
+msgstr "Ponavljajuće stavke"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -246,7 +248,7 @@ msgstr "Iznos"
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr "Partnerski dnevnik"
+msgstr "Salda konti partnera"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -271,6 +273,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Daje pogled korišten kada se zapisuju ili pretrazuju stavke ovog dnevnika. "
+"Pogled govori Open ERP-u koja polja trebaju biti vidljiva, neophodna ili "
+"samo za čitanje i u kojem redosledu. Možete kreirati vlastiti pogled za brži "
+"unos stavki ovog dnevnika."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -281,18 +287,23 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Ako koristite uvjete plaćanja, datum valute plaćanja se izračunava "
+"automatski u trenutku generiranja stavki knjiženja.Ukoliko ostavite praznim "
+"uslove plaćanja i datum valute praznim, to označava direktno plaćanje. "
+"Uslovi plaćanja mogu izračunati više uplata, npr. 50% odmah, 50% za mjesec "
+"dana."
 
 #. module: account
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr "Popravljeno"
+msgstr "Fiksno"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Dospela plaćanja"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -314,7 +325,7 @@ msgstr "Poreklo"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Pomeri Ime"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -324,7 +335,7 @@ msgstr "Referenca"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Proračun pretplate"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -334,19 +345,19 @@ msgstr "Konto br."
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Razlika duguje"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Dugovna transakcija"
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -360,14 +371,14 @@ msgstr "Analitički konto"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Porez na podređene"
 
 #. module: account
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Naziv dnevnika"
 
 #. module: account
 #: view:account.payment.term:0
@@ -377,7 +388,7 @@ msgstr "Opis na računima"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -388,23 +399,23 @@ msgstr "Ukupno stavki"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Originalni konto"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Dozvoli storniranje stavki"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -424,12 +435,12 @@ msgstr "Negativno"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naziv (Konta/Partnera)"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Protuknjiženje"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -439,36 +450,36 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr ""
+msgstr "Neplaćeni povrati dobavljaču"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Poseban proračun"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr ""
+msgstr "Potvrdi izvod sa/bez usklađivanja sa izvodom u pripremi."
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda banke"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Popust(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -477,12 +488,12 @@ msgstr ""
 #: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Referenca"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Primena poreza za"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -494,18 +505,18 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodična obrada"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statistika analitičkih stavki"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "obrasci Perskih stopa/tarifa"
+msgstr "Predlošci PDV obrasca"
 
 #. module: account
 #: view:account.invoice:0
@@ -516,12 +527,12 @@ msgstr "Račun dobavljača"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr ""
+msgstr "Zatvori plaćene"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
 msgid "Target Moves"
-msgstr ""
+msgstr "Ciljna knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -532,28 +543,28 @@ msgstr "Poreski obrasci"
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Plaćeno/Usklađeno"
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Način odlaganja"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Dodaj u osnovicu"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Šifra osnovice povrata"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr ""
+msgstr "Red"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -564,7 +575,7 @@ msgstr ""
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Tačno"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -572,6 +583,8 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Broj dana koje treba dodati prije proracuna dana u mesecu. Ako je "
+"datum=15.01, broj dana=22, dan u mesecu=-1, onda je datum dospeća 28.02."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -597,7 +610,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Kontrole unosa"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -610,59 +623,59 @@ msgstr ""
 #: wizard_view:account.analytic.account.chart,init:0
 #: wizard_view:account.analytic.line,init:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(Zadržite prazno da biste otvorili trenutno stanje)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje konta"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja za partnera"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Zatvaranje stavke konta"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Otvoreno za zatvaranje banke"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Iznos otpisa"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr ""
+msgstr "Ostavi prazno ako je fiskalna godina vlasništvo više firmi."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analitičko računovodstvo"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Među-iznos"
 
 #. module: account
 #: field:account.analytic.account,line_ids:0
@@ -670,32 +683,32 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analitičke stavke"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "mesec"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Povezani partner"
 
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Povrat novca kupcu"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Odaberite period analize"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -703,12 +716,12 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Predznak Poreznog koda"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Ukupan iznos dugovanja kupca"
 
 #. module: account
 #: view:account.move.line:0
@@ -723,39 +736,39 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analitički račun"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Naziv polja"
 
 #. module: account
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Predznak za roditelja"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Dnevnik knjiženja kraja godine"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 msgid "Can be draft or validated"
-msgstr ""
+msgstr "Može biti u pripremi ili potvrđen"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Delimično plaćanje"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -770,23 +783,23 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Razdoblje do"
 
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Konto partnera"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr ""
+msgstr "Generisi stavke pre:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -794,7 +807,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Knjiga troškova"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -802,18 +815,18 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "(Keep empty for all open fiscal years)"
-msgstr ""
+msgstr "(Ostaviti prazno za sve otvorene poslovne godine)"
 
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Stavke knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr ""
+msgstr "Troškovi i prihodi konta po dnevniku"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -821,83 +834,85 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Usklađivanje (zatvaranje) izvoda banke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Predlošci za konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analitička konta"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Stampa Dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "konto.banka.nalozi,carobjak"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Storniraj račun"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Neophodno"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Konto rashoda"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Dnevnik otpisa"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Iznos u valuti"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Konto kategorije troška"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nova poslovna godina"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -909,12 +924,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Poslovna godina za otvaranje"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Odaberite kontni plan"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -927,7 +942,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -935,33 +950,33 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Krajnji datum"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Iznos osnvice"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Odgovorna osoba za ovaj dnevnik"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Osnovni dugovni konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr ""
+msgstr "Stavke po izvodima"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "analitički račun"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -980,22 +995,22 @@ msgstr ""
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Razdoblje"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Celokupni iznos"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Financijsko računovodstvo"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Neto Ukupno"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1015,62 +1030,62 @@ msgstr ""
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "JM"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "Jedan partner po stranici"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Podređeni"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Novi nabavni račun"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Plaćeni iznos"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Račun kupca"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Glavna sekvenca"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Stampaj analitičke dnevnike"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1078,73 +1093,75 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
+"Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
+"najmanjeg do najvećeg"
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Ukupni otpis"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Kod za izračun cena sa uključenim porezima"
 
 #. module: account
 #: view:account.invoice.tax:0
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Šifre poreza"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Konto prihoda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr ""
+msgstr "Novi analitički račun"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Razdoblje od :"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -1155,48 +1172,48 @@ msgstr ""
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Uslovi"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Porezki izvestaj"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Otvori kontne planove"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid "Are you sure you want to close the fiscal year ?"
-msgstr ""
+msgstr "Da li ste sigurni da želite zatvoriti fiskalnu godinu ?"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Bancina primka"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Bankovni račun"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Lista predloška poreza"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Uvoz računa"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr ""
+msgstr "Standardna stavka"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1207,11 +1224,16 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Ovaj izbor ce diktirati kako ce se obracunavati stanje trenutnog kursa za "
+"izlazne transakcije. U vecini zemalja vazeci metod je \" srednji\", ali ce "
+"samo mali broj softwerskih sistema biti u mogucnosti da obradi to. Tako da "
+"ako uvozite iz nekog drugog softwerskog sistema bilo bi pametno da koristite "
+"kurs na datum. Dolazece transakcije uvek koriste vazeci kurs toga dana."
 
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Valuta preduzeca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1221,108 +1243,108 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Nadređeni analitički konto"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Zatvaranje s otpisom nezatvorenog dela"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Iznos poreza/osnovice"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Broj oznaka( brojeva) za upotrebu u šifri konta"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Završni saldo"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Porezi nabavke"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Naziv reda"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Fiksni iznos"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Analitika potraživanja"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: wizard_button:account.move.line.reconcile,init_partial,partial:0
 msgid "Partial Reconcile"
-msgstr ""
+msgstr "Delimično zatvaranje"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Otvorene stavke"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "Mapiranje poreza"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Vrednost"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Konto otpisa"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "Zatvori fiskalnu godinu"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizirana stavka zatvaranja"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Odaberite račune koje želite da platite i unapredite ih"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1331,7 +1353,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Pregled"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1339,24 +1361,24 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Sve"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Analiticki redovi"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "Način izračuna iznosa poreza"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr ""
+msgstr "Potvrđene računovodstvene stavke"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1365,32 +1387,34 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronska datoteka"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Potraživanja kupca"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Redovi poreza"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Sekvence"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Tipovi konta"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1412,40 +1436,40 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Podređena konta"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Prikaži Istoriju"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
 msgid "        Start date"
-msgstr ""
+msgstr "        Početni datum"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
 msgid "Display accounts "
-msgstr ""
+msgstr "Prikaži konta "
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr ""
+msgstr "Red zatvaranja izvoda"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -1453,7 +1477,7 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr ""
+msgstr "Otpis"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1461,143 +1485,145 @@ msgid ""
 "The partner bank account to pay\n"
 "Keep empty to use the default"
 msgstr ""
+"Partnerov bankovni racun da plati\n"
+"Ostavite prazno da koristite zadane vrednosti"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Ukupno obaveze"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
 msgid "Close states"
-msgstr ""
+msgstr "Zatvori stanja"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "carobnjak.kompanija.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "konto.analitika.prosireni.red"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Dnevnik povrata"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Prihod"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Pozitivan"
 
 #. module: account
 #: wizard_view:account.general.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "Stampa glavne knjige"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Predlošci kontnog plana"
 
 #. module: account
 #: field:account.invoice,move_id:0
 msgid "Invoice Movement"
-msgstr ""
+msgstr "Knjiženja računa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Generiraj kontni plan iz predloška"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Zakonski izveštaji"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Šifra nadređenog"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
 msgid "Open for reconciliation"
-msgstr ""
+msgstr "Otvori za usklađivanje"
 
 #. module: account
 #: model:account.journal,name:account.bilan_journal
 msgid "Journal d'ouverture"
-msgstr ""
+msgstr "Dnevnik Otvaranja"
 
 #. module: account
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Br. računa"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "Zadrži prazno da bi koristio na kontu troškova"
+msgstr "Zadrži prazno za korištenje konta troška"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
 msgid "Account to reconcile"
-msgstr ""
+msgstr "Konto za zatvaranje"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Vezani partner"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Konta potraživanja i dugovanja partnera"
 
 #. module: account
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Redovi pretplate"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1605,43 +1631,43 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Ukupna količina"
 
 #. module: account
 #: field:account.invoice,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Datum dospeća"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
 #: wizard_button:account.period.close,init,close:0
 msgid "Close Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "Рок"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Third party"
-msgstr ""
+msgstr "Treća strana"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljene vrste konta (prazno za bez kontrole)"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1649,132 +1675,132 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr ""
+msgstr "Dnevnici"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max. kol.:"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Storno računi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Troškovi & prihodi"
 
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivna konta"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Account Number"
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Skip"
-msgstr ""
+msgstr "Preskoči"
 
 #. module: account
 #: field:account.invoice,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Forsiraj razdoblje"
 
 #. module: account
 #: help:account.account.type,sequence:0
 msgid "Gives the sequence order when displaying a list of account types."
-msgstr ""
+msgstr "Daje redoslijed pri prikazu liste vrsta konta."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Ponovno otvori"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "Jeste sigurni da želite kreirati stavke?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr ""
+msgstr "Uključi u osnovicu"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Razlika potražuje"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Poništi zatvaranje stavki"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Prethodno generisani račun iz kontrole"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr ""
+msgstr "Knjiga troškova za razdoblje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr ""
+msgstr "Nova Stavka"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
 #: wizard_field:account.analytic.line,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr ""
+msgstr "Zatvaranje stavke računa i plaćanja"
 
 #. module: account
 #: wizard_view:account.central.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Stampa Glavnog dnevnika"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
 msgid "Period length (days)"
-msgstr ""
+msgstr "Duzina razdoblja (dana)"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "Procenat"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr ""
+msgstr "Kontni planovi"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1782,46 +1808,46 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Prodaja"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr ""
+msgstr "Sledeće"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal mapping will determine taxes and the accounts used for the "
 "partner."
-msgstr ""
+msgstr "Fiskalno mapiranje ce odrediti poreze i konta koristena za partnera"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Datum ili šifra"
 
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Upravnik računovodstva"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "u :"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
 #: wizard_field:account.move.line.reconcile,init_partial,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Iznos duguje"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "година"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1838,17 +1864,17 @@ msgstr ""
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr ""
+msgstr "Štampaj"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
 msgid "Start date"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "x Dnevnik knjižnih odobrenja troškova"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1859,50 +1885,50 @@ msgstr ""
 #: field:account.move.reconcile,type:0
 #: xsl:account.transfer:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljena konta (prazno bez kontrole)"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Neoporezovani iznos"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Konto poreza"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Redovi analitike"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_pay
 msgid "Pay invoice"
-msgstr ""
+msgstr "Plati račun"
 
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Greška: Neispravan Bvr broj (kontrolna oznaka)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Izlazni računi u pripremi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Redovi pretplatnog naloga"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1910,89 +1936,89 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr ""
+msgstr "Bez filtera"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Broj Dana"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Partnerova refenerenca ovog racuna"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
-msgstr ""
+msgstr "Poređaj po:"
 
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr ""
+msgstr "Da bude verifikovano"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Ukupni iznos koji trebas platiti ovom dobavljacu"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Prenos"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr ""
+msgstr "Kontni planovi"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Naziv koji će se ispisati na izvještajima."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Datum stampe"
 
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
 msgid "          Start date"
-msgstr ""
+msgstr "          Početni datum"
 
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Dnevnik knjiženja analitike"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Povrat Musteriji"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2002,7 +2028,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Naziv dnevnika-razdoblja"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -2028,7 +2054,7 @@ msgstr ""
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
 #: field:wizard.company.setup,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -2036,41 +2062,42 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
+"Jedinstveni broj racuna, koji se automatski kreira kada se racun kreira"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Neodobreni računi"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Trošak"
 
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Sekvenca računa"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Opcije"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr ""
+msgstr "Proces izlacnog računa"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Period početnog stanja"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2082,12 +2109,12 @@ msgstr ""
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "dana"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Prošlost"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2101,103 +2128,103 @@ msgstr ""
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid invoices"
-msgstr ""
+msgstr "Neplaćeni računi"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment Reconcile"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "Nova pretplata"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "Proračun"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Stavka analitike"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Poruka kod prekoračenja roka plaćanja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr ""
+msgstr "Shema poreza"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr ""
+msgstr "Zatvorene stavke"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Kontakt Adresa"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "Kreiraj 3-mesecni period"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(ostaviti prazno ako želite koristiti tekuće razdoblje)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8
 msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Nepotvrđeni ulazni računi"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
 msgid "Force period"
-msgstr ""
+msgstr "Forsiraj period"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalji"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Konsolidacija"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Osnovni nalog (root)"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2206,11 +2233,14 @@ msgid ""
 "stay unpaid. Please, take appropriate measures in order to carry out this "
 "payment in the next 8 days."
 msgstr ""
+"Ako se ne radi o našoj grešci, čini se da su sledeći računi ostali "
+"neplaćeni. Molimo preduzmite potrebne mere da se izvrši plaćanje u roku od "
+"sljedećih 8 dana."
 
 #. module: account
 #: rml:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "PDV :"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2219,38 +2249,38 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Kontni plan"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr ""
+msgstr "x Dnevnik čekova"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Kreiraj stavke pretplate"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Dnevnik početnog stanja"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Kreiraj Fiskalnu Godinu"
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Porezi kod prodaje"
 
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum izrade računa"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2259,27 +2289,29 @@ msgstr ""
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
 msgid "Liability"
-msgstr ""
+msgstr "Obveza"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
+"(Ukoliko ne selektujete Fiskalnu godinu, uzece se u obzir sve otvorene "
+"fiskalne godine)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Porezka osnovica"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2299,46 +2331,46 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Tip reference"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Poništi zatvaranje"
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Vrsta poreza"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr ""
+msgstr "Stavke izvoda"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
 #: field:account.journal,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Predlošci konta"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
@@ -2348,28 +2380,28 @@ msgstr ""
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Br Potvrde"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatsko zatvaranje"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr ""
+msgstr "Uvezi račun(e)"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr ""
+msgstr "i dnevnike"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "Konto poreza"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -2379,7 +2411,7 @@ msgstr "Pomeri liniju"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -2387,11 +2419,13 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Označite ako se porez računa na osnovi podređenih poreza umesto na osnovi "
+"ukupnog iznosa."
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Šifra dnevnika"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2399,16 +2433,18 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Ako nije primenjivo (izračunato Python kodom), porez se neće iskazati na "
+"računu."
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "Stavke modela"
 
 #. module: account
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2417,13 +2453,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr ""
+msgstr "Stavke"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Primjenjeni kod (ako je tip=Python kod)"
 
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 58987e1ff3e..2d3a600a78b 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 20:16+0000\n"
-"Last-Translator: simone.sandri <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 1d151da2e95..fea9b2cd23e 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 29affbf3bf3..478065209f3 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:35+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -41,7 +41,7 @@ msgstr "Аналитик данс"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Хэрэглэгч/Бүтээгдэхүүн"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
@@ -59,9 +59,9 @@ msgstr ""
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Аналитик хэрэглэгчийн үүрэг"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик данс"
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 986ab70c5c5..9a8776d2680 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -7,15 +7,23 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-12 12:08+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid ""
+"Enable the VAT Number for the partner. Check the validity of that VAT Number."
+msgstr ""
+"Active le numéro de TVA sur la fiche partenaire. Vérifie la validité du "
+"numéro de TVA."
+
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 99f04fa4284..258499f1a37 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index d3da4ded812..7fe654c511f 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-11 13:45+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po
index fe0003a7ecc..9175de4b202 100644
--- a/addons/crm_fundraising/i18n/nl.po
+++ b/addons/crm_fundraising/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:29+0000\n"
-"PO-Revision-Date: 2010-10-11 09:58+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index e1d802b6cf6..0db6e9f1a16 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 13:01+0000\n"
-"PO-Revision-Date: 2010-10-11 08:22+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index d2218ef9d4c..12710962429 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
new file mode 100644
index 00000000000..06dd36acc4e
--- /dev/null
+++ b/addons/document_webdav/i18n/da.po
@@ -0,0 +1,31 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-10-12 13:21+0000\n"
+"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"Language-Team: Danish <da@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: 2010-10-13 04:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Dette er et komplet dokumenthåndteringssystem\n"
+"\t* WebDav Interface\n"
+"\t* Brugergodkendelse\n"
+"\t* Dokumentindeksering\n"
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 0780f644296..406f344f044 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index e1bd6fc3db3..b3cadf12a88 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 07:12+0000\n"
-"Last-Translator: Mustafa Yılmaz <apshalasha@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 23:56+0000\n"
+"Last-Translator: cafer can <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -96,7 +96,7 @@ msgstr "Taslak"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr "Fikrin oyu"
+msgstr ""
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@@ -193,7 +193,7 @@ msgstr "Kategoriler"
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr "durum"
+msgstr ""
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -237,7 +237,7 @@ msgstr "Oluşturulma tarihi"
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr "Oy sayısı"
+msgstr "Oy Sayımı"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -354,7 +354,7 @@ msgstr "Çok Kötü"
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Canceled"
-msgstr "İptal edilmiş"
+msgstr "İptal Edildi"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 98c46039a41..2005696db44 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 21:13+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -438,7 +438,7 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Draft Invoice"
-msgstr "Nacrti računa"
+msgstr "Neodobreni računi"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 9ff3c68e11a..f6f3b4106a8 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 08:51+0000\n"
-"PO-Revision-Date: 2010-09-29 11:36+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -29,6 +29,9 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Виртуал агуулах нь тэгтэй тэнцүү бүх бараанд автомат татан авалтыг "
+"эхлүүлдэг. Та энэ сонголтыг ашиглахгүй байх нь дээр, бид танд барааны МТО "
+"тохиргоог ашиглахыг зөвлөж байна."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -92,7 +95,7 @@ msgstr "Шалтгаан"
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Татан авалт тооцоолох"
 
 #. module: procurement
 #: field:procurement.order,message:0
@@ -102,7 +105,7 @@ msgstr "Сүүлийн алдаа"
 #. module: procurement
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Тооцоололд ашиглагдахгүй, зөвхөн мэдээллийн зорилгоор ашиглана."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
@@ -117,7 +120,7 @@ msgstr "Тэмдэглэгээ"
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Татан авалтын захиалгыг тооцоолж байх үед онцгой тохиолдол гардаг."
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -131,6 +134,13 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"Татан авалт үүсэхэд төлөв нь 'Draft'.\n"
+"Татан авалт нь баталгаажсан бол төлөв нь 'Confirmed'.\n"
+"Баталгаажсаны дараа төлөв нь 'Running'.\n"
+"Хэрэв ямар нэгэн онцгой тохиолдол захиалгад үүсвэл төлөв нь  'Exception'.\n"
+"Онцгой тохиолдол устхад төлөв нь 'Ready'.\n"
+"Нэг татан авалт нь нөгөө татан авалтаа дуусахыг хүлээж байхад төлөв нь "
+"'Waiting' байна."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -143,11 +153,14 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Төлөвлөгчийн үзүүлэлт"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action11
@@ -168,7 +181,7 @@ msgstr "Бэлэн"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -197,11 +210,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Татан авалтын үүсгэсэн баримтын дугаар. Үүнийг OpenERP автоматаар "
+"гүйцэтгэдэг."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Хамгийн бага эрхтэй оролцогч"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action4
@@ -257,7 +272,7 @@ msgstr "Нийлүүлэлт"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Төлөвлөгчийн өдрийн хязгаар"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -318,6 +333,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Татан авалтыг гараар кодлохоор бол, методуудыг цэгцлэхийн тулд загвар харах "
+"болно."
 
 #. module: procurement
 #: view:res.company:0
@@ -330,6 +347,8 @@ msgid ""
 "Wizard run all the procurements, and generate task, production order or "
 "purchase order based on the product type"
 msgstr ""
+"Визард нь татан авалтыг ажиллуулдаг ба даалгавруудыг биелүүлдэг, барааны "
+"захиалга эсвэл худалдан авалтын захиалга нь барааны төрлөөс хамаарна."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -422,6 +441,8 @@ msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
 "than 1!"
 msgstr ""
+"Татан авалтын захиалгын тоо хэмжээг шалгана уу, энэ нь нэгээс бага байх "
+"ёсгүй!"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -429,6 +450,9 @@ msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
@@ -477,6 +501,9 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for futur computation."
 msgstr ""
+"Энэ бол Татан авалтыг тооцоолж байх үед  төлөвлөгчийн дүгнэсэн боломжит "
+"хугацаа юм. Өнөөдөр болон өнөөдрийн хязгаар хооронд багтаагүй татан авалт нь "
+"дараагийн тооцоолол хүртэл орхигдоно."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -494,6 +521,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the orderpoint "
 "without removing it."
 msgstr ""
+"Хэрэв идэвхтэй талбар нь үнэн болсон бол, захиалгын цэгийг устгалгүйгээр "
+"нуух боломжийг олгоно."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -525,12 +554,12 @@ msgstr "Алдаа"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Хуваагдах тоо хэмжээ"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -561,7 +590,7 @@ msgstr ""
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "Хамгийн их захиалга"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -571,7 +600,7 @@ msgstr "Хаагдсан огноо"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr ""
+msgstr "Хожимдсон"
 
 #. module: procurement
 #: field:mrp.property,composition:0
@@ -604,7 +633,7 @@ msgstr "Байршлууд"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "Агуулахаас"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -624,7 +653,7 @@ msgstr "Дууссан"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "Татан авалтын тоо хэмжээ нь дараа дараагийн талбарт тоймлогдоно."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -659,7 +688,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Current"
-msgstr ""
+msgstr "Одоо"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -695,7 +724,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Төлөвлөгдсөн огноо"
 
 #. module: procurement
 #: field:make.procurement,product_id:0
@@ -749,7 +778,7 @@ msgstr "Хүлээж байна"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr ""
+msgstr "Захиалга"
 
 #. module: procurement
 #: field:procurement.order,move_id:0
@@ -767,6 +796,9 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Энэ визард нь тухайн барааны татан авалтыг төлөвлөдөг. Энэ татан авалт нь "
+"даалгаварууд, барааны захиалга эсвэл худалдан авалтын захиалгыг боловсруулах "
+"боломжтой."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -800,13 +832,15 @@ msgstr ""
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "Тооцоолол төлөвлөгч"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"Визард нь агуулахын хамгийн бага дүрмийг шалгаад татан авалтын захиалгыг "
+"биелүүлдэг."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -826,7 +860,7 @@ msgstr "Маш яаралтай"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -848,6 +882,16 @@ msgid ""
 "        if product_id:\n"
 "            w = self.pool.get('product.product"
 msgstr ""
+"Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
+"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
+"\n"
+"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
+"        \"\"\" Finds UoM and UoS of changed product.\n"
+"        @param product_id: Changed id of product.\n"
+"        @return: Dictionary of values.\n"
+"        \"\"\"\n"
+"        if product_id:\n"
+"            w = self.pool.get('product.product"
 
 #. module: procurement
 #: constraint:ir.rule:0
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 9beab0c4d59..82ab4a9320c 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 2c83dde0cb7..4dba312df22 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-12 20:22+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
@@ -27,7 +27,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Fattura Cancellata"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -43,7 +43,7 @@ msgstr "Intrastat (questo mese)"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Fattura Fornitore"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -58,7 +58,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr ""
+msgstr "Periodo"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -73,22 +73,22 @@ msgstr "Importa"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "IVA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Documento"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Tasse:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data della fattura"
 
 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
@@ -119,17 +119,17 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantità"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_89
@@ -144,12 +144,12 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Totale (tasse incluse)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Rimborso"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
@@ -164,17 +164,17 @@ msgstr "Report Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Tasse"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -214,7 +214,7 @@ msgstr "Codice Intrastat"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr ""
+msgstr "Origine"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -230,7 +230,7 @@ msgstr "Membro Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Tassa"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
@@ -250,22 +250,22 @@ msgstr "Esporta"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Rimborso Fornitore"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Totale (tasse escluse)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Prezzo"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 6f3d120040d..63c3fdd1e05 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index bfb0bc36ad2..6848c21c15b 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-10-11 12:36+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
index b7849cc39cf..47809753226 100644
--- a/addons/wiki_faq/i18n/de.po
+++ b/addons/wiki_faq/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
index c0b73038993..5515df16029 100644
--- a/addons/wiki_quality_manual/i18n/de.po
+++ b/addons/wiki_quality_manual/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index a1e54fc3646..b3843e0e12b 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/i18n/de.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: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq

From 91734ec8e1e27ff732d8b8758eba723aa4a0899d Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 08:51:40 +0200
Subject: [PATCH 628/632] [FIX] hr_timesheet_sheet: fixed a typo in security
 file

bzr revid: olt@tinyerp.com-20101013065140-zsuohiimhawbs3o7
---
 addons/hr_timesheet_sheet/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index c11a3ce7099..54d303d116a 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -4,6 +4,6 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
+"access_timesheet_report_employee","timesheet.report.employee","model_hr_timesheet_report","base.group_hr_user",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0

From 67b54aefe15037c51d7dd7ce375d8f7a7226ca51 Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Wed, 13 Oct 2010 12:48:58 +0530
Subject: [PATCH 629/632] [IMP] account_voucher: modified condition of pay btn
 in Sales Reciept

bzr revid: ssi@tinyerp.com-20101013071858-deza7wlc9ii7ofz3
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7bc64a825ae..ad44b842587 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -148,12 +148,14 @@
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+                        <group  colspan="2" attrs="{'invisible':[('pay_now','!=','pay_now')]}">
+			    <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('state','!=','posted')]}"/>
+			</group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>

From 0c1559160c9026469eb0c2a27811943d803b1f27 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 09:56:18 +0200
Subject: [PATCH 630/632] [FIX] procurement: fixed workflow (error in 'confirm'
 after using 'delivery cost' wizard)

bzr revid: olt@tinyerp.com-20101013075618-qrh4jl0pch48aa94
---
 addons/procurement/procurement_workflow.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index b4bcd1e1f04..23b0a08af78 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -188,14 +188,14 @@
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">action_check_finished()</field>
-			<field name="trigger_model">stock.move</field>
-            <field name="trigger_expr_id">[move_id.id]</field>            
+            <field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">move_id and [move_id.id] or []</field>
         </record>
         <record id="trans_make_done_confirm" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="condition">check_move_cancel()</field>
         </record>
-    
+
     </data>
 </openerp>

From 54e6589b272a82a0b1d1c2963f27837ff52f3066 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 11:33:37 +0200
Subject: [PATCH 631/632] [FIX] event: now check that Closing Date is after
 Beginning Date

bzr revid: olt@tinyerp.com-20101013093337-jkmo3zx828o13m77
---
 addons/event/event.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5c510ede613..192844f3f20 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -211,7 +211,7 @@ class event_event(osv.osv):
         'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
             help="Total of Open and Done Registrations"),
         'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
-            help="Total of Prospect Registrations"),
+            help="Total of Prospect Registrati./event/event.py:41:ons"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -262,8 +262,15 @@ class event_event(osv.osv):
 
         return True
 
+    def _check_closing_date(self, cr, uid, ids):
+        for event in self.browse(cr, uid, ids):
+            if event.date_end < event.date_begin:
+                return False
+        return True
+
     _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id'])
+        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id']),
+        (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
 
     def do_team_change(self, cr, uid, ids, team_id, context=None):

From b3191afaf72ce6abd5f70d1dd439caf82c5db13c Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 11:56:27 +0200
Subject: [PATCH 632/632] [FIX] hr_timesheet: removed duplicate 'journal_id'
 field in view

bzr revid: olt@tinyerp.com-20101013095627-qn52st18zx8xtylr
---
 addons/hr_timesheet/hr_timesheet_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 664587b75a3..08ec23bd872 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -22,7 +22,6 @@
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
                     <field name="amount" sum="Total cost" invisible="1"/>
                     <field name="general_account_id" invisible="1"/>
-                    <field name="journal_id" invisible="1"/>
                 </tree>
             </field>
         </record>