From 40fd0a1b096696fd70d23d2b4603eeb5b092c73d Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Tue, 10 Nov 2009 18:16:31 +0530
Subject: [PATCH 01/59] merge multi_company_currency,multi_company_sequence
 modules.

bzr revid: vra@tinyerp.com-20091110124631-awfw0jb10bzo945j
---
 bin/addons/base/base_update.xml           |  4 ++++
 bin/addons/base/ir/ir.xml                 |  2 ++
 bin/addons/base/ir/ir_sequence.py         |  1 +
 bin/addons/base/res/res_company.py        |  1 +
 bin/addons/base/res/res_currency.py       | 15 +++++++++++++++
 bin/addons/base/res/res_currency_view.xml | 19 ++++++++++++-------
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 3fbd24bf886..b26b4ecdcdc 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -128,6 +128,7 @@
                 <tree string="Users">
                     <field name="name"/>
                     <field name="login"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -168,6 +169,9 @@
                             <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
                             <field colspan="4" name="logo" widget="image"/>
                         </page>
+	                    <page string="Currency">
+	                        <field name="currency_ids" colspan="4" nolabel="1"/>
+	                    </page>
                         <page string="Header/Footer">
                             <field colspan="4" name="rml_header" nolabel="1"/>
                         </page>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index f08f023206d..c252cc4ab64 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -105,6 +105,7 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
+                        <field name="company_id"/>
                         <field name="active" select="2"/>
                     </group>
                     <notebook>
@@ -148,6 +149,7 @@
                     <field name="name"/>
                     <field name="code"/>
                     <field name="active"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py
index aa1a498d66b..c0d23602f40 100644
--- a/bin/addons/base/ir/ir_sequence.py
+++ b/bin/addons/base/ir/ir_sequence.py
@@ -46,6 +46,7 @@ class ir_sequence(osv.osv):
         'number_next': fields.integer('Next Number', required=True),
         'number_increment': fields.integer('Increment Number', required=True),
         'padding' : fields.integer('Number padding', required=True),
+        'company_id' : fields.many2one('res.company', 'Company'),
     }
     _defaults = {
         'active': lambda *a: True,
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 1a0b4fe9a4a..64ca3096179 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -38,6 +38,7 @@ class res_company(osv.osv):
         'rml_header2' : fields.text('RML Internal Header'),
         'logo' : fields.binary('Logo'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
+        'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency')
     }
     
     def _get_child_ids(self, cr, uid, uid2, context={}):
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 029ea838da0..ecec7162316 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -57,12 +57,27 @@ class res_currency(osv.osv):
         'accuracy': fields.integer('Computational Accuracy'),
         'rounding': fields.float('Rounding factor', digits=(12,6)),
         'active': fields.boolean('Active'),
+        'company_id':fields.many2one('res.company', 'Company'),
+        'date': fields.date('Date'),
+        'base': fields.boolean('Base')
+
     }
     _defaults = {
         'active': lambda *a: 1,
     }
     _order = "code"
 
+    def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
+        res=super(osv.osv, self).read(cr, user, ids, fields, context, load)
+        for r in res:
+            if r.__contains__('rate_ids'):
+                rates=r['rate_ids']
+                if rates:
+                    currency_rate_obj=self.pool.get('res.currency.rate')
+                    currency_date=currency_rate_obj.read(cr,user,rates[0],['name'])['name']
+                    r['date']=currency_date
+        return res
+
     def round(self, cr, uid, currency, amount):
         if currency.rounding == 0:
             return 0.0
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index 476d797e98e..f68fe20f447 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -8,12 +8,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Currencies">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="rate"/>
-                    <field name="rounding"/>
-                    <field name="accuracy"/>
-                    <field name="active"/>
+	                    <field name="name"/>
+	                    <field name="code"/>
+	                    <field name="company_id" select="2" />
+	                     <field name="rate_ids" invisible="1"/>
+	                    <field name="date"/>
+	                    <field name="rate"/>
+	                    <field name="rounding"/>
+	                    <field name="accuracy"/>
+	                    <field name="active"/>
                 </tree>
             </field>
         </record>
@@ -24,12 +27,14 @@
             <field name="arch" type="xml">
                 <form string="Currency">
                     <field name="name" select="1" colspan="4"/>
+                    <field name="company_id" select="2" />
                     <field name="code" select="1"/>
                     <field name="rate"/>
                     <field name="rounding"/>
                     <field name="accuracy"/>
                     <field name="active" select="1"/>
-                    <field colspan="4" mode="tree,form" name="rate_ids" nolabel="1">
+                    <field name="base"/>
+                    <field colspan="4" mode="tree,form" name="rate_ids" nolabel="1" attrs="{'readonly':[('base','=',True)]}">
                         <form string="Rates">
                             <field name="name"/>
                             <field name="rate"/>

From 80861660c6fd598c29b3cf6bb044490f2b1feec9 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Tue, 10 Nov 2009 18:19:20 +0530
Subject: [PATCH 02/59] merge multi_company, multi_company_account,
 multi_company_hr_timesheet_sheet, multi_company_product,
 multi_company_project, multi_company_purchase modules.

bzr revid: vra@tinyerp.com-20091110124920-qho0im1rrx3mf4sf
---
 addons/account/__terp__.py                    |   3 +-
 addons/account/account.py                     |  15 +-
 addons/account/account_demo.xml               |  13 ++
 addons/account/account_invoice_view.xml       |  13 +-
 addons/account/account_move_line.py           |   2 +
 addons/account/account_view.xml               |   9 +-
 addons/account/demo/multi_company_demo.xml    |  34 ++++
 addons/account/invoice.py                     | 149 +++++++++++++++++-
 addons/account/project/project.py             |   2 +
 addons/account/project/project_view.xml       |   1 +
 addons/account/security/account_security.xml  | 145 +++++++++++++++++
 addons/account/wizard/wizard_journal.py       |   3 +-
 addons/account_budget/__terp__.py             |   1 +
 addons/account_budget/crossovered_budget.py   |   4 +-
 .../crossovered_budget_view.xml               |   2 +
 .../security/account_budget_security.xml      |  19 +++
 addons/hr_timesheet_sheet/__terp__.py         |   1 +
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  |   2 +
 .../hr_timesheet_sheet_view.xml               |   2 +-
 .../security/hr_timesheet_data.xml            |  18 +++
 addons/product/product.py                     | 106 +++++++++++++
 addons/product/product_view.xml               |  61 +++++++
 addons/project/project.py                     |   8 +-
 addons/project/project_view.xml               |   2 +
 addons/project/security/project_security.xml  |  24 +++
 addons/purchase/purchase.py                   |   3 +-
 addons/purchase/purchase_view.xml             |   2 +
 27 files changed, 623 insertions(+), 21 deletions(-)
 create mode 100644 addons/account/demo/multi_company_demo.xml
 create mode 100644 addons/account_budget/security/account_budget_security.xml
 create mode 100644 addons/hr_timesheet_sheet/security/hr_timesheet_data.xml

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 130e094d8be..fc4c16319ff 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -64,7 +64,8 @@
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-        'account_unit_test.xml'
+        'account_unit_test.xml',
+        'demo/multi_company_demo.xml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/account/account.py b/addons/account/account.py
index 1c45b6cd415..a67bb002d35 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -478,7 +478,8 @@ class account_journal(osv.osv):
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
-        'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"),
+        #'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"),
+        'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
         'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
             help="The sequence used for invoice numbers in this journal."),
     }
@@ -486,6 +487,7 @@ class account_journal(osv.osv):
     _defaults = {
         'active': lambda *a: 1,
         'user_id': lambda self,cr,uid,context: uid,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     def create(self, cr, uid, vals, context={}):
         journal_id = super(account_journal, self).create(cr, uid, vals, context)
@@ -520,7 +522,7 @@ class account_fiscalyear(osv.osv):
         'name': fields.char('Fiscal Year', size=64, required=True),
         'code': fields.char('Code', size=6, required=True),
         'company_id': fields.many2one('res.company', 'Company',
-            help="Keep empty if the fiscal year belongs to several companies."),
+            help="Keep empty if the fiscal year belongs to several companies.", required=True),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
@@ -529,6 +531,7 @@ class account_fiscalyear(osv.osv):
 
     _defaults = {
         'state': lambda *a: 'draft',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "date_start"
 
@@ -587,10 +590,12 @@ 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')], 'Status', readonly=True)
+        'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True)
     }
     _defaults = {
         'state': lambda *a: 'draft',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "date_start"
 
@@ -671,6 +676,7 @@ class account_journal_period(osv.osv):
         'active': fields.boolean('Active', required=True),
         'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
+        'company_id' : fields.many2one('res.company', 'Company')
     }
 
     def _check(self, cr, uid, ids, context={}):
@@ -699,6 +705,7 @@ class account_journal_period(osv.osv):
     _defaults = {
         'state': lambda *a: 'draft',
         'active': lambda *a: True,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "period_id"
 
@@ -770,6 +777,7 @@ class account_move(osv.osv):
             ('journal_pur_voucher','Journal Purchase'),
             ('journal_voucher','Journal Voucher'),
         ],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
         'name': lambda *a: '/',
@@ -777,6 +785,7 @@ class account_move(osv.osv):
         'period_id': _get_period,
         'type' : lambda *a : 'journal_voucher',
         'date': lambda *a:time.strftime('%Y-%m-%d'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 
     def _check_centralisation(self, cursor, user, ids):
diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index c2bc9bdc1f4..0b4ee8f097d 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -11,6 +11,7 @@
             <field eval="'FY'+time.strftime('%Y')" name="code"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         
         <!--
@@ -23,6 +24,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-01-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-01-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_2" model="account.period">
             <field eval="'Feb.'+time.strftime('%Y')" name="name"/>
@@ -30,6 +32,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-02-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-02-28'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_3" model="account.period">
             <field eval="'Mar.'+time.strftime('%Y')" name="name"/>
@@ -37,6 +40,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-03-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-03-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_4" model="account.period">
             <field eval="'Apr.'+time.strftime('%Y')" name="name"/>
@@ -44,6 +48,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-04-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-04-30'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_5" model="account.period">
             <field eval="'May.'+time.strftime('%Y')" name="name"/>
@@ -51,6 +56,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-05-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-05-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_6" model="account.period">
             <field eval="'Jun.'+time.strftime('%Y')" name="name"/>
@@ -58,6 +64,7 @@
             <field eval="True" name="special"/>
             <field eval="time.strftime('%Y')+'-06-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-06-30'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_7" model="account.period">
             <field eval="'Jul.'+time.strftime('%Y')" name="name"/>
@@ -65,6 +72,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-07-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-07-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_8" model="account.period">
             <field eval="'Aug.'+time.strftime('%Y')" name="name"/>
@@ -72,6 +80,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-08-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-08-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_9" model="account.period">
             <field eval="'Sep.'+time.strftime('%Y')" name="name"/>
@@ -79,6 +88,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-09-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-09-30'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_10" model="account.period">
             <field eval="'Oct.'+time.strftime('%Y')" name="name"/>
@@ -86,6 +96,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-10-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-10-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_11" model="account.period">
             <field eval="'Nov.'+time.strftime('%Y')" name="name"/>
@@ -93,6 +104,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-11-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-11-30'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_12" model="account.period">
             <field eval="'Dec.'+time.strftime('%Y')" name="name"/>
@@ -100,6 +112,7 @@
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="time.strftime('%Y')+'-12-01'" name="date_start"/>
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
         
     </data>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 40991fa0320..11115f3a3cd 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -52,7 +52,7 @@
                 <form string="Invoice Line">
                     <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)" select="1"/>
+                            <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, {'company_id': parent.company_id})"/>
                             <field name="uos_id"/>
                             <field name="quantity" select="1"/>
                             <field name="price_unit" select="1"/>
@@ -117,6 +117,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="number"/>
+                    <field name="company_id"/>
                     <field name="partner_id" groups="base.group_user"/>
                     <field name="amount_untaxed" sum="Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
@@ -141,7 +142,7 @@
                         <field domain="[('type', '=', 'purchase')]" name="journal_id" select="2"/>
                         <field name="type" readonly="1" select="2"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank)" select="1" context="{'default_customer': 0}" />
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" select="1" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
                     </group>
@@ -154,7 +155,7 @@
                             <field name="check_total" required="2"/>
                             <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
                                 <tree string="Invoice lines" editable="top">
-                                    <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)"/>
+                                    <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, {'company_id': parent.company_id})"/>
                                     <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 name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
@@ -196,7 +197,7 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" widget="selection"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
@@ -242,7 +243,7 @@
                         <field name="journal_id" select="2" groups="base.group_user"/>
                         <field name="type" readonly="1" select="2"/>
                         <field name="number" select="1"/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1" groups="base.group_user"/>
+                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" select="1" groups="base.group_user"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
                         <field name="date_invoice" select="1"/>
@@ -287,7 +288,7 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" widget="selection"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection"/>
                             <field name="fiscal_position" groups="base.group_extended,base.group_user" widget="selection"/>
                             <newline/>
                             <field name="date_due" select="1"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 1d0cdb95008..451821c132d 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -387,6 +387,7 @@ class account_move_line(osv.osv):
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
 #TODO: remove this
         'amount_taxed':fields.float("Taxed Amount",digits=(16,int(tools.config['price_accuracy']))),
+        'company_id': fields.many2one('res.company', 'Company', required=True,select=2),
 
     }
 
@@ -421,6 +422,7 @@ class account_move_line(osv.osv):
         'currency_id': _get_currency,
         'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
         'period_id': lambda self, cr, uid, c: c.get('period_id', False),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
     _order = "date desc,id desc"
     _sql_constraints = [
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1e25c23e7e3..a106b967614 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -16,6 +16,7 @@
                     <field name="code" select="1"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <field name="company_id"/>
                     <field name="end_journal_period_id"/>
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
@@ -74,6 +75,7 @@
                     <field name="code" select="1"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <field name="company_id"/>
                     <field name="fiscalyear_id"/>
                     <field name="special"/>
                     <separator colspan="4" string="States"/>
@@ -166,6 +168,7 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
+                    <field name="company_id" />
                     <field name="company_currency_id"/>
                     <field name="type" invisible="1"/>
                 </tree>
@@ -267,6 +270,7 @@
                             <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="user_id" groups="base.group_extended"/>
+                            <field name="company_id"/>
                             <newline/>
                             <field name="centralisation"/>
                             <field name="group_invoice_lines"/>
@@ -710,7 +714,8 @@
 
                             <field name="debit" select="2"/>
                             <field name="credit" select="2"/>
-
+							<field name="company_id" required="1"/>
+							
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -864,6 +869,7 @@
                     <field name="name" select="1" readonly="True"/>
                     <field name="period_id" select="2"/>
                     <field name="journal_id" select="1"/>
+                    <field name="company_id" required="1"/>
                     <field name="date" select="1"/>
                     <field name="ref" select="1"/>
                     <field name="to_check" select="2"/>
@@ -1101,6 +1107,7 @@
                     <field name="period_id"/>
                     <field name="journal_id"/>
                     <field name="state"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/demo/multi_company_demo.xml b/addons/account/demo/multi_company_demo.xml
new file mode 100644
index 00000000000..1e34162d324
--- /dev/null
+++ b/addons/account/demo/multi_company_demo.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="second_partner" model="res.partner">
+            <field name="name">Tiny Editor</field>
+        </record>
+        
+        <record id="second_company" model="res.company">
+            <field name="name">Tiny Editor</field>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="rml_header1">Free Business Solutions</field>
+            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+            <field name="currency_id" ref="base.EUR"/>
+        </record>
+        
+        <record id="ter_partner" model="res.partner">
+            <field name="name">Tiny Integrator</field>
+        </record>
+        
+        <record id="ter_company" model="res.company">
+            <field name="name">Tiny Integrator</field>
+            <field name="partner_id" ref="base.main_partner"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="rml_header1">Free Business Solutions</field>
+            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+            <field name="currency_id" ref="base.EUR"/>
+        </record>
+        
+        
+    </data>
+</openerp>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 25c3b0d1470..44d5257e38f 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -334,9 +334,8 @@ class account_invoice(osv.osv):
 #   def get_invoice_address(self, cr, uid, ids):
 #       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
 #       return [{}]
-
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         invoice_addr_id = False
         contact_addr_id = False
         partner_payment_term = False
@@ -352,6 +351,26 @@ class account_invoice(osv.osv):
             contact_addr_id = res['contact']
             invoice_addr_id = res['invoice']
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            if company_id:
+                if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id:
+                    rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
+                    pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
+                    if not rec_pro_id: 
+                        rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('company_id','=',company_id)])
+                    if not pay_pro_id:
+                        pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('company_id','=',company_id)])
+                    rec_line_data = self.pool.get('ir.property').read(cr,uid,rec_pro_id,['name','value','res_id'])
+                    pay_line_data = self.pool.get('ir.property').read(cr,uid,pay_pro_id,['name','value','res_id'])
+                    rec_res_id = rec_line_data and int(rec_line_data[0]['value'].split(',')[1]) or False
+                    pay_res_id = pay_line_data and int(pay_line_data[0]['value'].split(',')[1]) or False
+                    if not rec_res_id and not pay_res_id:
+                        raise osv.except_osv(_('Configration Error !'),
+                            _('Can not find account chart for this company, Please Create account.'))
+                    rec_obj_acc=self.pool.get('account.account').browse(cr,uid,[rec_res_id])
+                    pay_obj_acc=self.pool.get('account.account').browse(cr,uid,[pay_res_id])
+                    p.property_account_receivable = rec_obj_acc[0]
+                    p.property_account_payable = pay_obj_acc[0]
+
             if type in ('out_invoice', 'out_refund'):
                 acc_id = p.property_account_receivable.id
             else:
@@ -372,6 +391,14 @@ class account_invoice(osv.osv):
 
         if type in ('in_invoice', 'in_refund'):
             result['value']['partner_bank'] = bank_id
+            
+        if payment_term != partner_payment_term:
+            if partner_payment_term:
+                to_update = self.onchange_payment_term_date_invoice(
+                    cr,uid,ids,partner_payment_term,date_invoice)
+                result['value'].update(to_update['value'])
+            else:
+                result['value']['date_due'] = False
 
         if partner_bank_id != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
@@ -406,6 +433,61 @@ class account_invoice(osv.osv):
     def onchange_partner_bank(self, cursor, user, ids, partner_bank_id):
         return {'value': {}}
 
+    def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line):
+        val={}
+        dom={}
+        if company_id and part_id and type:
+            acc_id = False
+            partner_obj = self.pool.get('res.partner').browse(cr,uid,part_id)
+            if partner_obj.property_account_payable and partner_obj.property_account_receivable:
+                if partner_obj.property_account_payable.company_id.id != company_id and partner_obj.property_account_receivable.company_id.id != company_id:
+                    rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(part_id)+''),('company_id','=',company_id)])
+                    pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('res_id','=','res.partner,'+str(part_id)+''),('company_id','=',company_id)])
+                    if not rec_pro_id: 
+                        rec_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_receivable'),('company_id','=',company_id)])
+                    if not pay_pro_id:
+                        pay_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_payable'),('company_id','=',company_id)])
+                    rec_line_data = self.pool.get('ir.property').read(cr,uid,rec_pro_id,['name','value','res_id'])
+                    pay_line_data = self.pool.get('ir.property').read(cr,uid,pay_pro_id,['name','value','res_id'])
+                    rec_res_id = rec_line_data and int(rec_line_data[0]['value'].split(',')[1]) or False
+                    pay_res_id = pay_line_data and int(pay_line_data[0]['value'].split(',')[1]) or False
+                    if not rec_res_id and not rec_res_id:
+                        raise osv.except_osv(_('Configration Error !'),
+                            _('Can not find account chart for this company, Please Create account.'))
+                    if type in ('out_invoice', 'out_refund'):
+                        acc_id = rec_res_id
+                    else:
+                        acc_id = pay_res_id
+                    val= {'account_id': acc_id}
+            if ids:
+                if company_id:
+                    inv_obj = self.browse(cr,uid,ids)
+                    for line in inv_obj[0].invoice_line:
+                        if line.account_id:
+                            if line.account_id.company_id.id != company_id:
+                                result_id = self.pool.get('account.account').search(cr,uid,[('name','=',line.account_id.name),('company_id','=',company_id)])
+                                if not result_id:
+                                    raise osv.except_osv(_('Configration 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]})
+            else:
+                if invoice_line:
+                    for inv_line in invoice_line:
+                        obj_l = self.pool.get('account.account').browse(cr,uid,inv_line[2]['account_id'])
+                        if obj_l.company_id.id != company_id:
+                            raise osv.except_osv(_('Configration Error !'),
+                                _('invoice line account company is not match with invoice company.'))
+                        else:
+                            continue
+        if company_id:
+            val['journal_id']=False
+            journal_ids=self.pool.get('account.journal').search(cr,uid,[('company_id','=',company_id)])
+            dom={'journal_id':  [('id','in',journal_ids)]}
+        else:
+            journal_ids=self.pool.get('account.journal').search(cr,uid,[])
+            dom={'journal_id':  [('id','in',journal_ids)]}
+        return {'value' : val, 'domain': dom }
+
     # go from canceled state to draft state
     def action_cancel_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state':'draft'})
@@ -1014,13 +1096,14 @@ class account_invoice_line(osv.osv):
     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, context=None):
         if context is None:
             context = {}
+        company_id = context.get('company_id',False)
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
             if type in ('in_invoice', 'in_refund'):
-                return {'domain':{'product_uom':[]}}
+                return {'value': {'categ_id': False}, 'domain':{'product_uom':[]}}
             else:
-                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
+                return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
         fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
 
@@ -1028,6 +1111,61 @@ class account_invoice_line(osv.osv):
         context.update({'lang': lang})
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
+        
+        if company_id:
+            in_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_income'),('res_id','=','product.template,'+str(res.product_tmpl_id.id)+''),('company_id','=',company_id)])
+            if not in_pro_id:
+                in_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_income_categ'),('res_id','=','product.template,'+str(res.categ_id.id)+''),('company_id','=',company_id)])
+            exp_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_expense'),('res_id','=','product.template,'+str(res.product_tmpl_id.id)+''),('company_id','=',company_id)])
+            if not exp_pro_id:
+                exp_pro_id = self.pool.get('ir.property').search(cr,uid,[('name','=','property_account_expense_categ'),('res_id','=','product.template,'+str(res.categ_id.id)+''),('company_id','=',company_id)])
+            
+            if not in_pro_id:
+                in_acc = res.product_tmpl_id.property_account_income 
+                in_acc_cate = res.categ_id.property_account_income_categ
+                if in_acc:
+                    app_acc_in = in_acc
+                else:
+                    app_acc_in = in_acc_cate
+            else:
+                app_acc_in = self.pool.get('account.account').browse(cr,uid,in_pro_id)[0]
+            if not exp_pro_id:
+                ex_acc = res.product_tmpl_id.property_account_expense
+                ex_acc_cate = res.categ_id.property_account_expense_categ
+                if ex_acc:
+                    app_acc_exp = ex_acc
+                else:
+                    app_acc_exp = ex_acc_cate
+            else:
+                app_acc_exp = self.pool.get('account.account').browse(cr,uid,exp_pro_id)[0]
+            if not in_pro_id and not exp_pro_id:
+                in_acc = res.product_tmpl_id.property_account_income 
+                in_acc_cate = res.categ_id.property_account_income_categ
+                ex_acc = res.product_tmpl_id.property_account_expense
+                ex_acc_cate = res.categ_id.property_account_expense_categ
+                if in_acc or ex_acc:
+                    app_acc_in = in_acc
+                    app_acc_exp = ex_acc
+                else:
+                    app_acc_in = in_acc_cate
+                    app_acc_exp = ex_acc_cate
+#            else:
+#                app_acc_in = self.pool.get('account.account').browse(cr,uid,in_pro_id)[0]
+#                app_acc_exp = self.pool.get('account.account').browse(cr,uid,exp_pro_id)[0]
+            if app_acc_in.company_id.id != company_id and app_acc_exp.company_id.id != company_id:
+                in_res_id=self.pool.get('account.account').search(cr,uid,[('name','=',app_acc_in.name),('company_id','=',company_id)])
+                exp_res_id=self.pool.get('account.account').search(cr,uid,[('name','=',app_acc_exp.name),('company_id','=',company_id)])
+                if not in_res_id and not exp_res_id:
+                    raise osv.except_osv(_('Configration Error !'),
+                        _('Can not find account chart for this company, Please Create account.'))
+                in_obj_acc=self.pool.get('account.account').browse(cr,uid,in_res_id)
+                exp_obj_acc=self.pool.get('account.account').browse(cr,uid,exp_res_id)
+                if in_acc or ex_acc:
+                    res.product_tmpl_id.property_account_income = in_obj_acc[0]
+                    res.product_tmpl_id.property_account_expense = exp_obj_acc[0]
+                else:
+                    res.categ_id.property_account_income_categ = in_obj_acc[0]
+                    res.categ_id.property_account_expense_categ = exp_obj_acc[0]
 
         if type in ('out_invoice','out_refund'):
             a =  res.product_tmpl_id.property_account_income.id
@@ -1065,6 +1203,9 @@ class account_invoice_line(osv.osv):
             res2 = res.uom_id.category_id.id
             if res2 :
                 domain = {'uos_id':[('category_id','=',res2 )]}
+                
+        prod_pool=self.pool.get('product.product')            
+        result['categ_id'] = res.categ_id.id       
         return {'value':result, 'domain':domain}
 
     def move_line_get(self, cr, uid, invoice_id, context=None):
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index f86a246f3d8..4439fef4245 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -269,10 +269,12 @@ class account_analytic_journal(osv.osv):
         'active' : fields.boolean('Active'),
         'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When a document (eg: an invoice) needs to create analytic entries, Open ERP will look for a matching journal of the same type."),
         'line_ids' : fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
     }
     _defaults = {
         'active': lambda *a: True,
         'type': lambda *a: 'general',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 account_analytic_journal()
 
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 71bb124109d..436dfc8cca3 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -258,6 +258,7 @@
                     <field name="code" select="1"/>
                     <field name="type" select="2"/>
                     <field name="active" select="2"/>
+                    <field name="company_id"/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 7f441b1b551..bdd7e25bc99 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -36,4 +36,149 @@
 		<field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
 	</record>
 
+	<record id="account_move_comp_rule_group" model="ir.rule.group">
+            <field name="name">Account Entry</field>
+            <field model="ir.model" name="model_id" search="[('model','=','account.move')]"/>
+            <field eval="True" name="global"/>
+    </record>
+    <record id="account_move_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="account_move_comp_rule_group"/>
+    </record>
+
+	<record id="account_move_line_comp_rule_group" model="ir.rule.group">
+            <field name="name">Entry lines</field>
+            <field model="ir.model" name="model_id" search="[('model','=','account.move.line')]"/>
+            <field eval="True" name="global"/>
+    </record>
+    <record id="account_move_line_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="account_move_line_comp_rule_group"/>
+    </record>
+        
+    <record id="journal_period_comp_rule_group" model="ir.rule.group">
+        <field name="name">Journal Period</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.journal.period')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="journal_period_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal.period'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="journal_period_comp_rule_group"/>
+    </record>
+    
+    <record id="journal_comp_rule_group" model="ir.rule.group">
+        <field name="name">Journal multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.journal')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="journal_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="journal_comp_rule_group"/>
+    </record>
+    
+    <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
+        <field name="name">Analytic journal multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="analytic_journal_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="analytic_journal_comp_rule_group"/>
+    </record>
+    <record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
+        <field name="name">Analytic journal multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    
+    <record id="analytic_journal_comp_rule_false" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
+        <field name="operator">=</field>
+        <field name="operand">False</field>
+        <field name="rule_group" ref="analytic_journal_comp_rule_group1"/>
+    </record>
+    
+    <record id="period_comp_rule_group" model="ir.rule.group">
+        <field name="name">Period multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.period')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="period_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.period'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="period_comp_rule_group"/>
+    </record>
+    
+    
+    <record id="fiscal_year_comp_rule_group" model="ir.rule.group">
+        <field name="name">Fiscal year multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.fiscalyear')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="fiscal_year_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="fiscal_year_comp_rule_group"/>
+    </record>
+    
+    <record id="account_comp_rule_group" model="ir.rule.group">
+        <field name="name">Account multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.account')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="account_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.account'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="account_comp_rule_group"/>
+    </record>
+    
+    <record id="tax_comp_rule_group" model="ir.rule.group">
+        <field name="name">Tax multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.tax')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="tax_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="tax_comp_rule_group"/>
+    </record>
+    
+    <record id="tax_code_comp_rule_group" model="ir.rule.group">
+        <field name="name">Tax code multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.tax.code')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="tax_code_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.tax.code'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="tax_code_comp_rule_group"/>
+    </record>
+    
+    <record id="invoice_comp_rule_group" model="ir.rule.group">
+        <field name="name">Invoice multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.invoice')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="invoice_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="invoice_comp_rule_group"/>
+    </record>
+
 </data></openerp>
diff --git a/addons/account/wizard/wizard_journal.py b/addons/account/wizard/wizard_journal.py
index b6a598416bd..50dba5ab18a 100644
--- a/addons/account/wizard/wizard_journal.py
+++ b/addons/account/wizard/wizard_journal.py
@@ -60,7 +60,8 @@ def _action_open_window(self, cr, uid, data, context):
         state = pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [form['period_id']])[0]['state']
         if state == 'done':
             raise wizard.except_wizard(_('UserError'), _('This period is already closed !'))
-        jp.create(cr, uid, {'name':name, 'period_id': form['period_id'], 'journal_id':form['journal_id']})
+        company = pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [form['period_id']])[0]['company_id'][0]
+        jp.create(cr, uid, {'name':name, 'period_id': form['period_id'], 'journal_id':form['journal_id'], 'company_id':company})
     ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
     jp = jp.browse(cr, uid, ids, context=context)[0]
     name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
diff --git a/addons/account_budget/__terp__.py b/addons/account_budget/__terp__.py
index adee60ce982..1ca1a2b29fe 100644
--- a/addons/account_budget/__terp__.py
+++ b/addons/account_budget/__terp__.py
@@ -49,6 +49,7 @@ Three reports are available:
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'security/account_budget_security.xml',
         'account_budget_wizard.xml',
         'crossovered_budget_view.xml',
         'crossovered_budget_report.xml',
diff --git a/addons/account_budget/crossovered_budget.py b/addons/account_budget/crossovered_budget.py
index 2aa516f5e88..694ac6c1a8d 100644
--- a/addons/account_budget/crossovered_budget.py
+++ b/addons/account_budget/crossovered_budget.py
@@ -44,10 +44,12 @@ class account_budget_post(osv.osv):
         'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Spreading'),
         'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
         'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
         'sequence': fields.integer('Sequence'),        
     }
     _defaults = {
-        'sequence': lambda *a: 1,                 
+        'sequence': lambda *a: 1,   
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,              
     }
     _order = "sequence, name"    
 
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 5c6c527543e..423ecfbdbc2 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -22,6 +22,7 @@
                     <field name="sequence"/>                
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -68,6 +69,7 @@
 				<form string="Budgetary Position">
 					<field name="name" select="1"/>
 					<field name="code" select="1"/>
+					<field name="company_id"/>
                     <field name="sequence" select="2"/>					
 					<notebook colspan="4">
 						<page string="Accounts">
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
new file mode 100644
index 00000000000..2cc983619c3
--- /dev/null
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
+    <record id="budget_post_comp_rule_group" model="ir.rule.group">
+        <field name="name">Budget post multi-company</field>
+        <field model="ir.model" name="model_id" search="[('model','=','account.budget.post')]"/>
+        <field eval="True" name="global"/>
+    </record>
+    <record id="budget_post_comp_rule" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
+        <field name="operator">child_of</field>
+        <field name="operand">user.company_id.id</field>
+        <field name="rule_group" ref="budget_post_comp_rule_group"/>
+    </record>
+    <record id="budget_post_comp_rule_false" model="ir.rule">
+        <field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
+        <field name="operator">=</field>
+        <field name="operand">False</field>
+        <field name="rule_group" ref="budget_post_comp_rule_group"/>
+    </record>
+</data></openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py
index 264bc7bda9f..7cc7044e473 100644
--- a/addons/hr_timesheet_sheet/__terp__.py
+++ b/addons/hr_timesheet_sheet/__terp__.py
@@ -49,6 +49,7 @@ The validation can be configured in te company:
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'security/hr_timesheet_data.xml',
         'hr_timesheet_sheet_view.xml',
         'hr_timesheet_workflow.xml',
         'process/hr_timesheet_sheet_process.xml'
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 51ac91ddbf6..507135b70ee 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -239,6 +239,7 @@ class hr_timesheet_sheet(osv.osv):
         'total_difference': fields.function(_total, method=True, string='Difference', multi="_total_sheet"),
         'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True),
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
 
     def _default_date_from(self,cr, uid, context={}):
@@ -269,6 +270,7 @@ class hr_timesheet_sheet(osv.osv):
         'date_current' : lambda *a: time.strftime('%Y-%m-%d'),
         'date_to' : _default_date_to,
         'state': lambda *a: 'new',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
     }
 
     def _sheet_date(self, cr, uid, ids):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 7c54db176b1..c8b36ebfa6a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -87,7 +87,7 @@
                     <field name="user_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    
+                    <field name="company_id" select="1"/>
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
new file mode 100644
index 00000000000..cc49ed9f936
--- /dev/null
+++ b/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+
+		<record model="ir.rule.group" id="timesheet_comp_rule_group">
+			<field name="name">Timesheet multi-company</field>
+			<field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
+			<field name="global" eval="True"/>
+		</record>
+		<record model="ir.rule" id="timesheet_comp_rule">
+			<field name="field_id" search="[('model','=','hr_timesheet_sheet.sheet'),('name','=','company_id')]" model="ir.model.fields"/>
+			<field name="operator">child_of</field>
+			<field name="operand">user.company_id.id</field>
+			<field name="rule_group" ref="timesheet_comp_rule_group"/>
+		</record>
+
+	</data>
+</openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index 509bd61c373..b43814fe37d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -239,6 +239,33 @@ class product_template(osv.osv):
                 result[product.id] = 1
         return result
 
+    def _calc_standard_price(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        company=self.pool.get('res.users').read(cr,uid,uid,['company_id'])['company_id']
+        company_cost_obj=self.pool.get('company.wise.cost.price')
+        for product in self.browse(cr, uid, ids, context=context):
+            company_cost_ids=company_cost_obj.search(cr,uid,[('company_id','=',company[0]),('product_id','=',product.id)])
+            if company_cost_ids:
+                company_cost_data=company_cost_obj.read(cr,uid,company_cost_ids,['standard_price'])
+                res[product.id]=company_cost_data[0]['standard_price']
+            else:
+                res[product.id]=1.0
+            
+        return dict([(i, res[i]) for i in ids ])
+    
+    def _calc_list_price(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        company=self.pool.get('res.users').read(cr,uid,uid,['company_id'])['company_id']
+        company_cost_obj=self.pool.get('company.wise.sale.price')
+        for product in self.browse(cr, uid, ids, context=context):
+            company_list_ids=company_cost_obj.search(cr,uid,[('company_id','=',company[0]),('product_id','=',product.id)])
+            if company_list_ids:
+                company_list_data=company_cost_obj.read(cr,uid,company_list_ids,['list_price'])
+                res[product.id]=company_list_data[0]['list_price']
+            else:
+                res[product.id]=1.0
+        return dict([(i, res[i]) for i in ids ])
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=True, select=True),
         'product_manager': fields.many2one('res.users','Product Manager'),
@@ -277,6 +304,11 @@ class product_template(osv.osv):
         'loc_row': fields.char('Row', size=16),
         'loc_case': fields.char('Case', size=16),
         'company_id': fields.many2one('res.company', 'Company'),
+        'list_price_multi': fields.function(_calc_list_price, method=True, type='float', string='Company Sale Price', help="Base price for computing the customer price. Sometimes called the catalog price."),
+        'standard_price_multi': fields.function(_calc_standard_price, method=True, type='float', string='Company Cost Price', required=True, help="The cost of the product for accounting stock valuation. It can serves as a base price for supplier price."),
+        'standard_price_ids' :fields.one2many('company.wise.cost.price','product_id'),
+        'list_price_ids' :fields.one2many('company.wise.sale.price','product_id')
+
     }
 
     def _get_uom_id(self, cr, uid, *args):
@@ -343,6 +375,79 @@ class product_template(osv.osv):
 
 product_template()
 
+class company_wise_cost_price(osv.osv):
+    _name="company.wise.cost.price"
+    _description="Company Wise Cost Price"
+    _columns={
+              'product_id':fields.many2one('product.template','Product Id'),
+              'company_id':fields.many2one('res.company','Company'),
+              'standard_price':fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy'])), help="The cost of the product for accounting stock valuation. It can serves as a base price for supplier price."),
+              'currency_id':fields.many2one('res.currency','Currency',readonly=True)
+              }
+    
+    def company_cost_onchange(self,cr,uid,ids,company_id):
+        if company_id:
+            currency=self.pool.get('res.company').read(cr,uid,company_id,['currency_id'])
+            return {'value':{'currency_id':currency['currency_id'][0]}}
+        else:
+            return{'value':{'currency_id':False}}
+            
+    def create(self,cr,uid,values,context={}):
+        #code to make onchange_currency_id effectiv for readonly fields
+        if values and values.has_key('company_id') and values['company_id']:
+            val = self.company_cost_onchange(cr, uid, [] ,values['company_id'])['value']
+            values['currency_id']=val['currency_id']        
+        return super(company_wise_cost_price, self).create(cr, uid, values, context=context)
+    
+    def write(self,cr,uid,ids,values,context={}):
+         #code to make onchange_currency_id effectiv for readonly fields
+        if values and  values.has_key('company_id') and values['company_id']:
+            company_id = values['company_id']
+        # this code effects when currency_id is not changed still the rate are chnged then 
+        #        
+        val = self.company_cost_onchange(cr, uid, ids ,company_id)['value']
+        values['currency_id']=val['currency_id']        
+        return super(company_wise_cost_price, self).write(cr, uid, ids, values, context=context)
+        
+company_wise_cost_price()
+
+class company_wise_sale_price(osv.osv):
+    _name="company.wise.sale.price"
+    _description="Company Wise Sale Price"
+    _columns={
+              'product_id':fields.many2one('product.template','Product Id'),
+              'company_id':fields.many2one('res.company','Company'),
+              'list_price':fields.float('Sale Price', required=True, digits=(16, int(config['price_accuracy'])), help="Base price for computing the customer price. Sometimes called the catalog price."),
+              'currency_id':fields.many2one('res.currency','Currency',readonly=True)
+              }
+    
+    def company_sale_onchange(self,cr,uid,ids,company_id):
+        if company_id:
+            currency=self.pool.get('res.company').read(cr,uid,company_id,['currency_id'])
+            return {'value':{'currency_id':currency['currency_id'][0]}}
+        else:
+            return{'value':{'currency_id':False}}
+            
+    def create(self,cr,uid,values,context={}):
+        #code to make onchange_currency_id effectiv for readonly fields
+        if values and values.has_key('company_id') and values['company_id']:
+            val = self.company_sale_onchange(cr, uid, [] ,values['company_id'])['value']
+            values['currency_id']=val['currency_id']
+        return super(company_wise_sale_price, self).create(cr, uid, values, context=context)
+    
+    def write(self,cr,uid,ids,values,context={}):
+         #code to make onchange_currency_id effectiv for readonly fields
+        if values and  values.has_key('company_id') and values['company_id']:
+            company_id = values['company_id']
+        # this code effects when currency_id is not changed still the rate are chnged then 
+        #        
+        val = self.company_sale_onchange(cr, uid, ids ,company_id)['value']
+        values['currency_id']=val['currency_id']
+        
+        return super(company_wise_sale_price, self).write(cr, uid, ids, values, context=context)
+    
+company_wise_sale_price()
+
 class product_product(osv.osv):
     def view_header_get(self, cr, uid, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, uid, view_id, view_type, context)
@@ -632,6 +737,7 @@ class product_supplierinfo(osv.osv):
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Delay', required=True, help="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."),
         'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),
+        'company_id':fields.many2one('res.company','Company'),
     }
     _defaults = {
         'qty': lambda *a: 0.0,
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 0e8f53e97f8..189ba4eaca1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -139,8 +139,15 @@
                             <separator string="Base Prices" colspan="4"/>
                             <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
+                            <field name="standard_price_multi"/>
+            				<field name="list_price_multi"/>
+            				<newline/>
+                            <field name="standard_price_ids" nolabel="1" colspan="2"/>
+            				<field name="list_price_ids" nolabel="1" colspan="2"/>
+            				<newline/>
                             <field name="price_margin" select="1"/>
                             <field name="price_extra" select="1"/>
+                            <newline/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
                             <field colspan="4" name="seller_ids" nolabel="1"/>
@@ -408,6 +415,7 @@
                     <field name="product_code"/>
                     <field name="delay"/>
                     <field name="qty"/>
+                    <field name="company_id"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
                         <tree editable="bottom" string="Pricelist">
                             <field name="min_quantity"/>
@@ -432,6 +440,7 @@
                     <field name="delay"/>
                     <field name="qty"/>
                     <field name="product_code"/>
+                    <field name="company_id"/>
                 </tree>
             </field>
         </record>
@@ -585,6 +594,58 @@
         </record>
         
         <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
+
+        <record id="company_wise_cost_price_form_view" model="ir.ui.view">
+            <field name="name">company.wise.cost.price.form</field>
+            <field name="model">company.wise.cost.price</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Company Wise Cost Prices">
+                    <field name="company_id" on_change="company_cost_onchange(company_id)"/>
+                    <field name="standard_price"/>
+                    <field name="currency_id"/>
+                </form>
+            </field>
+        </record>
         
+        <record id="company_wise_cost_price_tree_view" model="ir.ui.view">
+            <field name="name">company.wise.cost.price.tree</field>
+            <field name="model">company.wise.cost.price</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Company Wise Cost Prices">
+                    <field name="company_id"/>
+                    <field name="standard_price"/>
+                    <field name="currency_id"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="company_wise_sale_price_form_view" model="ir.ui.view">
+            <field name="name">company.wise.sale.price.form</field>
+            <field name="model">company.wise.sale.price</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Company Wise Sale Prices">
+                    <field name="company_id" on_change="company_sale_onchange(company_id)"/>
+                    <field name="list_price"/>
+                    <field name="currency_id"/>
+                </form>
+            </field>
+        </record>
+        
+        <record id="company_wise_sale_price_tree_view" model="ir.ui.view">
+            <field name="name">company.wise.sale.price.tree</field>
+            <field name="model">company.wise.sale.price</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Company Wise Sale Prices">
+                    <field name="company_id"/>
+                    <field name="list_price"/>
+                    <field name="currency_id"/>
+                </tree>
+            </field>
+        </record>
+       
     </data>
 </openerp>
diff --git a/addons/project/project.py b/addons/project/project.py
index 96e86b4153c..47c6ee01cad 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -116,6 +116,7 @@ class project(osv.osv):
         'notes': fields.text('Notes', help="Internal description of the project."),
         'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
         'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True),
+        'company_id': fields.many2one('res.company', 'Company'),
      }
 
     _defaults = {
@@ -123,7 +124,8 @@ class project(osv.osv):
         'manager': lambda object,cr,uid,context: uid,
         'priority': lambda *a: 1,
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a: 'open'
+        'state': lambda *a: 'open',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
     }
 
     _order = "parent_id,priority,name"
@@ -300,7 +302,8 @@ class task(osv.osv):
         'delegated_user_id': fields.related('child_ids','user_id',type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
-        'manager_id': fields.related('project_id','manager', type='many2one', relation='res.users', string='Project Manager')
+        'manager_id': fields.related('project_id','manager', type='many2one', relation='res.users', string='Project Manager'),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
     _defaults = {
         'user_id': lambda obj,cr,uid,context: uid,
@@ -311,6 +314,7 @@ class task(osv.osv):
         'active': lambda *a: True,
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'project_id': _default_project,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
     }
     _order = "sequence, priority, date_deadline, id"
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 792871a6606..096c3f303bd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -23,6 +23,7 @@
                     <notebook colspan="4">
                         <page string="Administration">
                             <field name="warn_manager"/>
+                            <field name="company_id" select="1"/>
                             <field name="priority"/>
                             <field name="timesheet_id"/>
                             <field name="active" select="2"/>
@@ -377,6 +378,7 @@
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
                             <field name="type" widget="selection"/>
+                            <field name="company_id" select="1"/>
                             <field name="active" select="2"/>
                             <field name="partner_id" select="2"/>
                             <separator colspan="4" string="Notes"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index dd859f0f882..f9b8af20541 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -19,5 +19,29 @@
 		<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
 	</record>
 
+	<record model="ir.rule.group" id="project_comp_rule_group">
+		<field name="name">Project multi-company</field>
+		<field name="model_id" search="[('model','=','project.project')]" model="ir.model"/>
+		<field name="global" eval="True"/>
+	</record>
+	<record model="ir.rule" id="project_comp_rule">
+		<field name="field_id" search="[('model','=','project.project'),('name','=','company_id')]" model="ir.model.fields"/>
+		<field name="operator">child_of</field>
+		<field name="operand">user.company_id.id</field>
+		<field name="rule_group" ref="project_comp_rule_group"/>
+	</record>
+
+	<record model="ir.rule.group" id="task_comp_rule_group">
+		<field name="name" >Task multi-company</field>
+		<field name="model_id" search="[('model','=','project.task')]" model="ir.model"/>
+		<field name="global" eval="True"/>
+	</record>
+	<record model="ir.rule" id="task_comp_rule">
+		<field name="field_id" search="[('model','=','project.task'),('name','=','company_id')]" model="ir.model.fields"/>
+		<field name="operator">child_of</field>
+		<field name="operand">user.company_id.id</field>
+		<field name="rule_group" ref="task_comp_rule_group"/>
+	</record>
+
 </data>
 </openerp>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 05128504ed5..67f3fc95ef2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -194,7 +194,8 @@ class purchase_order(osv.osv):
             }, multi="sums"),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
-        'create_uid':  fields.many2one('res.users', 'Responsible'),        
+        'create_uid':  fields.many2one('res.users', 'Responsible'),    
+        'company_id': fields.many2one('res.company','Company',required=True),    
     }
     _defaults = {
         'date_order': lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index bcda8944bd0..d7034442f58 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -43,6 +43,7 @@
                         <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
                         <field name="origin" select="2"/>
                         <field name="shipped" select="2"/>
+                        <field name="company_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
@@ -194,6 +195,7 @@
                 <tree string="Purchase Order">
                     <field name="name" string="Reference"/>
                     <field name="date_order"/>
+                    <field name="company_id"/>
                     <field name="minimum_planned_date"/>
                     <field name="partner_id"/>
                     <field name="location_id"/>

From e42216396d2844edad7947e92587e85e6a5bc865 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 20 Nov 2009 13:56:48 +0530
Subject: [PATCH 03/59] [IMP]: Changes in process flow views.

bzr revid: uco@tinyerp.co.in-20091120082648-77a1uvnhx4aw2gjl
---
 addons/mrp/process/procurement_process.xml    | 56 +++++++++----------
 .../mrp/process/service_product_process.xml   | 12 ++--
 .../mrp/process/stockable_product_process.xml | 18 +++---
 .../process/mrp_operation_process.xml         | 30 +++++-----
 addons/purchase/process/purchase_process.xml  | 42 +++++++-------
 addons/sale/process/sale_process.xml          | 50 ++++++++---------
 6 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index eb658f52745..9b2172c64a1 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -20,7 +20,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;For stockable and consumable&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
 			<field name="subflow_id" ref="process_process_procurementprocess0"/>
@@ -32,8 +32,8 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;If Product type is service&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Service Product&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
 			<field name="subflow_id" ref="process_process_procurementprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
@@ -44,7 +44,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Procurement for raw materials.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Drives the procurement orders for raw material.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_procurementprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
@@ -55,8 +55,8 @@
 			<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
 			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Procurement is created if the product quantity is lower than the minimum limit.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Minimum Stock Rule&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Linked to the 'Minimum stock rule' supplying method.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_procurementprocess0"/>
 			<field eval="1" name="flow_start"/>
 		</record>
@@ -65,7 +65,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Central document to procure products&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;The way to procure depends on the product type.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_procurementprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
@@ -76,7 +76,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;For stockable and consumable&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
 			<field name="subflow_id" ref="process_process_stockableproductprocess0"/>
 			<field name="process_id" ref="process_process_procurementprocess0"/>
@@ -100,8 +100,8 @@
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Procurements&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Procurement orders&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;For purchased material&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_procurementprocess0"/>
             <field name="process_id" ref="purchase.process_process_purchaseprocess0"/>
             <field eval="1" name="flow_start"/>
@@ -144,8 +144,8 @@
 		<record id="process_transition_servicemto0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Serivce Stockable Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If product type is service and procure method is Make to order&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
 		</record>
@@ -153,8 +153,8 @@
 		<record id="process_transition_servicemts0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Service Make to Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Product type is service and procure method is Make to stock&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;This is used in case of a service without any impact in the system, a training session for instance.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
 		</record>
@@ -162,8 +162,8 @@
 		<record id="process_transition_stockmts0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Make to Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
 		</record>
@@ -171,8 +171,8 @@
 		<record id="process_transition_stockproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Product Stock&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;The system creates an order (production or purchased) depending on the sold quantity and the products parameters.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
 		</record>
@@ -180,8 +180,8 @@
 		<record id="process_transition_productionprocureproducts0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Production Procure Products&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;When any procuere products, it comes into the prpcurement orders&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Procurement of raw material&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
 		</record>
@@ -189,8 +189,8 @@
 		<record id="process_transition_minimumstockprocure0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Minimum Stock Procure&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;From minimum stock rules, it goes for procure product.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;'Minimum stock rule' material&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
 		</record>
@@ -198,8 +198,8 @@
 		<record id="process_transition_procurestockableproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Procure Stockable Product&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;if Product type is Stockable in procurement order&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Procurement of stockable products&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... &quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
@@ -207,8 +207,8 @@
 		<record id="process_transition_procureserviceproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Procure Service Product&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;In procurement order, if product type is service&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Procurement of services&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
@@ -216,8 +216,8 @@
 		<record id="process_transition_purchaseprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Procurement Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Procurement convert into the draft purchase order.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Automatic RFQ&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The system launches automatically a RFQ to the preferred supplier.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_purchaseprocure0"/>
         </record>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index fe9a32f0ec3..a14572c1b38 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -20,8 +20,8 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;If procurement is make to order&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Service on Order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_serviceproductprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
@@ -31,7 +31,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Do nothing&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Make to stock&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_serviceproductprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
@@ -42,7 +42,7 @@
 			<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
 			<field name="model_id" ref="purchase.model_purchase_order"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;A purchase order is created for a sub-contracting demand.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Request for Quotation.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
 			<field name="subflow_id" ref="purchase.process_process_purchaseprocess0"/>
 			<field name="process_id" ref="process_process_serviceproductprocess0"/>
@@ -57,8 +57,8 @@
 		<record id="process_transition_servicerfq0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Order Request&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is buy&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_serviceonorder0"/>
 		</record>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 34ff93d3228..ac3b78bc8b4 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -20,7 +20,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;The system waits for requested products in stock.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_stockableproductprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
@@ -31,8 +31,8 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Wait for available products for reservation&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Stockable Stock&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_stockableproductprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
@@ -42,7 +42,7 @@
 			<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
 			<field name="model_id" ref="purchase.model_purchase_order"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;A Request for Quotation is created and sent to the supplier.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Request for Quotation.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
 			<field name="subflow_id" ref="purchase.process_process_purchaseprocess0"/>
 			<field name="process_id" ref="process_process_stockableproductprocess0"/>
@@ -54,7 +54,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Production orders are created for the product manufacturing.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Manufacturing Plan.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_stockableproductprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
@@ -68,8 +68,8 @@
 		<record id="process_transition_stockrfq0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Request&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Product type is Stockable and procure method is make to stock&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;In case the Supply method of the product is Buy, the system creates a purchase order.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_rfq0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
 		</record>
@@ -77,8 +77,8 @@
 		<record id="process_transition_stockproduction0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Stockable Production Order&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;If Procure method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;To Produce&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;In case the Supply method of the product is Produce, the system creates a production order.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_production0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
 		</record>
diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml
index 0e8fe053f70..2a44b22cf25 100644
--- a/addons/mrp_operations/process/mrp_operation_process.xml
+++ b/addons/mrp_operations/process/mrp_operation_process.xml
@@ -20,7 +20,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Production order for any products&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Information from the production order.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_mrpoperationprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -31,7 +31,7 @@
 			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Production Work Center&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Information from the routing definition.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Work Center&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_mrpoperationprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -42,7 +42,7 @@
 			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Operation is started&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Start the operation.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Start Operation&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_mrpoperationprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state=='startworking'&quot;&quot;&quot;" name="model_states"/>
@@ -53,8 +53,8 @@
 			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Operation is done&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Done Operation&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Finish the operation.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Operation Done&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_mrpoperationprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
@@ -64,8 +64,8 @@
 			<field name="menu_id" ref="menu_mrp_production_operation_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production_workcenter_line"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Operation is cancelled&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Cancel Operation&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Cancel the operation.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Operation Cancelled&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_mrpoperationprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state=='cancel'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
@@ -78,8 +78,8 @@
 		<record id="process_transition_productionstart0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Production start Operation&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;From production order, create the workorder&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Creation of the work order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;The work orders are created on the basis of the production order.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
 		</record>
@@ -87,8 +87,8 @@
 		<record id="process_transition_workstartoperation0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Work start Operation&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;From work order, define the cycles and hour for creating product&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Details of the work order&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;There is 1 work order per work center. The information about the number of cycles or the cycle time.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_workorder0"/>
 		</record>
@@ -96,8 +96,8 @@
 		<record id="process_transition_startdoneoperation0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Start Done Operation&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Operation is done&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Operation done&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;When the operation is finished, the operator updates the system by finishing the work order.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
 		</record>
@@ -105,8 +105,8 @@
 		<record id="process_transition_startcanceloperation0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Start Cancel Operation&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Operation is cancelled&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Operation cancelled&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;When the operation needs to be cancelled, you can do it in the work order form.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
 		</record>
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index d266cb310bd..4a33d7a3873 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -44,7 +44,7 @@
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Request for quotation is proposed by the system.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Request for Quotations.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -55,7 +55,7 @@
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encoded manually by the user.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Request for Quotations.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -65,8 +65,8 @@
             <field name="menu_id" ref="purchase.menu_purchase_form_action3"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Confirmed Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Purchase order is confirmed by the user.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmed&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;State of the Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -76,8 +76,8 @@
             <field name="menu_id" ref="purchase.menu_purchase_form_action4"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Approved Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Purchase order is approved by supplier.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Approved&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;State of the Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='approved'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -88,7 +88,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Pre-generated supplier invoice to control based on order&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;To be reviewed by the accountant.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field name="subflow_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -100,7 +100,7 @@
             <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;Incoming Products&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Packing is created for the products reception control.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;List of ordered products.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='assigned'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -111,7 +111,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Supplier Invoice pre-generated on receptions for control&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;To be reviewed by the accountant.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field name="subflow_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -176,8 +176,8 @@
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirming Purchase Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm Purchase order from Request for quotation&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
@@ -186,8 +186,8 @@
         <record id="process_transition_confirmingpurchaseorder1" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirming Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm Purchase order from Request for quotation without origin&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;In case there is no supplier for this product, the buyer can fill the form manually and confirm it. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/>
         </record>
@@ -195,8 +195,8 @@
         <record id="process_transition_approvingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Approving Purchase Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Approve Purchase order after Confirming&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Approbation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The supplier approves the Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" />
         </record>
@@ -204,8 +204,8 @@
         <record id="process_transition_invoicefrompurchase0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice from Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;After approved purchase order , it comes into the supplier invoice&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoicecontrol0"/>
             <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/>
@@ -214,8 +214,8 @@
         <record id="process_transition_createpackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Packing list&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;When purchase order is approved , it creates its packing list.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Pick list generated&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A pick list is generated to track the incoming products.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
         </record>
@@ -223,8 +223,8 @@
         <record id="process_transition_invoicefrompackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice from Packing list&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Creates invoice from packin list&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On picking'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
         </record>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index eb2d9f65ef3..59fd52faa79 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -33,7 +33,7 @@
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Sale Order Procurement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Procurement for each line&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
             <field name="process_id" ref="mrp.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
@@ -45,7 +45,7 @@
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Quotation (A sale order in draft state)&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Draft state of sale order&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -56,7 +56,7 @@
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Manages the delivery and invoicing progress&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Drives procurement and invoicing&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='manual'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -66,8 +66,8 @@
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;One procurement for each product.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;One procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
@@ -78,8 +78,8 @@
             <field name="menu_id" ref="stock.menu_picking_waiting"/>
             <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;Outgoing Products&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Packing OUT is created for stockable products.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Document of the move to the output or to the customer.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -90,7 +90,7 @@
             <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"/>
-            <field eval="&quot;&quot;&quot;Delivery, from the warehouse to the customer.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Document of the move to the customer.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('done', 'assigned')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -100,8 +100,8 @@
             <field name="menu_id" ref="account.menu_invoice_draft"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Draft customer invoice, to be reviewed by accountant.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;To be reviewed by the accountant.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -112,8 +112,8 @@
             <field name="menu_id" ref="account.menu_invoice_draft"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice based on packing lists&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Based on the shipped or on the ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -150,7 +150,7 @@
         <record id="process_transition_confirmquotation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Whenever confirm button is clicked, the draft state is moved to manual. that is, quotation is moved to  sale order.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;The salesman confirms the quotation. The state of the sale order becomes 'In progress' or 'Manual in progress'.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_saleorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_quotation0"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
@@ -158,32 +158,32 @@
         
         <record id="process_transition_saleprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Sale Procurement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Procurement is created after confirmation of sale order.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
         </record>
 
         <record id="process_transition_packing0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Packing&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Packing list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to packing list.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
         
         <record id="process_transition_deliver0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Deliver&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirming the packing list moves them to delivery order. This can be done by clicking on 'Validate' button.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Delivery Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
         </record>
 
         <record id="process_transition_invoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice is created when 'Create Invoice' is being clicked after confirming the sale order. This transaction moves the sale order to invoices.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
             <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/>
@@ -191,8 +191,8 @@
 
         <record id="process_transition_invoiceafterdelivery0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice after delivery&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
         </record>
@@ -200,8 +200,8 @@
         <record id="process_transition_saleorderprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Sale Procurement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;In sale order , procuerement for each line and it comes into the procurement order&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>

From e0233223fadeb19afe9c506683e5cc11e8ad775b Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Fri, 20 Nov 2009 17:47:05 +0530
Subject: [PATCH 04/59] [IMP]: Improved process flow for customer invoice,
 supplier invoice, statement, employee contract and timesheet.

bzr revid: uco@tinyerp.co.in-20091120121705-bca1bp1ckmwzlrko
---
 .../process/customer_invoice_process.xml      | 60 +++++++++----------
 addons/account/process/statement_process.xml  | 22 +++----
 .../process/supplier_invoice_process.xml      | 50 ++++++++--------
 addons/hr/process/hr_process.xml              | 14 ++---
 .../process/hr_timesheet_sheet_process.xml    | 34 +++++------
 addons/mrp/process/procurement_process.xml    | 22 +++----
 addons/product/process/product_process.xml    |  6 +-
 addons/purchase/process/purchase_process.xml  | 22 +++----
 addons/sale/process/sale_process.xml          |  8 +--
 9 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index acdce086ee4..544669c96d8 100755
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -20,8 +20,8 @@
             <field name="menu_id" ref="account.account_analytic_def_account"/>
             <field name="model_id" ref="account.model_account_analytic_account"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Analytic&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Analytic costs to reinvoice purchases, timesheets, ...&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Analytic Costs&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic costs to invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -31,8 +31,8 @@
             <field name="menu_id" ref="account.menu_invoice_draft"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Proposed invoice to be checked, validated and printed&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Draft state of an invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -43,7 +43,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Have a number and entries are generated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's status is Open&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -53,8 +53,8 @@
             <field name="menu_id" ref="account.menu_action_move_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Accounting Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Validated accounting entries.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accounting entries.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -64,7 +64,7 @@
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Statement encoding produces payment entries&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Registered payment&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field name="subflow_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -75,8 +75,8 @@
             <field name="menu_id" ref="account.menu_action_move_line_form"/>
             <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 Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Can be draft or validated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -87,7 +87,7 @@
             <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"/>
-            <field eval="&quot;&quot;&quot;Reconciliation of entries from invoice(s) and payment(s)&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Comparison between accounting and payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='valid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -98,7 +98,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Paid invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Paid invoice when reconciled.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's status is Done&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -108,8 +108,8 @@
             <field name="menu_id" ref="account.menu_action_move_line_search"/>
             <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;Accounting Statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Accounting entries at statement's confirmation&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Bank statement&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
             <field name="process_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
@@ -132,8 +132,8 @@
         <record id="process_transition_confirmstatementfromdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirm statement from draft&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm statement with/without reconciliation from draft statement&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirm statement&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The accountant confirms the statement.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
             <field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/>
         </record>
@@ -141,8 +141,8 @@
         <record id="process_transition_analyticinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;analytic Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From analytic accounts, Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_analytic0"/>
         </record>
@@ -150,8 +150,8 @@
         <record id="process_transition_customerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Customer Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Number of entries are generated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
             <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
@@ -160,8 +160,8 @@
         <record id="process_transition_validentries0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Valid Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Valid entries from invoice&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_accountingentries0"/>
             <field model="process.node" name="source_node_id" ref="process_node_invoiceinvoice0"/>
         </record>
@@ -169,8 +169,8 @@
         <record id="process_transition_entriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Entries Reconcile&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconcile Entries.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accounting entries are the first input of the reconciliation.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_accountingentries0"/>
         </record>
@@ -178,8 +178,8 @@
         <record id="process_transition_statemententries0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Statement Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From statement, create entries&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Manual or automatic creation of payment entries according to the statements&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
             <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
         </record>
@@ -187,8 +187,8 @@
         <record id="process_transition_paymentreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Payment Reconcile&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconcilate the entries from payment&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Payment entries are the second input of the reconciliation.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_paymententries0"/>
         </record>
@@ -196,8 +196,8 @@
         <record id="process_transition_reconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Reconcile Paid&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Paid invoice when reconciled.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice can be paid.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/>
         </record>
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 84d22552e05..40b6ba28cf6 100755
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -21,7 +21,7 @@
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Electronic File&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Import from your bank statements&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Automatic entry&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -32,7 +32,7 @@
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Manually&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encode manually the statement&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -42,8 +42,8 @@
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Import invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Import from invoices or payments&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Import from invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Statement from invoice or payment&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -54,7 +54,7 @@
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Set starting and ending balance for control&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Status is draft&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -67,8 +67,8 @@
     	<record id="process_transition_filestatement0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;File statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Import file from your bank statement&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_electronicfile0"/>
         </record>
@@ -76,8 +76,8 @@
         <record id="process_transition_invoicemanually0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Manually statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encode manually statement comes into the draft statement&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Encode the statement manually in the system.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_manually0"/>
         </record>
@@ -85,8 +85,8 @@
         <record id="process_transition_invoiceimport0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice import&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Import invoice from statement&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Import from invoice or payment&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Import of the statement in the system from a supplier or customer invoice&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/>
         </record>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 8611dd6eb07..5823e7acbb6 100755
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -20,8 +20,8 @@
             <field name="menu_id" ref="account.account_analytic_def_account"/>
             <field name="model_id" ref="account.model_account_analytic_account"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Analytic&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Analytic costs to reinvoice purchases, timesheets, ...&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Analytic Costs&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic costs to invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -32,7 +32,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Pre-generated invoice from control&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Draft state of an invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -42,8 +42,8 @@
             <field name="menu_id" ref="account.menu_finance_invoice"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Control Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Have a number and entries are generated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Invoice's status is Open&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -54,7 +54,7 @@
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Statement encoding produces payment entries&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Manually or automatically entered in the system&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field name="subflow_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -65,8 +65,8 @@
             <field name="menu_id" ref="account.menu_action_move_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Accounting Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Validated accounting entries.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accounting entries.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -76,7 +76,7 @@
             <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"/>
-            <field eval="&quot;&quot;&quot;Select invoices you want to pay and manages advances&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment of invoices&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -87,7 +87,7 @@
             <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"/>
-            <field eval="&quot;&quot;&quot;Reconciliation of entries from invoice(s) and payment(s)&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Comparison between accounting and payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='valid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -98,7 +98,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Paid invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Paid invoice when reconciled.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's status is Done.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -111,8 +111,8 @@
 		<record id="process_transition_supplieranalyticcost0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Analytic Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From analytic accounts, Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
         </record>
@@ -120,8 +120,8 @@
         <record id="process_transition_suppliercustomerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Customer Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Number of entries are generated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
             <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
@@ -130,8 +130,8 @@
         <record id="process_transition_suppliervalidentries0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Valid Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Valid entries from invoice&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplieraccountingentries0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
         </record>
@@ -139,8 +139,8 @@
         <record id="process_transition_supplierentriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Entries Reconcile&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconcile Entries.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accounting entries are an input of the reconciliation.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/>
         </record>
@@ -148,8 +148,8 @@
         <record id="process_transition_paymentorderbank0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Payment Reconcilation&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconcilation of entries from payment order.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The payment order is sent to the bank.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/>
         </record>
@@ -157,8 +157,8 @@
         <record id="process_transition_paymentorderreconcilation0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Payment Reconcilation&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconcilation of entries from payment order.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Bank statements are entered in the system.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/>
         </record>
@@ -166,8 +166,8 @@
         <record id="process_transition_supplierreconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Reconcile Paid&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Paid invoice when reconciled.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;System payment&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/>
         </record>
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index 7dedef35be2..dc87ea754be 100755
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -21,7 +21,7 @@
 			<field name="model_id" ref="hr.model_hr_employee"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Employee&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Employee Complete Form&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Employee form and structure&quot;&quot;&quot;" name="note"/>
 			<field name="process_id" ref="process_process_employeecontractprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
@@ -31,7 +31,7 @@
 			<field name="model_id" ref="hr.model_hr_employee"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Employee Contact&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Fill up employee's contact information&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Other information&quot;&quot;&quot;" name="note"/>
 			<field name="process_id" ref="process_process_employeecontractprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
@@ -41,7 +41,7 @@
 			<field name="model_id" ref="base.model_res_users"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Openerp user&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Create OpenERP User&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Creation of a OpenERP user&quot;&quot;&quot;" name="note"/>
 			<field name="process_id" ref="process_process_employeecontractprocess0"/>
 			<field eval="0" name="flow_start"/>
 		</record>
@@ -53,8 +53,8 @@
 		<record id="process_transition_employeeuser0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Openerp user&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Create openerp user&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Link a user to an employee&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;The field Relate'd user in the Employee form allows to link the OpenERP user (and his rights and role) to the employee.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
 		</record>
@@ -62,8 +62,8 @@
 		<record id="process_transition_contactofemployee0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Contact  of employee&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Fill up contact information&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Link the employee to information&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;In the Employee form, there are different kind of information like Contact information.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
 		</record>
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index e1c63460864..11509e0628e 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -43,7 +43,7 @@
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Timesheet sheet confirm at the end of the period&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Information of time spent on a service&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_hrtimesheetprocess0"/>
             <field name="process_id" ref="hr_timesheet.process_process_timesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
@@ -76,7 +76,7 @@
             <field name="model_id" ref="hr.model_hr_employee"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Attendance&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Defines employee's timesheet entry&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Employee's timesheet entry&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="1" name="flow_start"/>
         </record>
@@ -97,8 +97,8 @@
             <field name="menu_id" ref="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current"/>
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft Timesheet sheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encode Your hours and Sign in / out&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Draft Timesheet&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Status is draft.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -109,7 +109,7 @@
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Confirmed Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;At the end of the period (week/month)&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Status is confirmed.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -120,7 +120,7 @@
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Validated Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Control by the project manager&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Status is validated.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -131,7 +131,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Invoice on Work&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice based on timesheet&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Based on the timesheet&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -164,8 +164,8 @@
         <record id="process_transition_attendancetimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Attendance&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Attendance entry moves into the timesheet&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Sign in/out&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The employee signs in and signs out.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_attendance0"/>
         </record>
@@ -173,8 +173,8 @@
         <record id="process_transition_timesheetdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;timesheet entry is into draft state.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The timesheet line represents the time spent by the employee on a specific service provided.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_timesheet0"/>
         </record>
@@ -182,8 +182,8 @@
         <record id="process_transition_confirmtimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirm Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;timesheet is confirmed at the end of the week / month&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The employee periodically confirms his own timesheets.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_confirmedtimesheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/>
@@ -192,8 +192,8 @@
         <record id="process_transition_validatetimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Validate Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Timesheet is validate by project manager.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The project manager validates the timesheets.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_validatedtimesheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
@@ -201,8 +201,8 @@
         <record id="process_transition_invoiceontimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice on timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Creates invoice based on timesheet&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoicing&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 9b2172c64a1..0986e37387c 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -111,8 +111,8 @@
             <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
             <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Minimum stock rule&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Create minimum stock rules&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Minimum Stock&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Automatic procurement rule&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="product.process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -122,7 +122,7 @@
             <field name="model_id" ref="mrp.model_mrp_routing"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Routing&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Define a routing to describe the manufacturing steps.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Manufacturing Steps.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="product.process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -131,8 +131,8 @@
             <field name="menu_id" ref="mrp.menu_mrp_bom_form_action"/>
             <field name="model_id" ref="mrp.model_mrp_bom"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Bill of Materials&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Define the product structure, with sub-products and/or components.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Bill of Material&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Product's structure&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="product.process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -225,8 +225,8 @@
          <record id="process_transition_producttostockrules0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Product to stock rules&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;you can see the minimum stock rules from product&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Procurement rule&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The Minimum Stock Rule is an automatic procurement rule based on a mini and maxi quantity. It's available in the Stock management menu and configured by product.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_productminimumstockrule0"/>
             <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
         </record>
@@ -234,8 +234,8 @@
         <record id="process_transition_billofmaterialrouting0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Material routing&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;An entry is being made from billing material to routing.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Material Routing&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The Bill of Material is linked to a routing, i.e. the succession of work centers.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_routing0"/>
             <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/>
         </record>
@@ -243,8 +243,8 @@
 		<record id="process_transition_bom0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;BOM&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;You can see its bill of material which are used to make product&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Manufacturing decomposition&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The Bill of Material is the product's decomposition. The components (that are products themselves) can also have their own Bill of Material (multi-level).&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_billofmaterial0"/>
             <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
         </record>
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index c9cd262de87..1a77aae17fb 100755
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -21,7 +21,7 @@
             <field name="model_id" ref="product.model_product_product"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Create new Product&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Creation of the product&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_productprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('', 'sellable', 'draft', 'obsolete', 'end') &quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -31,8 +31,8 @@
             <field name="menu_id" ref="product.menu_products"/>
             <field name="model_id" ref="product.model_product_supplierinfo"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Supplier Info&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Product suppliers, with their product name, price, etc.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Supplier Information&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1 or several supplier(s) can be linked to a product. All information stands in the product form.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index 4a33d7a3873..6021ec72aaa 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -20,8 +20,8 @@
             <field name="menu_id" ref="stock.menu_picking_waiting"/>
             <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;Out Packing&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice based on deliveries&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Outgoing Products&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Outgoing products to invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="account.process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -32,7 +32,7 @@
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Purchase Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;When controlling invoice from orders&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmed purchase order to invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field name="subflow_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -122,8 +122,8 @@
             <field name="menu_id" ref="stock.menu_picking_waiting"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Product Receipt&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Control invoices on receptions&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Incoming Products&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Incoming products to control&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_purchaseprocess0"/>
             <field name="process_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
@@ -167,8 +167,8 @@
         <record id="process_transition_productrecept0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Product recept invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Create invoice from product recept&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
         </record>
@@ -232,8 +232,8 @@
         <record id="process_transition_purchaseinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Purchase Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;After Purchase order , Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a purchase order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/>
         </record>
@@ -241,8 +241,8 @@
         <record id="process_transition_packinginvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Packing Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From Packing list, Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A Pick list generates an invoice. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
         </record>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 59fd52faa79..c8b1afd6eeb 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -20,8 +20,8 @@
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;After confirming order, Create the invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Confirmed sale order to invoice.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="account.process_process_invoiceprocess0"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -209,8 +209,8 @@
         <record id="process_transition_saleinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Sale Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm sale order and Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a sale order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A sale order generates an invoice, as soon as it is confirmed by the salesman. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_order0"/>
         </record>

From ac0348f28a0ba1b69aa089fb8c8f7c7d193de242 Mon Sep 17 00:00:00 2001
From: gpa <gpa@gpa-desktop>
Date: Fri, 20 Nov 2009 19:17:42 +0530
Subject: [PATCH 05/59] 
 [IMP]account,hr_timesheet_sheet,product,project,purchase,sale modules:
 company_id [ADD] multi_company module.

bzr revid: gpa@gpa-desktop-20091120134742-xzwscqyhzxsbijt5
---
 addons/account/__terp__.py                    |  1 -
 addons/account/account_move_line.py           |  2 +-
 addons/account/invoice.py                     |  1 +
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  |  2 +-
 addons/multi_company/__init__.py              | 27 ++++++++
 addons/multi_company/__terp__.py              | 38 ++++++++++++
 addons/multi_company/multi_company.py         | 61 +++++++++++++++++++
 .../multi_company_demo.xml                    |  0
 addons/multi_company/multi_company_view.xml   | 45 ++++++++++++++
 addons/product/product.py                     |  1 +
 addons/project/project.py                     |  4 +-
 addons/purchase/purchase.py                   |  2 +
 addons/sale/sale.py                           |  3 +-
 13 files changed, 181 insertions(+), 6 deletions(-)
 create mode 100644 addons/multi_company/__init__.py
 create mode 100644 addons/multi_company/__terp__.py
 create mode 100644 addons/multi_company/multi_company.py
 rename addons/{account/demo => multi_company}/multi_company_demo.xml (100%)
 create mode 100644 addons/multi_company/multi_company_view.xml

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index fc4c16319ff..bb73c2527c0 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -65,7 +65,6 @@
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
         'account_unit_test.xml',
-        'demo/multi_company_demo.xml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 451821c132d..cfbf14c68a2 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -422,7 +422,7 @@ class account_move_line(osv.osv):
         'currency_id': _get_currency,
         'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
         'period_id': lambda self, cr, uid, c: c.get('period_id', False),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', c)
     }
     _order = "date desc,id desc"
     _sql_constraints = [
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 44d5257e38f..7c6dd6cf957 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1078,6 +1078,7 @@ class account_invoice_line(osv.osv):
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
         'note': fields.text('Notes'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
+        'company_id': fields.related('invoice_id','company_id',type='many2one',object='res.company',string='Company')
     }
     _defaults = {
         'quantity': lambda *a: 1,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 507135b70ee..1cc33b38a0d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -270,7 +270,7 @@ class hr_timesheet_sheet(osv.osv):
         'date_current' : lambda *a: time.strftime('%Y-%m-%d'),
         'date_to' : _default_date_to,
         'state': lambda *a: 'new',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
+         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr_timesheet_sheet.sheet', c)
     }
 
     def _sheet_date(self, cr, uid, ids):
diff --git a/addons/multi_company/__init__.py b/addons/multi_company/__init__.py
new file mode 100644
index 00000000000..e96ecdf56e6
--- /dev/null
+++ b/addons/multi_company/__init__.py
@@ -0,0 +1,27 @@
+# -*- 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/>.     
+#
+##############################################################################
+
+import multi_company
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__terp__.py
new file mode 100644
index 00000000000..dac7349e7c4
--- /dev/null
+++ b/addons/multi_company/__terp__.py
@@ -0,0 +1,38 @@
+# -*- 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/>.     
+#
+##############################################################################
+
+
+{
+    'name': 'Multi Company',
+    'version': '1.0',
+    'category': 'Custom',
+    'description': " ",
+    'author': 'Tiny',
+    'depends': ['base'],
+    'update_xml': [
+        'multi_company_view.xml',
+    ],
+    'demo_xml': ['multi_company_demo.xml'],
+    'installable': True,
+    'active': True,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/multi_company/multi_company.py b/addons/multi_company/multi_company.py
new file mode 100644
index 00000000000..e735bf91b30
--- /dev/null
+++ b/addons/multi_company/multi_company.py
@@ -0,0 +1,61 @@
+# -*- 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 mx import DateTime
+import time
+import netsvc
+from osv import fields, osv
+from tools import config
+from tools.translate import _
+import tools
+
+class multi_company_default(osv.osv):
+    _name = 'multi_company.default'
+    _order = 'sequence,id'
+    _columns = {
+         'sequence': fields.integer('Sequence'),
+         'name': fields.char('Name', size=32, required=True),
+         'company_id': fields.many2one('res.company', 'Main Company', required=True),
+         'company_dest_id': fields.many2one('res.company', 'Default Company', required=True),
+         'object_id': fields.many2one('ir.model', 'Object', required=True),
+         'expression': fields.char('Expression', size=32, required=True),
+ }
+    _defaults = {
+     'expression': lambda *a: 'True',
+     'sequence': lambda *a: 1
+                 }
+multi_company_default()
+
+class res_company(osv.osv):
+ _inherit = 'res.company'
+ 
+ def _company_default_get(self, cr, uid, object=False, context={}):
+
+     proxy = self.pool.get('multi_company.default')
+     ids = proxy.search(cr, uid, [('object_id.name', '=', object)])
+     for rule in proxy.browse(cr, uid, ids, context):
+         user = self.pool.get('res.user').browse(cr, uid, uid)
+         if eval(rule.expression, {'context': context, 'user': user}):
+             return rule.company_dest_id.id
+     return super(res_company, self)._company_default_get(cr, uid, object, context)
+ 
+res_company()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/demo/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
similarity index 100%
rename from addons/account/demo/multi_company_demo.xml
rename to addons/multi_company/multi_company_demo.xml
diff --git a/addons/multi_company/multi_company_view.xml b/addons/multi_company/multi_company_view.xml
new file mode 100644
index 00000000000..d2d26c48591
--- /dev/null
+++ b/addons/multi_company/multi_company_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_inventory_tree" model="ir.ui.view">
+            <field name="name">multi_company.default.tree</field>
+            <field name="model">multi_company.default</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Multi Company">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="company_id"/>
+                    <field name="company_dest_id"/>
+                    <field name="object_id"/>
+                    <field name="expression" />
+                </tree>
+            </field>
+        </record>
+        <record id="view_inventory_form" model="ir.ui.view">
+            <field name="name">multi_company.default.form</field>
+            <field name="model">multi_company.default</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Multi Company">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="company_id"/>
+                    <field name="company_dest_id"/>
+                    <field name="object_id"/>
+                    <field name="expression" />
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_inventory_form" model="ir.actions.act_window">
+            <field name="name">Multi Company</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">multi_company.default</field>
+            <field name="view_type">form</field>
+        </record>
+        
+        <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="base.menu_action_res_company_tree"/>
+        
+    </data>
+</openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index b43814fe37d..e640628dbf9 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -743,6 +743,7 @@ class product_supplierinfo(osv.osv):
         'qty': lambda *a: 0.0,
         'sequence': lambda *a: 1,
         'delay': lambda *a: 1,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', c)
     }
     _order = 'sequence'
 product_supplierinfo()
diff --git a/addons/project/project.py b/addons/project/project.py
index 47c6ee01cad..4eb85cbee31 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -125,7 +125,7 @@ class project(osv.osv):
         'priority': lambda *a: 1,
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'open',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.project', c)
     }
 
     _order = "parent_id,priority,name"
@@ -314,7 +314,7 @@ class task(osv.osv):
         'active': lambda *a: True,
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'project_id': _default_project,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', c) 
     }
     _order = "sequence, priority, date_deadline, id"
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 67f3fc95ef2..b260f7c24d0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -206,6 +206,7 @@ class purchase_order(osv.osv):
         'invoiced': lambda *a: 0,
         'partner_address_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['default'])['default'],
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', c)
     }
     _name = "purchase.order"
     _description = "Purchase order"
@@ -448,6 +449,7 @@ class purchase_order_line(osv.osv):
         'notes': fields.text('Notes'),
         'order_id': fields.many2one('purchase.order', 'Order Ref', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
+        'company_id': fields.related('order_id','company_id',type='many2one',object='res.company',string='Company')
     }
     _defaults = {
         'product_qty': lambda *a: 1.0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b2ee4b984ee..717b5d4540e 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -254,7 +254,7 @@ class sale_order(osv.osv):
 
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position')
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
     }
     _defaults = {
         'picking_policy': lambda *a: 'direct',
@@ -767,6 +767,7 @@ class sale_order_line(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'Status', required=True, readonly=True),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id','user_id',type='many2one',relation='res.users',string='Salesman'),
+        'company_id': fields.related('order_id','company_id',type='many2one',object='res.company',string='Company')
     }
     _order = 'sequence, id'
     _defaults = {

From 6806d791846ad33bac6809de2400ba651647e262 Mon Sep 17 00:00:00 2001
From: gpa <gpa@gpa-desktop>
Date: Fri, 20 Nov 2009 19:19:13 +0530
Subject: [PATCH 06/59] [IMP] ir_sequence,res_company,res_currency objects
 related to company_id.

bzr revid: gpa@gpa-desktop-20091120134913-yeksffwd05mlrwoi
---
 bin/addons/base/ir/ir_sequence.py   | 1 +
 bin/addons/base/res/res_company.py  | 4 ++++
 bin/addons/base/res/res_currency.py | 1 +
 3 files changed, 6 insertions(+)

diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py
index c0d23602f40..f1334b6996a 100644
--- a/bin/addons/base/ir/ir_sequence.py
+++ b/bin/addons/base/ir/ir_sequence.py
@@ -53,6 +53,7 @@ class ir_sequence(osv.osv):
         'number_increment': lambda *a: 1,
         'number_next': lambda *a: 1,
         'padding' : lambda *a : 0,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'ir.sequence', c)
     }
 
     def _process(self, s):
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index 64ca3096179..3d481cdfa6d 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -41,6 +41,10 @@ class res_company(osv.osv):
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency')
     }
     
+    
+    def _company_default_get(self, cr, uid, object=False, context={}):
+        return self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+    
     def _get_child_ids(self, cr, uid, uid2, context={}):
         company = self.pool.get('res.users').company_get(cr, uid, uid2)
         ids = self._get_company_children(cr, uid, company)
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index ecec7162316..554fcdaadd7 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -64,6 +64,7 @@ class res_currency(osv.osv):
     }
     _defaults = {
         'active': lambda *a: 1,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'res.currency', c)
     }
     _order = "code"
 

From 2db02e44908cddfc2297682b81f7eeb15754e4b1 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Sat, 21 Nov 2009 11:27:41 +0530
Subject: [PATCH 07/59] [FIX]: Using 'State' instead of 'Status'.

bzr revid: uco@tinyerp.co.in-20091121055741-tb3y84j1dd352jg9
---
 addons/account/process/customer_invoice_process.xml         | 4 ++--
 addons/account/process/statement_process.xml                | 2 +-
 addons/account/process/supplier_invoice_process.xml         | 4 ++--
 .../process/hr_timesheet_sheet_process.xml                  | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 544669c96d8..8775abc5bcc 100755
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -43,7 +43,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice's status is Open&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's state is Open&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -98,7 +98,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Paid invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice's status is Done&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's state is Done&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 40b6ba28cf6..862c928cfa3 100755
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -54,7 +54,7 @@
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Status is draft&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;State is draft&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 5823e7acbb6..0ef7fb0d297 100755
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -43,7 +43,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice's status is Open&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's state is Open&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -98,7 +98,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Paid invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice's status is Done.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's state is Done.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 11509e0628e..b94b17b5ab6 100755
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -98,7 +98,7 @@
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Status is draft.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;State is draft.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -109,7 +109,7 @@
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Confirmed Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Status is confirmed.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;State is confirmed.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirm'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -120,7 +120,7 @@
             <field name="model_id" ref="hr_timesheet_sheet.model_hr_timesheet_sheet_sheet"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Validated Timesheet&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Status is validated.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;State is validated.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_hrtimesheetprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>

From 50ee2493f4b656799aa5ac01ae9d8cd4b14cbae3 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 23 Nov 2009 10:59:17 +0530
Subject: [PATCH 08/59] [IMP]: remove all menus (and their related actions) and
 keep

bzr revid: uco@tinyerp.co.in-20091123052917-bj8x7mvtyqt41w72
---
 addons/account/account_invoice_view.xml       | 22 -----------------
 addons/account/account_view.xml               |  4 ----
 .../process/customer_invoice_process.xml      |  2 +-
 .../process/supplier_invoice_process.xml      |  2 +-
 addons/account/project/project_view.xml       |  1 -
 .../account_analytic_analysis_menu.xml        |  6 -----
 addons/account_payment/payment_view.xml       |  5 ----
 addons/account_voucher/voucher_view.xml       | 24 ++++++++-----------
 addons/auction/auction_view.xml               | 21 ++++------------
 addons/audittrail/audittrail_view.xml         |  4 ++--
 addons/crm/crm_view.xml                       |  2 --
 addons/delivery/delivery_view.xml             |  1 -
 addons/event/event_view.xml                   | 19 ++-------------
 addons/hr_holidays/hr_view.xml                |  9 -------
 addons/hr_timesheet/hr_timesheet_view.xml     |  2 --
 .../hr_timesheet_invoice_view.xml             | 22 ++---------------
 .../hr_timesheet_sheet_view.xml               |  6 -----
 addons/idea/idea_view.xml                     | 13 ----------
 addons/membership/membership_view.xml         | 23 ++++--------------
 addons/mrp/mrp_view.xml                       | 16 ++-----------
 .../mrp/process/stockable_product_process.xml |  2 +-
 addons/mrp_operations/mrp_operations_view.xml |  3 ---
 addons/mrp_repair/mrp_repair_view.xml         | 15 ++++--------
 addons/point_of_sale/pos_view.xml             | 16 ++++++-------
 addons/project/project_view.xml               | 16 -------------
 addons/purchase/process/purchase_process.xml  | 14 +++++------
 addons/purchase/purchase_view.xml             |  4 ----
 addons/sale/process/sale_process.xml          | 12 +++++-----
 addons/sale/sale_view.xml                     | 14 ++---------
 addons/sale_journal/sale_journal_view.xml     |  6 ++---
 addons/scrum/scrum_view.xml                   |  7 ++----
 addons/stock/stock_view.xml                   | 13 +---------
 addons/wiki/wiki_view.xml                     |  6 +----
 33 files changed, 61 insertions(+), 271 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 40991fa0320..329115e8fb0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -391,7 +391,6 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
         </record>
-        <menuitem action="action_invoice_tree1_new" sequence="50" id="menu_action_invoice_tree1_new" parent="menu_action_invoice_tree1"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
             <field name="name">Supplier Invoices</field>
@@ -413,7 +412,6 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
         </record>
-        <menuitem action="action_invoice_tree2_new" sequence="50" id="menu_action_invoice_tree2_new" parent="menu_action_invoice_tree2"/>
 
         <record id="action_invoice_tree3" model="ir.actions.act_window">
             <field name="name">Customer Refunds</field>
@@ -436,7 +434,6 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
         </record>
-        <menuitem action="action_invoice_tree3_new" sequence="50" id="menu_action_invoice_tree3_new" parent="menu_action_invoice_tree3"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
             <field name="name">Supplier Refunds</field>
@@ -459,7 +456,6 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
         </record>
-        <menuitem action="action_invoice_tree4_new" sequence="50" id="menu_action_invoice_tree4_new" parent="menu_action_invoice_tree4"/>
 
 
         <record id="action_invoice_tree5" model="ir.actions.act_window">
@@ -484,8 +480,6 @@
             <field name="act_window_id" ref="action_invoice_tree5"/>
         </record>
 
-        <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree6" model="ir.actions.act_window">
             <field name="name">PRO-FORMA Customer Invoices</field>
             <field name="res_model">account.invoice</field>
@@ -508,8 +502,6 @@
             <field name="act_window_id" ref="action_invoice_tree6"/>
         </record>
 
-        <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree7" model="ir.actions.act_window">
             <field name="name">Unpaid Customer Invoices</field>
             <field name="res_model">account.invoice</field>
@@ -532,8 +524,6 @@
             <field name="act_window_id" ref="action_invoice_tree7"/>
         </record>
 
-        <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree8" model="ir.actions.act_window">
             <field name="name">Draft Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
@@ -556,8 +546,6 @@
             <field name="act_window_id" ref="action_invoice_tree8"/>
         </record>
 
-        <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree9" model="ir.actions.act_window">
             <field name="name">Unpaid Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
@@ -580,8 +568,6 @@
             <field name="act_window_id" ref="action_invoice_tree9"/>
         </record>
 
-        <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree10" model="ir.actions.act_window">
             <field name="name">Draft Customer Refunds</field>
             <field name="res_model">account.invoice</field>
@@ -604,8 +590,6 @@
             <field name="act_window_id" ref="action_invoice_tree10"/>
         </record>
 
-        <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree11" model="ir.actions.act_window">
             <field name="name">Unpaid Customer Refunds</field>
             <field name="res_model">account.invoice</field>
@@ -628,8 +612,6 @@
             <field name="act_window_id" ref="action_invoice_tree11"/>
         </record>
 
-        <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree12" model="ir.actions.act_window">
             <field name="name">Draft Supplier Refunds</field>
             <field name="res_model">account.invoice</field>
@@ -652,8 +634,6 @@
             <field name="act_window_id" ref="action_invoice_tree12"/>
         </record>
 
-        <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/>
-
         <record id="action_invoice_tree13" model="ir.actions.act_window">
             <field name="name">Unpaid Supplier Refunds</field>
             <field name="res_model">account.invoice</field>
@@ -676,8 +656,6 @@
             <field name="act_window_id" ref="action_invoice_tree13"/>
         </record>
 
-        <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/>
-
         <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
         <act_window domain="[('journal_id','=',active_id),('state','!=','draft'),('reconciled','=',False)]" id="act_account_journal_2_account_invoice_opened" name="Unpaid invoices" res_model="account.invoice" src_model="account.journal"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1e25c23e7e3..4bcb13af0b3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -390,7 +390,6 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_extended_menu"/>
 
         <record id="action_bank_statement_tree2" model="ir.actions.act_window">
             <field name="name">New Statement</field>
@@ -398,7 +397,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="action_bank_statement_tree2" id="menu_bank_statement_tree2" parent="menu_bank_statement_tree"/>
 
         <record id="view_bank_statement_reconcile" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
@@ -1343,7 +1341,6 @@
             <field name="domain">[('state','=','running')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_extended_menu"/>
 
         <record id="action_subscription_form_new" model="ir.actions.act_window">
             <field name="name">New Subscription</field>
@@ -1352,7 +1349,6 @@
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="view_subscription_form"/>
         </record>
-        <menuitem action="action_subscription_form_new" id="menu_action_subscription_form_new" parent="menu_action_subscription_form"/>
 
         <record id="view_subscription_line_form_complete" model="ir.ui.view">
             <field name="name">account.subscription.line.form</field>
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index acdce086ee4..31d79a29971 100755
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -28,7 +28,7 @@
         </record>
         
         <record id="process_node_draftinvoices0" model="process.node">
-            <field name="menu_id" ref="account.menu_invoice_draft"/>
+            <field name="menu_id" ref="account.menu_action_invoice_tree1_new"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 8611dd6eb07..778530a3930 100755
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -28,7 +28,7 @@
         </record>
         
         <record id="process_node_supplierdraftinvoices0" model="process.node">
-            <field name="menu_id" ref="account.menu_invoice_draft"/>
+            <field name="menu_id" ref="account.menu_action_invoice_tree2"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 71bb124109d..dba8b0f1b30 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -116,7 +116,6 @@
             <field name="view_mode">form,tree,graph</field>
             <field eval="view_account_analytic_account_form" name="view_id"/>
         </record>
-        <menuitem action="analytic_account_form" id="account_analytic_form" parent="account.account_analytic_def_account"/>
 
         <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index cd2148c7255..e6fb188789e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -46,8 +46,6 @@
             <field name="filter" eval="True"/>            
         </record>
 
-        <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended_menu"/>
-
         <record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
             <field name="name">My Pending Accounts</field>
             <field name="res_model">account.analytic.account</field>
@@ -57,8 +55,6 @@
             <field name="filter" eval="True"/>            
         </record>
 
-        <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended_menu"/>
-
         <record id="action_account_analytic_new" model="ir.actions.act_window">
             <field name="name">New Analytic Account</field>
             <field name="res_model">account.analytic.account</field>
@@ -105,7 +101,6 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all" groups="base.group_extended_menu"/>
 
         <record id="action_account_analytic_all_pending" model="ir.actions.act_window">
             <field name="name">Pending Analytic Accounts</field>
@@ -116,7 +111,6 @@
             <field name="domain">[('state','=','pending')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all" groups="base.group_extended_menu"/>
 
     </data>
 </openerp>
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index b1ad3d54f53..df1e25a419c 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -192,7 +192,6 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_payment_order_draft" id="menu_action_payment_order_draft" parent="account_payment.menu_action_payment_order_form" sequence="2" groups="base.group_extended_menu"/>
 
         <record id="action_payment_order_open" model="ir.actions.act_window">
             <field name="name">Payment Orders to Validate</field>
@@ -202,16 +201,12 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="3" groups="base.group_extended_menu"/>
-
         <record id="action_payment_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Payment Order</field>
             <field name="res_model">payment.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="action_payment_order_tree_new" id="menu_action_payment_order_form_new" parent="account_payment.menu_action_payment_order_form" sequence="1"/>
-
 
         <record id="view_payment_line_form" model="ir.ui.view">
             <field name="name">Payment Line</field>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 11858390e97..16fabe0e8c2 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -101,9 +101,8 @@
 			<field name="view_id" eval="view_voucher_tree"/>
 			<field name="domain">[('type','=','rec_voucher')]</field>
 			<field name="context">{'type':'rec_voucher'}</field>
+			<field name="filter" eval="True"/>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts" 
-		id="menu_action_receipt_cashreceipt_voucher_list" action="action_receipt_cashreceipt_voucher_list"/>
 				
 		<record model="ir.actions.act_window" id="action_view_cash_rec_voucher_form">
 			<field name="name">Cash Receipt Voucher</field>
@@ -114,7 +113,7 @@
 			<field name="domain">[('type','=','rec_voucher')]</field>
 			<field name="context">{'type':'rec_voucher'}</field>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts/New Cash Receipt" id="menu_action_view_cash_rec_voucher_form" action="action_view_cash_rec_voucher_form"/>
+		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/New Cash Receipt" id="menu_action_view_cash_rec_voucher_form" action="action_view_cash_rec_voucher_form"/>
 		
 		<record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
 			<field name="name">Bank Receipt</field>
@@ -124,9 +123,8 @@
 			<field name="view_id" eval="view_voucher_tree"/>
 			<field name="domain">[('type','=','bank_rec_voucher')]</field>
 			<field name="context">{'type':'bank_rec_voucher'}</field>
+			<field name="filter" eval="True"/>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts" 
-		id="menu_action_receipt_bakreceipt_voucher_list" action="action_receipt_bakreceipt_voucher_list"/>
 		
 		<record model="ir.actions.act_window" id="action_view_bank_rec_voucher_form">
 			<field name="name">Bank Receipt Voucher</field>
@@ -137,7 +135,7 @@
 			<field name="domain">[('type','=','bank_rec_voucher')]</field>
 			<field name="context">{'type':'bank_rec_voucher'}</field>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts/New Bank Receipt" id="menu_action_view_bank_rec_voucher_form" action="action_view_bank_rec_voucher_form"/>
+		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/New Bank Receipt" id="menu_action_view_bank_rec_voucher_form" action="action_view_bank_rec_voucher_form"/>
 		
 		
 		<!--  End Receipt Vouchers -->
@@ -157,16 +155,15 @@
 		id="menu_action_payments_voucher_list" action="action_payments_voucher_list"/>
 		
 		<record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
-			<field name="name">Payment Vouchers</field>
+			<field name="name">Cash Payment Vouchers</field>
 			<field name="res_model">account.voucher</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" eval="view_voucher_tree"/>
 			<field name="domain">[('type','=','pay_voucher')]</field>
 			<field name="context">{'type':'pay_voucher'}</field>
+			<field name="filter" eval="True"/>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments" 
-		id="menu_action_payments_cashpay_voucher_list" action="action_payments_cashpay_voucher_list"/>
 		
 		<record model="ir.actions.act_window" id="action_view_cash_pay_voucher_form">
 			<field name="name">Cash Payment Voucher</field>
@@ -177,19 +174,18 @@
 			<field name="domain">[('type','=','pay_voucher')]</field>
 			<field name="context">{'type':'pay_voucher'}</field>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments/New Cash Payment" id="menu_action_view_cash_pay_voucher_form" action="action_view_cash_pay_voucher_form"/>
+		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/New Cash Payment" id="menu_action_view_cash_pay_voucher_form" action="action_view_cash_pay_voucher_form"/>
 	
 		<record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
-			<field name="name">Payment Vouchers</field>
+			<field name="name">Bank Payment Vouchers</field>
 			<field name="res_model">account.voucher</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" eval="view_voucher_tree"/>
 			<field name="domain">[('type','=','bank_pay_voucher')]</field>
 			<field name="context">{'type':'bank_pay_voucher'}</field>
+			<field name="filter" eval="True"/>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments" 
-		id="menu_action_payments_bankpay_voucher_list" action="action_payments_bankpay_voucher_list"/>
 		
 		<record model="ir.actions.act_window" id="action_view_bank_pay_voucher_form">
 			<field name="name">Bank Payment Voucher</field>
@@ -200,7 +196,7 @@
 			<field name="domain">[('type','=','bank_pay_voucher')]</field>
 			<field name="context">{'type':'bank_pay_voucher'}</field>
 		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments/New Bank Payment" id="menu_action_view_bank_pay_voucher_form" action="action_view_bank_pay_voucher_form"/>
+		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/New Bank Payment" id="menu_action_view_bank_pay_voucher_form" action="action_view_bank_pay_voucher_form"/>
 		
 		<!-- End Payment Vouchers -->
 		
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 39217968ef7..80aa0f69bad 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -138,8 +138,8 @@
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','closed')]</field>
 		<field name="view_id" ref="view_auction_dates_tree"/>
+		<field name="filter" eval="True"/>
 	</record>
-	<menuitem parent="auction_date_menu" name="Old Auction Dates" id="menu_auction_dates_old" action="action_auction_dates_old"/>
 
 	<record model="ir.actions.act_window" id="action_auction_dates1">
 		<field name="res_model">auction.dates</field>
@@ -366,6 +366,7 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="action_all_objects_sold">
+		<field name="name">Sold Objects</field>
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="domain">[('state','=','sold')]</field>
@@ -375,26 +376,23 @@
 	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu"/>
 	<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
 
-	<menuitem name="Sold Objects" parent="auction_all_objects_menu" action="action_all_objects_sold" id="menu_all_objects_sold1" groups="base.group_extended_menu"/>
-
 	<record model="ir.actions.act_window" id="action_all_objects_to_sell">
+		<field name="name">Objects to sell</field>
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','&lt;&gt;','sold')]</field>
         <field name="filter" eval="True"/>		
 	</record>
-	<menuitem name="Objects to sell" parent="auction_all_objects_menu" action="action_all_objects_to_sell" id="menu_all_objects_to_sell" groups="base.group_extended_menu"/>
 
 	<record model="ir.actions.act_window" id="action_all_objects_unplanned">
+		<field name="name">Unplanned objects</field>
 		<field name="res_model">auction.lots</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
         <field name="filter" eval="True"/>		
 	</record>
-	<menuitem name="Unplanned objects" parent="auction_all_objects_menu" action="action_all_objects_unplanned" id="menu_all_objects_unplanned1" groups="base.group_extended_menu"/>
-
 
 	<!--		for the sold object  start-->
 
@@ -405,14 +403,6 @@
 		<field name="domain">[('state','=','unsold')]</field>
         <field name="filter" eval="True"/>		
 	</record>
-	<menuitem
-		name="Unsold Objects"
-		parent="auction_all_objects_menu"
-		action="action_all_objects_unsold"
-		id="menu_all_objects_unsold"
-		groups="base.group_extended_menu"/>
-
-
 
 	<!-- form3: simplified form meant for during the sale (action button in dates) -->
 	<!--form par defaut-->
@@ -486,7 +476,6 @@
 		<field name="view_mode">tree,form</field>
         <field name="filter" eval="True"/>		
 	 </record>
-	 <menuitem name="Unclassified objects" parent="auction_all_objects_menu" action="action_unclassified_objects" id="menu_all_objects_unclassified" groups="base.group_extended_menu"/>
 
 	<record model="ir.ui.view" id="v12">
 		<field name="name">Auction.deposit.tree</field>
@@ -501,8 +490,6 @@
 		</field>
 	</record>
 
-
-
 	<record model="ir.ui.view" id="view_deposit_border_form">
 		<field name="name">auction.deposit.form</field>
 		<field name="model">auction.deposit</field>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 076e5ef830e..98a4ecc00e9 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -53,13 +53,13 @@
 
 
 		<record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
-			<field name="name">Rules</field>
+			<field name="name">Subscribed Rules</field>
 			<field name="res_model">audittrail.rule</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="domain">[('state','=','subscribed')]</field>
+			<field name="filter" eval="True"/>
 		</record>
-		<menuitem name="Subscribed Rules" id="menu_action_audittrail_rule_tree_sub" action="action_audittrail_rule_tree_sub" parent="menu_action_audittrail_rule_tree"/>
 
 		<record model="ir.ui.view" id="view_audittrail_log_form">
 			<field name="name">audittrail.log.form</field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 80a08c87fc2..f9f1614ce69 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -481,7 +481,6 @@
             <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_extended_menu"/>
 
         <record id="crm_case_categ0-act_my" model="ir.actions.act_window">
             <field name="name">My cases</field>
@@ -500,7 +499,6 @@
             <field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_extended_menu"/>
 
         <record id="crm_case_section_open_act" model="ir.actions.act_window">
             <field name="name">crm.case.section.open</field>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index d05aa480367..2c83fef3ec6 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -168,7 +168,6 @@
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
         </record>
-        <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree5" model="ir.actions.act_window">
             <field name="name">Generate Draft Invoices On Receptions</field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1df91d87cbc..06164b44bcb 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -146,10 +146,7 @@
 			<field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>			
 		</record>
-		<menuitem
-			parent="menu_event_event"
-			id="menu_event_event_draft"
-            action="action_event_view_draft" groups="base.group_extended_menu"/>
+
 		<record model="ir.actions.act_window" id="action_event_view_confirm">
 			<field name="name">Confirmed Events</field>
 			<field name="type">ir.actions.act_window</field>
@@ -157,10 +154,6 @@
 			<field name="domain">[('state','=','confirm')]</field>
             <field name="filter" eval="True"/>			
 		</record>
-		<menuitem parent="menu_event_event"
-			id="menu_event_event_confirm"
-            action="action_event_view_confirm" groups="base.group_extended_menu"/>
-
 
 	<!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
@@ -304,10 +297,7 @@
 		  <field name="view_mode">tree,form</field>
           <field name="filter" eval="True"/>		  
 		</record>
-		<menuitem
-			parent="menu_action_registration"
-			id="menu_action_registration_draft"
-            action="action_registration_draft" groups="base.group_extended_menu"/>
+
 		<record model="ir.actions.act_window" id="action_registration_confirm">
 		  <field name="name">Confirmed Registrations</field>
 		  <field name="res_model">event.registration</field>
@@ -315,11 +305,6 @@
 		  <field name="domain">[('state','in',('open','done'))]</field>
           <field name="filter" eval="True"/>		  
 		</record>
-		<menuitem
-			parent="menu_action_registration"
-			id="menu_action_registration_confirm"
-            action="action_registration_confirm" groups="base.group_extended_menu"/>
-
 
 	<!-- report , event on registration... start -->
 		<record model="ir.ui.view" id="report_event_registration_tree">
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 3b87ba5a29a..911b6c4a54a 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -266,8 +266,6 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" groups="base.group_extended_menu" />
-
         <record model="ir.actions.act_window" id="action_my_holiday_waiting">
             <field name="name">My Awaiting Confirmation Leave Requests</field>
             <field name="type">ir.actions.act_window</field>
@@ -278,7 +276,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" groups="base.group_extended_menu" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_validate">
             <field name="name">My Validated Leave Requests</field>
@@ -290,7 +287,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" groups="base.group_extended_menu" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_refuse">
             <field name="name">My Refused Leave Requests</field>
@@ -302,8 +298,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" groups="base.group_extended_menu" />
-
 
         <record model="ir.actions.act_window" id="action_departments_my_holiday">
             <field name="name">My Department's Leave Requests</field>
@@ -328,8 +322,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_departments_holiday" id="menu_action_my_departments_holiday_waiting" action="action_my_departments_holiday_waiting" groups="base.group_extended_menu" />
-
 
 
         <record model="ir.actions.act_window" id="action_holiday_waiting">
@@ -342,7 +334,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" groups="base.group_extended_menu" />
 
 
     <!--  Shortcuts -->
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 25b4a13c541..49ba1d602ad 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -83,7 +83,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>                        
         </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form" groups="base.group_extended_menu"/>
  
         
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
@@ -110,7 +109,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form" groups="base.group_extended_menu"/>
        
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index c2e4877a7bd..c363a4172e5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -108,18 +108,14 @@
         </record>
         <menuitem action="action_hr_analytic_timesheet_open_tree" id="menu_hr_analytic_timesheet_tree" parent="account.menu_finance_periodical_processing"/>
 
-
-
         <record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
             <field name="name">Uninvoiced Entries</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
+            <field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_hr_analytic_timesheet_tree_invoiced" id="menu_hr_analytic_timesheet_tree_invoiced" parent="menu_hr_analytic_timesheet_tree"/>
-
-
 
         <record id="action_hr_analytic_timesheet_tree_invoiced_my" model="ir.actions.act_window">
             <field name="name">My Uninvoiced Entries</field>
@@ -127,9 +123,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
+        	<field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_hr_analytic_timesheet_tree_invoiced_my" id="menu_hr_analytic_timesheet_tree_invoiced_my" parent="menu_hr_analytic_timesheet_tree"/>
-
 
         <record id="action_open_analytic_accounts" model="ir.actions.act_window">
             <field name="name">Open Analytic Accounts</field>
@@ -138,8 +133,6 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem action="action_open_analytic_accounts" id="menu_action_open_analytic_accounts" parent="account.account_analytic_def_chart"/>
-
 
         <record id="action_open_invoice_analytic_accounts" model="ir.actions.act_window">
             <field name="name">Unclosed Invoiceable Accounts</field>
@@ -148,9 +141,6 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','&lt;&gt;','close'),('type','&lt;&gt;','view'),('pricelist_id','&lt;&gt;',False)]</field>
         </record>
-        <menuitem action="action_open_invoice_analytic_accounts" id="menu_action_open_invoice_analytic_accounts" parent="hr_timesheet_invoice.menu_action_open_analytic_accounts"/>
-
-
 
         <record id="action_draft_analytic_accounts" model="ir.actions.act_window">
             <field name="name">Draft Analytic Accounts</field>
@@ -159,9 +149,6 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem action="action_draft_analytic_accounts" id="menu_action_draft_analytic_accounts" parent="account.account_analytic_def_chart"/>
-
-
 
         <record id="action_pending_analytic_accounts" model="ir.actions.act_window">
             <field name="name">Pending Analytic Accounts</field>
@@ -170,11 +157,6 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','pending'),('type','&lt;&gt;','view')]</field>
         </record>
-        <menuitem action="action_pending_analytic_accounts" id="menu_action_pending_analytic_accounts" parent="account.account_analytic_def_chart"/>
-
-
-
-
 
         <record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
             <field name="name">hr_timesheet_invoice.factor.form</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 7c54db176b1..0bc345324a0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -224,7 +224,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" groups="base.group_extended_menu"/>
 
         <record id="act_hr_timesheet_sheet_form_my_department" model="ir.actions.act_window">
             <field name="name">My Department's Timesheets</field>
@@ -248,7 +247,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_confirm_department" id="menu_act_hr_timesheet_sheet_form_my_confirm_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended_menu"/>
 
         <record id="act_hr_timesheet_sheet_form_my_validate_department" model="ir.actions.act_window">
             <field name="name">My Department's Timesheets to Validate</field>
@@ -260,7 +258,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_validate_department" id="menu_act_hr_timesheet_sheet_form_my_validate_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended_menu"/>
         
         <wizard id="act_hr_timesheet_sheet_form_my_current" model="hr.employee" name="hr_timesheet_sheet.current.open" string="My Current Timesheet"/>
 
@@ -276,7 +273,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended_menu"/>
         
         <record id="act_hr_timesheet_sheet_form_all_valid" model="ir.actions.act_window">
             <field name="name">Timesheets To Validate</field>
@@ -288,7 +284,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended_menu"/>
         
         <!--
             Company inheritancy
@@ -386,6 +381,5 @@
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
         
-        <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended_menu"/>
     </data>
 </openerp>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index d0f5388be64..9c599dc6521 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -193,8 +193,6 @@
         <field name="domain">[('state','=','open')]</field>
         <field name="filter" eval="True"/>        
     </record>
-    <menuitem name="Open Ideas" parent="menu_idea_idea" id="menu_idea_idea_open" action="action_idea_idea_open" groups="base.group_extended_menu" />
-
 
     <record model="ir.actions.act_window" id="action_idea_idea_my_idea">
         <field name="name">My Ideas</field>
@@ -213,11 +211,6 @@
         <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
         <field name="filter" eval="True"/>        
     </record>
-    <menuitem 
-        name="My Draft Ideas" parent="menu_idea_idea_my_idea"
-        id="menu_idea_idea_draft_my" 
-        action="action_idea_idea_draft_my"
-        groups="base.group_extended_menu" />
 
     <record model="ir.actions.act_window" id="action_idea_idea_open_my">
         <field name="name">My Open Ideas</field>
@@ -227,12 +220,6 @@
         <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
         <field name="filter" eval="True"/>        
     </record>
-    <menuitem 
-        name="My Open Ideas" parent="menu_idea_idea_my_idea"
-        id="menu_idea_idea_open_my"
-        action="action_idea_idea_open_my"
-        groups="base.group_extended_menu"
-        />
 
         <record model="ir.ui.view" id="view_idea_vote_stat_graph">
             <field name="name">idea.vote_stat.graph</field>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index b126dbd537e..236cb3d9769 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -137,6 +137,7 @@
             <field name="name">Paid members</field>
             <field name="res_model">res.partner</field>
             <field name="domain">[('membership_state', '=', 'paid')]</field>
+        	<field name="filter" eval="True"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_paid_view_tree">
@@ -152,10 +153,6 @@
             <field name="act_window_id" ref="action_membership_members_paid"/>
         </record>
 
-        <menuitem name="Paid members" parent="menu_members"
-            id="menu_members_paid"
-            action="action_membership_members_paid"/>
-
 
         <!-- MEMBERSHIP/MEMBERS/FREE MEMBERS  -->
 
@@ -163,6 +160,7 @@
             <field name="name">Free members</field>
             <field name="res_model">res.partner</field>
             <field name="domain">[('membership_state', '=', 'free')]</field>
+        	<field name="filter" eval="True"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_free_view_tree">
@@ -178,13 +176,6 @@
             <field name="act_window_id" ref="action_membership_members_free"/>
         </record>
 
-        <menuitem name="Free members" parent="menu_members"
-            id="menu_members_free"
-            action="action_membership_members_free"/>
-
-
-
-
         <!-- MEMBERSHIP/MEMBERS/ASSOCIATED MEMBERS  -->
         <record model="ir.ui.view" id="membership_members_associated_tree">
             <field name="name">associate members</field>
@@ -205,6 +196,7 @@
             <field name="name">Associated members</field>
             <field name="res_model">res.partner</field>
             <field name="domain">[('associate_member', '!=', False), ('membership_state', '!=', 'none')]</field>
+        	<field name="filter" eval="True"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_associated_view_tree">
@@ -220,10 +212,6 @@
             <field name="act_window_id" ref="action_membership_members_associated"/>
         </record>
 
-        <menuitem name="Associated members" parent="menu_members"
-            id="menu_members_associated"
-            action="action_membership_members_associated"/>
-
 
         <!-- MEMBERSHIP/MEMBERS/INVOICED MEMBERS  -->
 
@@ -231,6 +219,7 @@
             <field name="name">Invoiced members</field>
             <field name="res_model">res.partner</field>
             <field name="domain">[('membership_state', '=', 'invoiced')]</field>
+            <field name="filter" eval="True"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_membership_members_invoiced_view_tree">
@@ -246,10 +235,6 @@
             <field name="act_window_id" ref="action_membership_members_invoiced"/>
         </record>
 
-        <menuitem name="Invoiced members" parent="menu_members"
-            id="menu_members_invoiced"
-            action="action_membership_members_invoiced"/>
-
 
         <!-- MEMBERSHIP/MEMBERS/FUTURE MEMBERS  -->
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b180dbcb076..b617d11afb2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -557,11 +557,6 @@
             <field name="view_mode">gantt,tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
         </record>
-        <menuitem
-            action="mrp_production_action2_gantt"
-            id="menu_production_orders_start_gantt"
-            parent="menu_mrp_production_action"
-            sequence="20" icon="terp-calendar"/>
 
         <record id="mrp_production_action2" model="ir.actions.act_window">
             <field name="name">Production Orders To Start</field>
@@ -573,7 +568,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_extended_menu" />
+        
         <record id="mrp_production_action3" model="ir.actions.act_window">
             <field name="name">Production Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -584,7 +579,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_extended_menu"/>
+        
         <record id="mrp_production_action4" model="ir.actions.act_window">
             <field name="name">Production Orders Waiting Products</field>
             <field name="type">ir.actions.act_window</field>
@@ -595,7 +590,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_extended_menu"/>
 
          <record id="mrp_production_new" model="ir.actions.act_window">
             <field name="name">New Production Order</field>
@@ -604,7 +598,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree,calendar,graph,gantt</field>
         </record>
-        <menuitem action="mrp_production_new" id="menu_production_orders_new" parent="mrp.menu_mrp_production_action"/>
 
         <record id="mrp_production_lot_form_view" model="ir.ui.view">
             <field name="name">mrp.production.lot.line.form</field>
@@ -783,7 +776,6 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
-        <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_extended_menu"/>
 
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
             <field name="name">Exceptions Procurements</field>
@@ -793,7 +785,6 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
         </record>
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_extended_menu"/>
 
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Exceptions Procurements to Fix</field>
@@ -804,7 +795,6 @@
             <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
             <field name="filter" eval="True"/>
         </record>
-        <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended_menu"/>
 
         <record id="mrp_procurement_action11" model="ir.actions.act_window">
             <field name="name">Temporary Procurement Exceptions</field>
@@ -814,7 +804,6 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
         </record>
-        <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended_menu"/>
 
          <record id="mrp_procurement_new" model="ir.actions.act_window">
             <field name="name">New Procurement</field>
@@ -823,7 +812,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action"/>
 
         <!-- Order Point -->
         <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 34ff93d3228..a90c3e95a00 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -39,7 +39,7 @@
 		</record>
 		
 		<record id="process_node_rfq0" model="process.node">
-			<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+			<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
 			<field name="model_id" ref="purchase.model_purchase_order"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;A Request for Quotation is created and sent to the supplier.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 7341c31c8d5..2176afc0cee 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -176,9 +176,6 @@
     </record>
 
     <menuitem name="All Work Orders" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
-    <menuitem name="Work Orders to Do" parent="menu_mrp_production_wc_action" action="mrp_production_wc_confirm_action" id="menu_mrp_production_wc_confirm_action"/>
-    <menuitem name="Future Work Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/>
-    <menuitem parent="menu_mrp_production_wc_action" action="mrp_production_wc_action_planning" id="menu_mrp_production_wc_draft_action_planning"/>
 
 <!-- Operation codes -->
 
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index cd73b312fd9..6ee19b291d2 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -191,6 +191,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
+        	<field name="filter" eval="True"/>
         </record>
 
         <record id="action_repair_progress_tree" model="ir.actions.act_window">
@@ -200,6 +201,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','under_repair')]</field>
+        	<field name="filter" eval="True"/>
         </record>
 
         <record id="action_repair_ready_tree" model="ir.actions.act_window">
@@ -209,6 +211,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','!=','draft'),('state','!=','under_repair'),('state','!=','2binvoiced'),('state','!=','invoice_except'),('state','!=','done'),('state','!=','cancel'),]</field>
+        	<field name="filter" eval="True"/>
         </record>
 
         <record id="action_repair_2binvoiced_tree" model="ir.actions.act_window">
@@ -218,20 +221,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','2binvoiced')]</field>
+            <field name="filter" eval="True"/>
         </record>
 
         <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs"/>
 
-        <menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
-
-        <menuitem action="action_repair_progress_tree" id="menu_repair_progress" parent="menu_repair_order"/>
-
-        <menuitem action="action_repair_ready_tree" id="menu_repair_ready" parent="menu_repair_order"/>
-
-    	<menuitem action="action_repair_2binvoiced_tree" id="menu_repair_2binvoiced" parent="menu_repair_order"/>
-
-    	<menuitem action="action_repair_order_form" id="menu_repair_form" parent="menu_repair_order" sequence = "50"/>
-
-
     </data>
 </openerp>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index ddd8c7c4bee..8390d25186e 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -141,7 +141,7 @@
             </field>
         </record>
         <menuitem name="Point of Sale" id="menu_point_root" />
-        <menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_pos_form"/>
+        <menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_order_tree2"/>
         <wizard 
             string="Wizard default journals"
             model="pos.config.journal"
@@ -170,27 +170,25 @@
         <!-- 	<menuitem name="Point of Sale/Point of Sale/Orders not invoiced" id="menu_action_pos_order_tree" action="action_pos_order_tree"/> -->
 
         <record model="ir.actions.act_window" id="action_pos_order_tree2">
-            <field name="name">Point of Sale</field>
+            <field name="name">Orders of the day</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="filter" eval="True"/>
             <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-%d')),('date_order','&lt;=',time.strftime('%Y-%m-%d'))]</field>
         </record>
 
-        <menuitem name="Orders of the day" parent="menu_point_ofsale" id="menu_action_pos_order_tree2" action="action_pos_order_tree2"/>
-
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
-            <field name="name">Point of Sale</field>
+            <field name="name">All orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_pos_order_tree"/>
+            <field name="filter" eval="True"/>
         </record>
-        <menuitem name="All orders" parent="menu_point_ofsale" id="menu_action_pos_order_tree3" action="action_pos_order_tree3"/>
-
 
         <record model="ir.ui.view" id="view_pos_order_line">
             <field name="name">Sale lines</field>
@@ -235,15 +233,15 @@
         <menuitem name="POS Lines" parent="menu_point_root" id="menu_action_pos_order_line" action="action_pos_order_line"/>
 
         <record model="ir.actions.act_window" id="action_pos_order_line_day">
-            <field name="name">Sale line</field>
+            <field name="name">POS Lines of the day</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="view_pos_order_line"/>
+			<field name="filter" eval="True"/>
             <field name="domain">[('create_date', '&gt;=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
         </record>
-        <menuitem name="POS Lines of the day" parent="menu_action_pos_order_line" id="menu_action_pos_order_line_day" action="action_pos_order_line_day"/>
 
 
         <!-- report -->
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 22ecbfb7088..d837af47d97 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -163,7 +163,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <menuitem action="open_view_project_open" id="menu_open_view_project_open" groups="base.group_extended_menu" parent="menu_open_view_project_all"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
@@ -248,11 +247,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <menuitem
-            action="open_view_my_project_my_run"
-            id="menu_open_view_my_project_my_run"
-            groups="base.group_extended_menu"
-            parent="menu_open_view_my_project"/>
 
         <record id="open_view_my_project_open" model="ir.actions.act_window">
             <field name="name">Projects Structure</field>
@@ -564,7 +558,6 @@
             <field name="view_id" ref="my_pending_task"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" groups="base.group_extended_menu" parent="menu_action_view_task4"/>
 
         <record id="action_view_task5_prog" model="ir.actions.act_window">
             <field name="name">My Current Tasks</field>
@@ -577,7 +570,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_prog" id="menu_tasks_yours_prog" parent="menu_action_view_task4" sequence="1"/>
 
         <record id="action_view_task5_prog_prog" model="ir.actions.act_window">
             <field name="name">My Tasks in Progress</field>
@@ -589,7 +581,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_prog_prog" id="menu_tasks_yours_prog_prog" groups="base.group_extended_menu" parent="menu_tasks_yours_prog"/>
 
         <record id="action_view_task5_prog_draft" model="ir.actions.act_window">
             <field name="name">My Draft Tasks</field>
@@ -601,7 +592,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_prog_draft" id="menu_tasks_yours_prog_draft" groups="base.group_extended_menu" parent="menu_tasks_yours_prog"/>
 
         <record id="action_view_task5_departments_pending" model="ir.actions.act_window">
             <field name="name">My Department's Pending Tasks</field>
@@ -613,7 +603,6 @@
            <field name="filter" eval="True"/>
            <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_departments_pending" id="menu_tasks_yours_departments_pending" groups="base.group_extended_menu" parent="menu_action_view_department_tasks"/>
 
         <record id="action_view_task5_departments_prog" model="ir.actions.act_window">
             <field name="name">My Department's Current Tasks</field>
@@ -625,7 +614,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_departments_prog" id="menu_tasks_yours_departments_prog" parent="menu_action_view_department_tasks" sequence="1"/>
 
         <record id="action_view_task5_departments_prog_prog" model="ir.actions.act_window">
             <field name="name">My Department's Tasks in Progress</field>
@@ -636,7 +624,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_departments_prog_prog" id="menu_tasks_yours_departments_prog_prog" groups="base.group_extended_menu" parent="menu_tasks_yours_departments_prog"/>
 
         <record id="action_view_task5_departments_prog_draft" model="ir.actions.act_window">
             <field name="name">My Department's Draft Tasks</field>
@@ -647,7 +634,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_departments_prog_draft" id="menu_tasks_yours_departments_prog_draft" groups="base.group_extended_menu" parent="menu_tasks_yours_departments_prog"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
@@ -675,7 +661,6 @@
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="domain">[('state','=','open')]</field>
         </record>
-        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task" groups="base.group_extended_menu"/>
 
         <record id="action_view_task7" model="ir.actions.act_window">
             <field name="name">Unassigned Tasks</field>
@@ -686,7 +671,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task" groups="base.group_extended_menu"/>
 
         <!-- Opening task when double clicking on project -->
         <record id="dblc_proj" model="ir.actions.act_window">
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index d266cb310bd..aacb501d37a 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -17,7 +17,7 @@
         -->
         
         <record id="process_node_packinginvoice0" model="process.node">
-            <field name="menu_id" ref="stock.menu_picking_waiting"/>
+            <field name="menu_id" ref="stock.menu_action_picking_tree"/>
             <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;Out Packing&quot;&quot;&quot;" name="name"/>
@@ -40,7 +40,7 @@
         </record>
     
         <record id="process_node_draftpurchaseorder0" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
@@ -51,7 +51,7 @@
         </record>
         
         <record id="process_node_draftpurchaseorder1" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
@@ -62,7 +62,7 @@
         </record>
     
         <record id="process_node_confirmpurchaseorder0" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_form_action3"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Confirmed Purchase&quot;&quot;&quot;" name="name"/>
@@ -73,7 +73,7 @@
         </record>
     
         <record id="process_node_approvepurchaseorder0" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_form_action4"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Approved Purchase&quot;&quot;&quot;" name="name"/>
@@ -84,7 +84,7 @@
         </record>
     
         <record id="process_node_invoicecontrol0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_invoice_tree8"/>
+            <field name="menu_id" ref="account.menu_action_invoice_tree2"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
@@ -119,7 +119,7 @@
         </record>
         
         <record id="process_node_productrecept0" model="process.node">
-            <field name="menu_id" ref="stock.menu_picking_waiting"/>
+            <field name="menu_id" ref="stock.menu_action_picking_tree"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product Receipt&quot;&quot;&quot;" name="name"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index bcda8944bd0..eabcd08786d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -151,7 +151,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
-        <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/>
 
         <record id="purchase_form_action3" model="ir.actions.act_window">
             <field name="name">Purchase Order Waiting Approval</field>
@@ -163,7 +162,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
-        <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/>
 
         <record id="purchase_form_action4" model="ir.actions.act_window">
             <field name="name">Purchase Orders in Progress</field>
@@ -175,7 +173,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_purchase_order_filter"/>            
         </record>
-        <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action" groups="base.group_extended_menu"/>
 
         <record id="purchase_form_action_new" model="ir.actions.act_window">
             <field name="name">New Purchase Order</field>
@@ -183,7 +180,6 @@
             <field name="res_model">purchase.order</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="purchase_form_action_new" id="menu_purchase_form_action_new" parent="purchase.menu_purchase_root"/>
 
 
         <record id="purchase_order_tree" model="ir.ui.view">
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index eb2d9f65ef3..c763cb50a67 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -41,7 +41,7 @@
         </record>
     
         <record id="process_node_quotation0" model="process.node">
-            <field name="menu_id" ref="sale.menu_action_order_tree10"/>
+            <field name="menu_id" ref="sale.menu_action_order_tree"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
@@ -52,7 +52,7 @@
         </record>
 
         <record id="process_node_saleorder0" model="process.node">
-            <field name="menu_id" ref="sale.menu_action_order_tree9"/>
+            <field name="menu_id" ref="sale.menu_action_order_tree"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
@@ -75,7 +75,7 @@
         </record>
 
         <record id="process_node_packinglist0" model="process.node">
-            <field name="menu_id" ref="stock.menu_picking_waiting"/>
+            <field name="menu_id" ref="stock.menu_action_picking_tree"/>
             <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;Outgoing Products&quot;&quot;&quot;" name="name"/>
@@ -86,7 +86,7 @@
         </record>
 
         <record id="process_node_deliveryorder0" model="process.node">
-            <field name="menu_id" ref="stock.menu_picking_waiting_delivery"/>
+            <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"/>
@@ -97,7 +97,7 @@
         </record>
 
         <record id="process_node_invoice0" model="process.node">
-            <field name="menu_id" ref="account.menu_invoice_draft"/>
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
@@ -109,7 +109,7 @@
         </record>
 
         <record id="process_node_invoiceafterdelivery0" model="process.node">
-            <field name="menu_id" ref="account.menu_invoice_draft"/>
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 092163d8cf1..4f31ec0e132 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -258,7 +258,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
 
@@ -268,7 +268,7 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
 
@@ -292,7 +292,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree2" id="menu_action_order_tree2" parent="menu_action_order_tree_all" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree3" model="ir.actions.act_window">
             <field name="name">Sales Order To Be Invoiced</field>
@@ -304,7 +303,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree3" id="menu_action_order_tree3" parent="sale.menu_action_order_tree_all" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree4" model="ir.actions.act_window">
             <field name="name">Sales Order in Progress</field>
@@ -315,7 +313,6 @@
             <field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.menu_action_order_tree_all" sequence="2" groups="base.group_extended_menu"/>
 
 
         <record id="action_order_tree5" model="ir.actions.act_window">
@@ -327,7 +324,6 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.menu_action_order_tree_all" sequence="1" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree7" model="ir.actions.act_window">
             <field name="name">My sales in shipping exception</field>
@@ -338,7 +334,6 @@
             <field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="menu_action_order_tree" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree8" model="ir.actions.act_window">
             <field name="name">My sales order waiting Invoice</field>
@@ -349,7 +344,6 @@
             <field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.menu_action_order_tree" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree9" model="ir.actions.act_window">
             <field name="name">My sales order in progress</field>
@@ -360,7 +354,6 @@
             <field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.menu_action_order_tree" sequence="2" groups="base.group_extended_menu"/>
 
         <record id="action_order_tree10" model="ir.actions.act_window">
             <field name="name">My Quotations</field>
@@ -371,7 +364,6 @@
             <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>            
         </record>
-        <menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1" groups="base.group_extended_menu"/>
 
 		<record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>
@@ -505,7 +497,6 @@
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_order_line_tree2" id="menu_action_order_line_tree2" parent="sale.menu_action_order_line_tree1" groups="base.group_extended_menu"/>
 
         <record id="action_order_line_tree3" model="ir.actions.act_window">
             <field name="name">Uninvoiced and Delivered Lines</field>
@@ -516,7 +507,6 @@
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_order_line_tree3" id="menu_action_order_line_tree3" parent="sale.menu_action_order_line_tree2" groups="base.group_extended_menu"/>
 
         <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_sale_order" name="Sales" res_model="sale.order" src_model="res.partner"/>
 
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index c2f0aa34581..08aa9f8fa40 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -314,8 +314,7 @@
     </record>
     
     <menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
-    <menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
-    <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
+    <menuitem name="Sales by Journal (This Month)" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_month"/>
 
     <record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
         <field name="res_model">sale_journal.sale.stats</field>
@@ -324,8 +323,7 @@
         <field name="view_mode">tree,form</field>
     </record>
     
-    <menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
-    <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
+    <menuitem name="Sales by Journal (All Months)" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
 
     <act_window name="Monthly sales"
         domain="[('journal_id', '=', active_id)]"
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 89585c0fcd2..4d9ebd7006b 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -126,7 +126,6 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_product_backlog_form_draft" id="menu_action_product_backlog_form_draft" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended_menu"/>
         
         <record id="action_product_backlog_form_open" model="ir.actions.act_window">
             <field name="name">Opened Backlogs</field>
@@ -136,7 +135,6 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_product_backlog_form_open" id="menu_action_product_backlog_form_open" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended_menu"/>
         
         <!--
               Scrum Sprint
@@ -438,7 +436,7 @@
             <field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.menu_action_view_task" groups="base.group_extended_menu"/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_extended_menu"/>
         
         <record id="action_view_task5" model="ir.actions.act_window">
             <field name="name">My opened tasks</field>
@@ -448,7 +446,6 @@
             <field name="domain">[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="scrum.menu_action_view_task4" groups="base.group_extended_menu"/>
         
         <record id="action_view_task6" model="ir.actions.act_window">
             <field name="name">Opened tasks</field>
@@ -456,8 +453,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','open'),('scrum','=',1)]</field>
+            <field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task" />
     
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d7962d700a4..e27db7d9975 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -91,7 +91,7 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_extended_menu"/>
+
         <record id="action_inventory_form_new" model="ir.actions.act_window">
             <field name="name">New Periodical Inventory</field>
             <field name="type">ir.actions.act_window</field>
@@ -100,8 +100,6 @@
             <field name="view_mode">form,tree</field>
             <field name="domain">[('state','=','draft')]</field>            
         </record>
-        <menuitem action="action_inventory_form_new" id="menu_action_inventory_form_new" parent="menu_action_inventory_form"/>
-
 
         =============================
         Lot
@@ -767,7 +765,6 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree2_delivery"/>
         </record>
-        <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" />
 
         <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
             <field name="name">Future Delivery Orders</field>
@@ -797,7 +794,6 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree3_delivery"/>
         </record>
-        <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" />
 
        <record id="action_picking_calendar_delivery" model="ir.actions.act_window">
             <field name="name">Calendar of Deliveries</field>
@@ -808,7 +804,6 @@
             <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended_menu" />
 
         #
         # Sending Products
@@ -966,7 +961,6 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree2"/>
         </record>
-        <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree3" model="ir.actions.act_window">
             <field name="name">Confirmed Packing Waiting Availability</field>
@@ -996,7 +990,6 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree3"/>
         </record>
-        <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree" groups="base.group_extended_menu"/>
 
         #
         # Reception of Products
@@ -1211,7 +1204,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree8" model="ir.actions.act_window">
             <field name="name">Confirmed Packing Waiting Availability</field>
@@ -1224,7 +1216,6 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_extended_menu"/>
 
         <record id="action_picking_tree9" model="ir.actions.act_window">
             <field name="name">New Internal Packing</field>
@@ -1327,7 +1318,6 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_extended_menu"/>
 
         <record id="action_move_form4" model="ir.actions.act_window">
             <field name="name">Available Moves</field>
@@ -1338,7 +1328,6 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_extended_menu"/>
 
         <record id="action_picking_all" model="ir.actions.act_window">
             <field name="name">Packing</field>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1aa12e0f2c9..1c4be802a55 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -158,8 +158,6 @@
             <field name="domain">[('create_uid','=',uid)]</field>
             <field name="filter" eval="True"/>
         </record>
-        <menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_mypages" string="My Pages" 
-        action="action_wiki_mypages" groups="base.group_extended_menu"/>
         
         <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">
@@ -172,9 +170,7 @@
             <field name="domain">[('review','=',True)]</field>
             <field name="filter" eval="True"/>
         </record>
-        <menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_review" string="Pages Waiting Review" 
-        action="action_wiki_review" groups="base.group_extended_menu"/>
-        
+         
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>
             <field name="model">wiki.wiki.history</field>

From c18f4e30f7744ae8641121014663bee7bfd7b65f Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 23 Nov 2009 19:11:22 +0530
Subject: [PATCH 09/59] [FIX]: Small Change

bzr revid: uco@tinyerp.co.in-20091123134122-9d36120dn6ehhtdz
---
 addons/mrp/process/procurement_process.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 0986e37387c..de942d7e75f 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -88,7 +88,7 @@
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;If Product type is service&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Service Product&quot;&quot;&quot;" name="name"/>
 			<field name="subflow_id" ref="process_process_serviceproductprocess0"/>
 			<field name="process_id" ref="process_process_procurementprocess0"/>
@@ -198,7 +198,7 @@
 		<record id="process_transition_procurestockableproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Procurement of stockable products&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Procurement of stockable Products&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... &quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>

From 47a820f7a1a5c8797e3ea763f27d69b5bc7de5ac Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 23 Nov 2009 19:22:38 +0530
Subject: [PATCH 10/59] [ADD]: Added tooltips for all state fields.

bzr revid: uco@tinyerp.co.in-20091123135238-oadv1oyefpsi9631
---
 addons/account/account.py                          | 14 +++++++++-----
 addons/account/account_bank_statement.py           |  3 ++-
 addons/account/account_move_line.py                |  3 ++-
 .../account/process/customer_invoice_process.xml   |  2 +-
 addons/account/project/project.py                  |  4 +++-
 addons/account_payment/payment.py                  |  3 ++-
 addons/auction/auction.py                          | 13 +++++++------
 addons/base_report_creator/base_report_creator.py  |  2 +-
 addons/crm/crm.py                                  |  4 +++-
 addons/crm/crm_segmentation.py                     |  2 +-
 addons/event/event.py                              |  4 +++-
 addons/hr_expense/hr_expense.py                    |  3 ++-
 addons/hr_holidays/hr.py                           |  3 ++-
 .../hr_timesheet_invoice_view.xml                  |  2 +-
 addons/idea/idea.py                                |  4 +++-
 addons/mrp/mrp.py                                  | 10 +++++++---
 addons/mrp_operations/mrp_operations.py            |  2 +-
 addons/mrp_repair/mrp_repair.py                    |  2 +-
 addons/product/product.py                          |  2 +-
 addons/project/project.py                          |  8 ++++++--
 addons/purchase/purchase.py                        |  2 +-
 addons/purchase_manual/purchase_manual.py          |  2 +-
 addons/sale/sale.py                                |  2 +-
 addons/scrum/scrum.py                              |  4 ++--
 addons/stock/stock.py                              | 10 +++++++---
 addons/subscription/subscription.py                |  2 +-
 26 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 1c45b6cd415..f9ec8763fc5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -524,7 +524,8 @@ class account_fiscalyear(osv.osv):
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
-        'state': fields.selection([('draft','Draft'), ('done','Done')], 'Status', readonly=True),
+        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
+                                  help='When fiscal year is created. The state is \'Draft\'. At the end of the year it is in \'Done\' state.'),
     }
 
     _defaults = {
@@ -587,7 +588,8 @@ 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')], 'Status', readonly=True)
+        'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
+                                  help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
     }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -669,7 +671,8 @@ class account_journal_period(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
         'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32),
         'active': fields.boolean('Active', required=True),
-        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
+                                  help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
     }
 
@@ -754,7 +757,8 @@ class account_move(osv.osv):
         'ref': fields.char('Ref', size=64),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
-        'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'Status', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', required=True, readonly=True,
+                                  help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Valid\' state.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Be Verified'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
@@ -1604,7 +1608,7 @@ class account_subscription(osv.osv):
         'period_total': fields.integer('Number of Periods', required=True),
         'period_nbr': fields.integer('Period', required=True),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
-        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
 
         'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
     }
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 2d6c725fcc0..a0af45ad069 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -126,7 +126,8 @@ class account_bank_statement(osv.osv):
             'Entry lines', states={'confirm':[('readonly',True)]}),
         'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
             'State', required=True,
-            states={'confirm': [('readonly', True)]}, readonly="1"),
+            states={'confirm': [('readonly', True)]}, readonly="1",
+            help='When new statement is created the state will be \'Draft\'. And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
         'currency': fields.function(_currency, method=True, string='Currency',
             type='many2one', relation='res.currency'),
     }
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 1d0cdb95008..3664dd58cea 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -377,7 +377,8 @@ class account_move_line(osv.osv):
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
         'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
-        'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
+        'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True,
+                                  help='When new move line is created the state will be \'Draft\'. When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
                     this field will contain the basic amount(without tax)."),
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 31d79a29971..29506429486 100755
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -28,7 +28,7 @@
         </record>
         
         <record id="process_node_draftinvoices0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_invoice_tree1_new"/>
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index f86a246f3d8..474e8dc5e8b 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -189,7 +189,9 @@ class account_analytic_account(osv.osv):
         'date': fields.date('Date End'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
-        'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True),
+        'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True,
+                                  help='When an account is created its in \'Draft\' state. If any associated partner is there, it can be in \'Open\' state.\
+                                  If any pending balance is there it can be in \'Pending\'. And finally when all the transactions are over, it can be in \'Close\' state.'),
     }
 
     def _default_company(self, cr, uid, context={}):
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 1b3392564bf..27a42de5a31 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -100,7 +100,8 @@ class payment_order(osv.osv):
             ('draft', 'Draft'),
             ('open','Confirmed'),
             ('cancel','Cancelled'),
-            ('done','Done')], 'State', select=True),
+            ('done','Done')], 'State', select=True, 
+            help='When an order is placed the state is \'Draft\'. Once the bank is confirmed the state is set to \'Confirmed\'. Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line','order_id','Payment lines',states={'done':[('readonly',True)]}),
         'total': fields.function(_total, string="Total", method=True,
             type='float'),
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0c275578180..b09b1e9288f 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -75,7 +75,8 @@ class auction_dates(osv.osv):
         'acc_income': fields.many2one('account.account', 'Income Account', required=True),
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
         'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True),
-        'state': fields.selection((('draft','Draft'),('closed','Closed')),'Status',select=1, readonly=True),
+        'state': fields.selection((('draft','Draft'),('closed','Closed')),'State',select=1, readonly=True,
+                                  help='When auction starts the state is \'Draft\'. At the end of auction, the state becomes \'Closed\'.'),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
 
     }
@@ -442,7 +443,7 @@ class auction_lots(osv.osv):
 #       'paid_vnd':fields.function(_is_paid_vnd,string='Seller Paid',method=True,type='boolean',store=True),
         'paid_vnd':fields.boolean('Seller Paid'),
         'paid_ach':fields.function(_is_paid_ach,string='Buyer invoice reconciled',method=True, type='boolean',store=True),
-        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'Status', required=True, readonly=True),
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold'),('taken_away','Taken away')),'State', required=True, readonly=True),
         'buyer_price': fields.function(_buyerprice, method=True, string='Buyer price',store=True),
         'seller_price': fields.function(_sellerprice, method=True, string='Seller price',store=True),
         'gross_revenue':fields.function(_grossprice, method=True, string='Gross revenue',store=True),
@@ -989,7 +990,7 @@ class report_seller_auction(osv.osv):
         'avg_price':fields.float('Avg adjudication',readonly=True),
         'avg_estimation':fields.float('Avg estimation',readonly=True),
         'date': fields.date('Create Date',  required=True, select=1),
-        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'Status',readonly=True, select=1)
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'State',readonly=True, select=1)
     }
 
     def init(self, cr):
@@ -1199,7 +1200,7 @@ class report_auction_adjudication(osv.osv):
     _auto = False
     _columns = {
             'name': fields.many2one('auction.dates','Auction date',readonly=True,select=1),
-            'state': fields.selection((('draft','Draft'),('close','Closed')),'Status', select=1),
+            'state': fields.selection((('draft','Draft'),('close','Closed')),'State', select=1),
             'adj_total': fields.float('Total Adjudication'),
             'date': fields.date('Date', readonly=True,select=1),
             'user_id':fields.many2one('res.users', 'User',select=1)
@@ -1305,7 +1306,7 @@ class report_object_encoded(osv.osv):
     _description = "Object encoded"
     _auto = False
     _columns = {
-        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'Status', required=True,select=1),
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'State', required=True,select=1),
         'user_id':fields.many2one('res.users', 'User', select=1),
         'estimation': fields.float('Estimation',select=2),
         'date': fields.date('Create Date',  required=True),
@@ -1375,7 +1376,7 @@ class report_unclassified_objects(osv.osv):
         'obj_num': fields.integer('Catalog Number'),
         'obj_price': fields.float('Adjudication price'),
         'lot_num': fields.integer('List Number', required=True, select=1 ),
-        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'Status', required=True, readonly=True),
+        'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'State', required=True, readonly=True),
         'obj_comm': fields.boolean('Commission'),
         'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True),
         'ach_login': fields.char('Buyer Username',size=64),
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 1e65daedea0..326f09cfe90 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -314,7 +314,7 @@ class report_creator(osv.osv):
         'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id','model_id', 'Reported Objects'),
         'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
         'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
-        'state': fields.selection([('draft','Draft'),('valid','Valid')], 'Status', required=True),
+        'state': fields.selection([('draft','Draft'),('valid','Valid')], 'State', required=True),
         'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True),
         'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel','report_id','group_id','Authorized Groups'),
     }
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 603b17a1aa6..7236930ac44 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -511,7 +511,9 @@ class crm_case(osv.osv):
         'user_id': fields.many2one('res.users', 'Responsible'),
         'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1),
         'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
+                                  help='The state is set to \'Draft\', when a case is created. If the case is in progress the state is set to \'Open\'.\
+                                  When the case is over, the state is set to \'Done\'. If the case needs to be reviewed then the state is set to \'Pending\'.'),
         'ref' : fields.reference('Reference', selection=_links_get, size=128),
         'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),
 
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index ef181f70221..5457cd8a6dd 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -36,7 +36,7 @@ class crm_segmentation(osv.osv):
         'description': fields.text('Description'),
         'categ_id': fields.many2one('res.partner.category', 'Partner Category', required=True, help='The partner category that will be added to partners that match the segmentation criterions after computation.'),
         'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn\'t match segmentation criterions'),
-        'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution Status', readonly=True),
+        'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution State', readonly=True),
         'partner_id': fields.integer('Max Partner ID processed'),
         'segmentation_line': fields.one2many('crm.segmentation.line', 'segmentation_id', 'Criteria', required=True),
         'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."),
diff --git a/addons/event/event.py b/addons/event/event.py
index e3595987c7d..e2e19212393 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -130,7 +130,9 @@ class event(osv.osv):
         'register_prospect': fields.function(_get_prospect, method=True, string='Unconfirmed Registrations'),
         'date_begin': fields.datetime('Beginning date', required=True),
         'date_end': fields.datetime('Ending date', required=True),
-        'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'Status', readonly=True, required=True),
+        'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'State', readonly=True, required=True,
+                                  help='If event is created, the state is \'Draft\'. If event is confirmed for the particular dates the state is set to \'Confirmed\'.\
+                                  If the event is over, the state is set to \'Done\'. If event is cancelled the state is set to \'Cancelled\'.'),
         'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'),
         'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
         'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'),
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index dd9c4e44aba..a9f4c5fbd70 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -77,7 +77,8 @@ class hr_expense_expense(osv.osv):
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
             ('cancelled', 'Cancelled')],
-            'State', readonly=True),
+            'State', readonly=True, help='When the expense request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
+            If the admin accepts it, the state is \'Accepted\'. If an invoice is made for the expense request, the state is \'Invoiced\'. If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
     _defaults = {
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 0d638d67a08..68fc6b7ccbb 100644
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -96,7 +96,8 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'Status', readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\
+            If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'),
         'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
         'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
         'date_to' : fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index c363a4172e5..4ff5ac27c95 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -15,7 +15,7 @@
                         <field name="to_invoice" widget="selection" />
                         <field name="amount_max"/>
                         <field name="amount_invoiced"/>
-                        <separator colspan="4" string="Status"/>
+                        <separator colspan="4" string="State"/>
                         <field name="state"/>
                     </group>
                 </field>
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index ad5b29e42e1..45275aa78c3 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -119,7 +119,9 @@ class idea_idea(osv.osv):
         'count_votes' : fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
         'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True ),
-        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'Status', readonly=True),
+        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True, 
+                                  help='When the Idea is created the state is \'Draft\'. It is opened by the user, the state is \'Opened\'.\
+                                    If the idea is accepted, the state is \'Accepted\'.'),
         'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
     }
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5ba9d487400..65eed59ec10 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -435,8 +435,10 @@ class mrp_production(osv.osv):
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
 
-        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True),
-        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
+        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+                                    help='When the production order is created the state is set to \'Draft\'. If the order is confirmed the state is set to \'Waiting Goods\'. If any exceptions are there, the state is set to \'Packing Exception\'.\
+                                    If the stock is available then the state is set to \'Ready to Produce\'. When the production get started then the state is set to \'In Production\'. When the production is over, the state is set to \'Done\'.'),
+        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),    
         'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
 
         'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'),
@@ -820,7 +822,9 @@ class mrp_procurement(osv.osv):
             ('cancel','Cancel'),
             ('ready','Ready'),
             ('done','Done'),
-            ('waiting','Waiting')], 'Status', required=True),
+            ('waiting','Waiting')], 'State', required=True,
+            help='When a procurement is created the state is set to \'Draft\'. If the procurement is confirmed, the state is set to \'Confirmed\'.\
+            After confirming the state is set to \'Running\'. If any exception arises in the order then the state is set to \'Exception\'. Once the exception is removed the state becomes \'Ready\'. It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
         'note' : fields.text('Note'),
     }
     _defaults = {
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 155ca928077..e446f4a5014 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 res
     _inherit = 'mrp.production.workcenter.line'
     _columns = {
-       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
+       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'State', readonly=True),
        'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'),
        'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'),
        'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 48986c3918e..93f671baeaa 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -503,7 +503,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),
         'move_id': fields.many2one('stock.move', 'Inventory Move', readonly=True),
-        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'State', required=True, readonly=True),
     }
     _defaults = {
      'state': lambda *a: 'draft',
diff --git a/addons/product/product.py b/addons/product/product.py
index 509bd61c373..7a497fbe344 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -262,7 +262,7 @@ class product_template(osv.osv):
         'warranty': fields.float('Warranty (months)'),
         'sale_ok': fields.boolean('Can be sold', help="Determine 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')], 'Status', help="Tells the user if he can use the product or not."),
+        '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."),
         'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
         'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True, help="Default Unit of Measure used for purchase orders. It must in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
diff --git a/addons/project/project.py b/addons/project/project.py
index 96e86b4153c..694c308551c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -115,7 +115,9 @@ class project(osv.osv):
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."),
         'notes': fields.text('Notes', help="Internal description of the project."),
         'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
-        'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True),
+        'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True,
+                                  help='The project can be in either if the states \'Template\' and \'Running\'. If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
+                                  If it is to be reviewed then the state is \'Pending\'. When the project is completed the state is set to \'Done\'.'),
      }
 
     _defaults = {
@@ -278,7 +280,9 @@ class task(osv.osv):
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
         'sequence': fields.integer('Sequence'),
         'type': fields.many2one('project.task.type', 'Type'),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
+        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+                                  help='If the task is created the state \'Draft\'. If the task is started, the state becomes \'In Progress\'. If review is needed the task is in \'Pending\' state.\
+                                  If the task is over, the states is set to \'Done\'.'),
         'date_start': fields.datetime('Starting Date'),
         'date_deadline': fields.datetime('Deadline'),
         'date_close': fields.datetime('Date Closed', readonly=True),
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 05128504ed5..9b100e9998d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -163,7 +163,7 @@ class purchase_order(osv.osv):
 
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
 
-        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
+        'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Notes'),
diff --git a/addons/purchase_manual/purchase_manual.py b/addons/purchase_manual/purchase_manual.py
index 2f5cf2cb44d..d9ce523f078 100644
--- a/addons/purchase_manual/purchase_manual.py
+++ b/addons/purchase_manual/purchase_manual.py
@@ -26,7 +26,7 @@ import netsvc
 class purchase_order_line(osv.osv):
     _inherit='purchase.order.line'
     _columns = {
-        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner"),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 794935855a2..676a406d9de 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -763,7 +763,7 @@ class sale_order_line(osv.osv):
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight'),
-        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'Status', required=True, readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled'), ('exception', 'Exception')], 'State', required=True, readonly=True),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id','user_id',type='many2one',relation='res.users',string='Salesman'),
     }
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index a0bacc41f11..387c1ce0f00 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -98,7 +98,7 @@ class scrum_sprint(osv.osv):
         'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
         'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True),
     }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -166,7 +166,7 @@ class scrum_product_backlog(osv.osv):
         'sequence' : fields.integer('Sequence'),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
         'tasks_id': fields.one2many('scrum.task', 'product_backlog_id', 'Tasks Details'),
-        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'Status', required=True),
+        'state': fields.selection([('draft','Draft'),('open','Open'),('done','Done')], 'State', required=True),
         'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
         'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
         'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours')
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0128fb0a2ed..7585ebc6466 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -453,7 +453,9 @@ class stock_picking(osv.osv):
             ('assigned', 'Available'),
             ('done', 'Done'),
             ('cancel', 'Cancelled'),
-            ], 'Status', readonly=True, select=True),
+            ], 'State', readonly=True, select=True,
+            help=' The \'Draft\' state is used when a user is encoding a new and unconfirmed picking. The \'Confirmed\' state is used for stock movement to do with unavailable products. The \'Available\' state is set automatically when the \
+            products are ready to be moved. The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"),
         'date': fields.datetime('Date Order', help="Date of Order"),
@@ -979,7 +981,9 @@ class stock_move(osv.osv):
 
         'note': fields.text('Notes'),
 
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', readonly=True, select=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. After that it is set to \'Confirmed\' state. If stock is available state is set to \'Avaiable\'. When the packing it done the state is \'Done\'.\
+                                  The state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }
@@ -1340,7 +1344,7 @@ class stock_inventory(osv.osv):
         'date_done': fields.datetime('Date done'),
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
-        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'Status', readonly=True),
+        'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 412b317d388..49ad477759a 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -70,7 +70,7 @@ class subscription_subscription(osv.osv):
         'interval_type': fields.selection([('days', 'Days'), ('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
         'exec_init': fields.integer('Number of documents'),
         'date_init': fields.datetime('First Date'),
-        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status'),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
         'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
         'cron_id': fields.many2one('ir.cron', 'Cron Job')

From 6c95ad76ef8284bc3f25db2691f44267b13ef35e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 24 Nov 2009 10:30:17 +0530
Subject: [PATCH 11/59] [FIX]: Corrected product process view.

bzr revid: uco@tinyerp.co.in-20091124050017-ooxdi3zeq7uaohan
---
 addons/product/process/product_process.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index 1a77aae17fb..e91c0e7cf29 100755
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -32,7 +32,7 @@
             <field name="model_id" ref="product.model_product_supplierinfo"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Supplier Information&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;1 or several supplier(s) can be linked to a product. All information stands in the product form.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Supplier name, price, product code, ...&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -44,8 +44,8 @@
         <record id="process_transition_supplierofproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Suppliers of Product&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;You can see the list of suppliers for that product.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Supplier of the product&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;1 or several supplier(s) can be linked to a product. All information stands in the product form.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplier0"/>
             <field model="process.node" name="source_node_id" ref="process_node_product0"/>
         </record>

From e56a3b5a70bfc6799ddc6d241d04c33140cd7a1d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 24 Nov 2009 10:15:43 +0100
Subject: [PATCH 12/59] [IMP] Add the support for the override of any
 attribute. You can override an attribute of an xml view with the <attribute
 /> tag

Example:
<openerp>
    <data>
        <record model="ir.ui.view" id="res_partner_form">
            <field name="name">res.partner.form</field>
            <field name="model">res.partner</field>
            <field name="type">form</field>
            <field name="inherit_id" ref="base.view_partner_form" />
            <field name="arch" type="xml">
                <xpath expr="/form/notebook/page[@string='General']/field[@name='address']/tree" position="attributes">
                    <attribute name="editable">top</attribute>
                </xpath>
            </field>
        </record>
    </data>
</openerp>

Regards,

bzr revid: stephane@openerp.com-20091124091543-wsxu48hx117e0w6h
---
 bin/addons/base/rng/view.rng | 16 ++++++++++++++++
 bin/osv/orm.py               |  7 +++++++
 2 files changed, 23 insertions(+)

diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 41f10afa690..37f681de92f 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -20,6 +20,7 @@
                     <rng:ref name="image"/>
                     <rng:ref name="form"/>
                     <rng:ref name="vpaned"/>
+                    <rng:ref name="attribute"/>
                     <rng:ref name="filter"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                     <rng:element name="properties"><rng:empty/></rng:element>
@@ -48,6 +49,7 @@
                     <rng:ref name="tree"/>
                     <rng:ref name="group"/>
                     <rng:ref name="button"/>
+                    <rng:ref name="attribute"/>
                     <rng:ref name="filter"/>
                     <rng:element name="newline"><rng:empty/></rng:element>
                 </rng:choice>
@@ -182,6 +184,7 @@
                 <rng:choice>
                     <rng:element name="newline"><rng:empty/></rng:element>
                     <rng:element name="properties"><rng:empty/></rng:element>
+                    <rng:ref name="attribute" />
                     <rng:ref name="label" />
                     <rng:ref name="field"/>
                     <rng:ref name="group"/>
@@ -219,6 +222,7 @@
             <rng:optional><rng:attribute name="orientation"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
+                    <rng:ref name="attribute"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="button"/>
                     <rng:ref name="field"/>
@@ -265,6 +269,15 @@
         </rng:element>
     </rng:define>
 
+    <rng:define name="attribute">
+        <rng:element name="attribute">
+            <rng:attribute name="name" />
+            <rng:zeroOrMore>
+                <rng:text />
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+
 
     <rng:define name="field">
         <rng:element name="field">
@@ -314,6 +327,7 @@
             <rng:optional><rng:attribute name="selection"/></rng:optional>            
             <rng:zeroOrMore>
                 <rng:choice>
+                    <rng:ref name="attribute" />
                     <rng:ref name="form"/>
                     <rng:ref name="data"/>
                     <rng:ref name="tree"/>
@@ -348,6 +362,7 @@
             <rng:optional><rng:attribute name="color" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
+                    <rng:ref name="attribute"/>
                     <rng:ref name="separator"/>
                     <rng:ref name="button"/>
                     <rng:ref name="field"/>
@@ -413,6 +428,7 @@
             <rng:optional><rng:attribute name="help"/></rng:optional>            
             <rng:zeroOrMore>
                 <rng:choice>
+                    <rng:ref name="attribute" />
                     <rng:ref name="form" />
                     <rng:ref name="field" />
                     <rng:ref name="tree" />
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 0ce305c2142..e417d6371c7 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1242,6 +1242,13 @@ class orm_template(object):
                             for child in node2:
                                 node.addprevious(child)
                             node.getparent().remove(node)
+                    elif pos == 'attributes':
+                        for child in node2.getiterator('attribute'):
+                            attribute = (child.get('name'), child.text and child.text.encode('utf8') or None)
+                            if attribute[1]:
+                                node.set(attribute[0], attribute[1])
+                            else:
+                                del(node.attrib[attribute[0]])
                     else:
                         sib = node.getnext()
                         for child in node2:

From daaf25bfaa28b6136dd79d9b3f1dd54a570beb73 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 24 Nov 2009 14:52:25 +0530
Subject: [PATCH 13/59] =?UTF-8?q?[IMP]:=20Removed=20the=20Create=20Opportu?=
 =?UTF-8?q?nity=20button=20of=20the=20partner=20form=20view=20&=20put=20a?=
 =?UTF-8?q?=20button=C2=A0on=20the=20right=20sidebar,=20like=20'Schedule?=
 =?UTF-8?q?=20a=20Meeting'.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: rpa@tinyerp.com-20091124092225-a868ru61s2xe8gh8
---
 .../crm_configuration_wizard.xml                  |  5 ++---
 addons/crm_configuration/crm_lead_view.xml        | 15 ---------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/addons/crm_configuration/crm_configuration_wizard.xml b/addons/crm_configuration/crm_configuration_wizard.xml
index 379602c39a6..6d0512a6f95 100644
--- a/addons/crm_configuration/crm_configuration_wizard.xml
+++ b/addons/crm_configuration/crm_configuration_wizard.xml
@@ -52,11 +52,10 @@
             string="Schedule Phone Call" />
             
 	   <wizard
-          id="wizard_partner_create_opportunity"
-            keyword="client_action_multi"
+          id="wizard_partner_create_opportunity1"
+            keyword="client_action_relate"
             model="res.partner"
             name="crm.case.partner.opportunity_create"
-            menu="False"
             string="Create Opportunity"/>
             
 
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index fa8e73f4aea..d760758bebc 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -213,20 +213,5 @@
     </record>
 
 
-		<!--  PARTNER VIEW -->
-		<record id="view_partner_property_form" model="ir.ui.view">
-			<field name="name">res.partner.crm.form.inherit</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_form" />
-			<field name="arch" type="xml">
-				<field name="supplier" position="after">
-					<button string="Create Opportunity"
-						name="%(crm_configuration.wizard_partner_create_opportunity)d" icon="gtk-index"
-						type="action" colspan="2"
-					/>
-				</field>
-			</field>
-		</record>
 </data>
 </openerp>

From d107cb0cd757649894fab9b7f59f33726af81c5d Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 24 Nov 2009 15:09:13 +0530
Subject: [PATCH 14/59] [FIX]: Corrected project timesheet process view

bzr revid: uco@tinyerp.co.in-20091124093913-1l03rdbyd8gbwxnp
---
 addons/project_timesheet/process/project_timesheet_process.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index ad4b5a0b71f..6e9469d93ae 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -45,7 +45,7 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheetline0"/>
+            <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/>
             <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/>
         </record>
 

From 0b00649fdef401d78881b34b96e37c070b804b44 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Tue, 24 Nov 2009 11:58:51 +0100
Subject: [PATCH 15/59] [IMP] Create Contacts on addresses while installing
 base_contact

bzr revid: nel@tinyerp.com-20091124105851-ggjzisy1s51im5vp
---
 addons/base_contact/base_contact.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index f5a019c92ea..55da58224df 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -25,6 +25,12 @@ from osv import fields, osv
 class res_partner_contact(osv.osv):
     _name = "res.partner.contact"
     _description = "res.partner.contact"
+    def init(self, cr):
+        address_obj = self.pool.get('res.partner.address')
+        job_obj = self.pool.get('res.partner.job')
+        address_ids = address_obj.search(cr, 1, [])
+        for address in address_obj.browse(cr, 1, address_ids):
+            contact_id = self.create(cr, 1, {'name': address.name or 't'})
 
     def _title_get(self,cr, user, context={}):
         obj = self.pool.get('res.partner.title')
@@ -99,6 +105,15 @@ class res_partner_address(osv.osv):
 res_partner_address()
 
 class res_partner_job(osv.osv):
+    def init(self, cr):
+        address_obj = self.pool.get('res.partner.address')
+        contact_obj = self.pool.get('res.partner.contact')
+        address_ids = address_obj.search(cr, 1, [])
+        for address in address_obj.browse(cr, 1, address_ids):
+            contact_id = contact_obj.search(cr, 1, [('name','=', address.name)])
+            if contact_id:
+                contact_id = contact_id[0]
+                self.create(cr, 1, {'address_id': address.id, 'contact_id': contact_id})
 
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):

From 5e6e84fc3e4730c27ccbe0b52415789d39001bc4 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 24 Nov 2009 11:08:23 +0100
Subject: [PATCH 16/59] [IMP] purchase: removed obsolete menu entries since we
 now have filters in advanced search

bzr revid: olt@tinyerp.com-20091124100823-7gxzw9hndf7acmap
---
 .../mrp/process/stockable_product_process.xml |  4 +-
 addons/product/product_view.xml               | 68 +++++++-------
 addons/purchase/process/purchase_process.xml  | 92 +++++++++----------
 addons/purchase/purchase_view.xml             | 38 ++++----
 4 files changed, 102 insertions(+), 100 deletions(-)

diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index d1970ffc535..846815ac677 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -39,7 +39,7 @@
 		</record>
 		
 		<record id="process_node_rfq0" model="process.node">
-			<field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+			<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
 			<field name="model_id" ref="purchase.model_purchase_order"/>
 			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Request for Quotation.&quot;&quot;&quot;" name="note"/>
@@ -84,4 +84,4 @@
 		</record>
 	
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 0e8f53e97f8..627f53cb146 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
-        <menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />        
+        <menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />
         <menuitem
             id="menu_config_product"
             name="Configuration"
@@ -16,21 +16,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
+                    <group col='8' colspan='4'>
+                        <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
+                        <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                        <field name="name" select="1"/>
+                        <field name="default_code" select="1"/>
+                        <field name="categ_id" select="1" widget="selection"/>
+                   </group>
+                   <newline/>
                    <group col='8' colspan='4'>
-                		<filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
-		               	<filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
-	                  	<field name="name" select="1"/>
-	                  	<field name="default_code" select="1"/>
-	                  	<field name="categ_id" select="1" widget="selection"/>
-	               </group>
-	               <newline/>
-	               <group col='8' colspan='4'>
-	                  	<field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
-	                </group>
+                          <field name="pricelist_id" select="1" widget="selection" context="{'pricelist': self}" />
+                    </group>
                 </search>
             </field>
         </record>
-            
+
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
@@ -76,7 +76,7 @@
                         <field groups="base.group_extended" name="rental" select="2"/>
                     </group>
                    </group>
-      
+
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
@@ -185,11 +185,11 @@
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="product_product_tree_view"/>
-            <field name="search_view_id" ref="product_search_form_view"/>            
+            <field name="search_view_id" ref="product_search_form_view"/>
         </record>
-        
+
         <menuitem action="product_normal_action" id="menu_products" parent="product.menu_products_products" sequence="1"/>
-        
+
         <record id="product_category_form_view" model="ir.ui.view">
             <field name="name">product.category.form</field>
             <field name="model">product.category</field>
@@ -234,7 +234,7 @@
             <field name="view_id" ref="product_category_tree_view"/>
         </record>
         <menuitem action="product_category_action" id="menu_product_category_action" parent="product.menu_main_product" sequence="3"/>
-        
+
         <record id="product_category_action_form" model="ir.actions.act_window">
             <field name="name">Products Categories</field>
             <field name="type">ir.actions.act_window</field>
@@ -243,8 +243,8 @@
             <field name="view_id" ref="product_category_list_view"/>
         </record>
         <menuitem action="product_category_action_form" id="menu_product_category_action_form" parent="product.menu_config_product" sequence="1"/>
-        
-        
+
+
         <record id="product_normal_action_tree" model="ir.actions.act_window">
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
@@ -261,10 +261,10 @@
             <field eval="'ir.actions.act_window,%d'%product_normal_action_tree" name="value"/>
             <field eval="True" name="object"/>
         </record>
-        
-        
+
+
         <!-- Unit of Measure -->
-        
+
         <record id="product_uom_tree_view" model="ir.ui.view">
             <field name="name">product.uom.tree</field>
             <field name="model">product.uom</field>
@@ -279,7 +279,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_uom_form_view" model="ir.ui.view">
             <field name="name">product.uom.form</field>
             <field name="model">product.uom</field>
@@ -303,7 +303,7 @@
             <field name="view_id" ref="product_uom_tree_view"/>
         </record>
         <menuitem id="next_id_16" name="Units of Measure" parent="product.menu_config_product"/><menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
-        
+
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
             <field name="model">product.uom.categ</field>
@@ -322,7 +322,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>
-        
+
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>
             <field name="model">product.ul</field>
@@ -353,7 +353,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="product.menu_config_product" sequence="4"/>
-        
+
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
             <field name="model">product.packaging</field>
@@ -367,7 +367,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_packaging_form_view" model="ir.ui.view">
             <field name="name">product.packaging.form.view</field>
             <field name="model">product.packaging</field>
@@ -395,7 +395,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="product_supplierinfo_form_view" model="ir.ui.view">
             <field name="name">product.supplierinfo.form.view</field>
             <field name="model">product.supplierinfo</field>
@@ -435,7 +435,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_variant_form_view" model="ir.ui.view">
             <field name="name">product.variant.form</field>
             <field name="model">product.product</field>
@@ -452,7 +452,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="product_variant_tree_view" model="ir.ui.view">
             <field name="name">product.variant.tree</field>
             <field name="model">product.product</field>
@@ -482,7 +482,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.template.product.form</field>
             <field name="model">product.template</field>
@@ -575,7 +575,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="product_template_action_tree" model="ir.actions.act_window">
             <field name="name">Product Templates</field>
             <field name="type">ir.actions.act_window</field>
@@ -583,8 +583,8 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
-        
+
         <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index 773ffe3ca07..8e7b34ac735 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        
-        <!--        
+
+        <!--
             Process
         -->
-        
+
         <record id="process_process_purchaseprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;Purchase&quot;&quot;&quot;" name="name"/>
         </record>
-        
-        <!--        
+
+        <!--
             Process Node
         -->
-        
+
         <record id="process_node_packinginvoice0" model="process.node">
             <field name="menu_id" ref="stock.menu_picking_waiting"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
@@ -26,7 +26,7 @@
             <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_purchaseorder0" model="process.node">
             <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
@@ -38,9 +38,9 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_draftpurchaseorder0" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
@@ -49,9 +49,9 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_draftpurchaseorder1" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
@@ -60,9 +60,9 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_confirmpurchaseorder0" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_form_action3"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Confirmed&quot;&quot;&quot;" name="name"/>
@@ -71,9 +71,9 @@
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_approvepurchaseorder0" model="process.node">
-            <field name="menu_id" ref="purchase.menu_purchase_form_action4"/>
+            <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Approved&quot;&quot;&quot;" name="name"/>
@@ -82,7 +82,7 @@
             <field eval="&quot;&quot;&quot;object.state=='approved'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_invoicecontrol0" model="process.node">
             <field name="menu_id" ref="account.menu_action_invoice_tree8"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -94,7 +94,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_packinglist0" model="process.node">
             <field name="menu_id" ref="stock.menu_action_picking_tree4"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
@@ -105,7 +105,7 @@
             <field eval="&quot;&quot;&quot;object.state=='assigned'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_invoiceafterpacking0" model="process.node">
             <field name="menu_id" ref="account.menu_finance_invoice"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -117,7 +117,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_productrecept0" model="process.node">
             <field name="menu_id" ref="stock.menu_picking_waiting"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
@@ -129,9 +129,9 @@
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
-        <!--        
-            Process Condition     
+
+        <!--
+            Process Condition
         -->
 
         <record id="process_condition_conditionorigin" model="process.condition">
@@ -140,30 +140,30 @@
             <field eval="&quot;&quot;&quot;object.origin==''&quot;&quot;&quot;" name="model_states"/>
             <field eval="&quot;&quot;&quot;condition_origin&quot;&quot;&quot;" name="name"/>
         </record>
-    	
+
     	<record id="process_condition_conditioninvoicemanual" model="process.condition">
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="node_id" ref="process_node_invoicecontrol0"/>
             <field eval="&quot;&quot;&quot;object.invoice_method=='manual'&quot;&quot;&quot;" name="model_states"/>
             <field eval="&quot;&quot;&quot;condition_invoice_manual&quot;&quot;&quot;" name="name"/>
         </record>
-    	
-        <!--        
+
+        <!--
             Process Transition
         -->
-    	
+
     	<record id="res_roles_purchase0" model="res.roles">
             <field eval="&quot;&quot;&quot;Purchase&quot;&quot;&quot;" name="name"/>
         </record>
-        
+
         <record id="purchase.trans_draft_confirmed" model="workflow.transition">
             <field name="role_id" ref="res_roles_purchase0"/>
         </record>
-        
+
         <record id="purchase.trans_router_invoice" model="workflow.transition">
             <field name="role_id" ref="res_roles_purchase0"/>
         </record>
-        
+
         <record id="process_transition_productrecept0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -172,7 +172,7 @@
             <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
         </record>
-    	
+
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -182,7 +182,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
         </record>
-        
+
         <record id="process_transition_confirmingpurchaseorder1" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -191,7 +191,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/>
         </record>
-        
+
         <record id="process_transition_approvingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -200,7 +200,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" />
         </record>
-    
+
         <record id="process_transition_invoicefrompurchase0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -210,7 +210,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/>
         </record>
-    
+
         <record id="process_transition_createpackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -219,7 +219,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
         </record>
-    
+
         <record id="process_transition_invoicefrompackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -228,7 +228,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
         </record>
-        
+
         <record id="process_transition_purchaseinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -237,7 +237,7 @@
             <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/>
         </record>
-        
+
         <record id="process_transition_packinginvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -246,45 +246,45 @@
             <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
         </record>
-        
-        <!--        
+
+        <!--
             Process Action
         -->
-        
+
         <record id="process_transition_action_confirmpurchaseorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;wkf_confirm_order&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/>
         </record>
-        
+
         <record id="process_transition_action_cancelpurchaseorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;write({'state':'cancel'})&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_confirmingpurchaseorder0"/>
         </record>
-        
+
         <record id="process_transition_action_approvingpurchaseorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;wkf_approve_order&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Approve&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_approvingpurchaseorder0"/>
         </record>
-        
+
         <record id="process_transition_action_approvingcancelpurchaseorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;write({'state':'cancel'})&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_approvingpurchaseorder0"/>
         </record>.
-        
+
         <record id="process_transition_action_invoicefrompurchaseorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Create invoice&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_invoicefrompurchase0"/>
         </record>
-        
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 099050c2281..b1f48ff8774 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -116,31 +116,32 @@
                 <search string="Search Purchase Order">
                  <group col='10' colspan='4'>
                     <filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
-                	<filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
-					<separator orientation="vertical"/>
-					<filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
-					<separator orientation="vertical"/>
-					<field name="name" select="1"/>
-					<field name="partner_id" select="1"/>
-					<field name="product_id" select="1"/>
-					<field name="create_uid" select="1" widget="selection">
-    					<filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>
+                    <filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
+                    <separator orientation="vertical"/>
+                    <field name="name" select="1"/>
+                    <field name="partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
+                    <field name="create_uid" select="1" widget="selection">
+                        <filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>
                         <filter icon="terp-purchase" domain="[('create_uid','child_of',[uid])]" help="My Departments Purchase Orders"/>
                     </field>
                 </group>
               </search>
             </field>
         </record>
-       
+
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>            
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
 
+<!--
         <record id="purchase_form_action2" model="ir.actions.act_window">
             <field name="name">Request For Quotations</field>
             <field name="type">ir.actions.act_window</field>
@@ -149,7 +150,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>            
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
 
@@ -161,7 +162,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','confirmed')]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>            
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
 
@@ -173,9 +174,10 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','approved')]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>            
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
         <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
+        -->
 
         <record id="purchase_form_action_new" model="ir.actions.act_window">
             <field name="name">New Purchase Order</field>
@@ -266,11 +268,11 @@
             src_model="res.partner"/>
 
         <act_window
-            domain="[('product_id','=',active_id)]" 
+            domain="[('product_id','=',active_id)]"
             id="action_purchase_line_product_tree"
             name="Product purchases"
-            res_model="purchase.order.line" 
-            src_model="product.product"/> 
-                     
+            res_model="purchase.order.line"
+            src_model="product.product"/>
+
     </data>
 </openerp>

From d2b5ed89cb64994a31d6a9b065ea580c4e370c2f Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 24 Nov 2009 11:11:34 +0100
Subject: [PATCH 17/59] [IMP] purchase: removed obsolete menu entries since we
 now have filters in advanced search

bzr revid: olt@tinyerp.com-20091124101134-0iptx7d1yl0br501
---
 addons/purchase/purchase_view.xml | 38 -------------------------------
 1 file changed, 38 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b1f48ff8774..605adbb734a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -141,44 +141,6 @@
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
 
-<!--
-        <record id="purchase_form_action2" model="ir.actions.act_window">
-            <field name="name">Request For Quotations</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-        <menuitem action="purchase_form_action2" id="menu_purchase_order_draft" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
-
-        <record id="purchase_form_action3" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','confirmed')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-        <menuitem action="purchase_form_action3" id="menu_purchase_form_action3" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
-
-        <record id="purchase_form_action4" model="ir.actions.act_window">
-            <field name="name">Purchase Orders in Progress</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','approved')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
-        </record>
-        <menuitem action="purchase_form_action4" id="menu_purchase_form_action4" parent="purchase.menu_purchase_form_action" groups="base.group_useability_extended"/>
-        -->
-
         <record id="purchase_form_action_new" model="ir.actions.act_window">
             <field name="name">New Purchase Order</field>
             <field name="type">ir.actions.act_window</field>

From 56c69a3fcaf2009f80c8ddf8cef925b9bcd5d1af Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 24 Nov 2009 16:03:41 +0530
Subject: [PATCH 18/59] [Merge]:Merged remaining changes

bzr revid: uco@tinyerp.co.in-20091124103341-u11umpaatol01yqp
---
 addons/crm/crm_view.xml                       |  2 +-
 addons/delivery/delivery_view.xml             |  2 +-
 addons/hr_holidays/hr_view.xml                |  4 +-
 .../hr_timesheet_sheet_view.xml               |  4 +-
 addons/project/project_view.xml               |  6 +--
 addons/report_sale/report_sale.py             | 47 ++++++++++++-------
 addons/report_sale/report_sale_view.xml       |  2 +
 addons/sale/sale_view.xml                     |  4 +-
 addons/scrum/scrum_view.xml                   | 16 +++----
 addons/stock/stock_view.xml                   |  2 +-
 10 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index f9f1614ce69..c5f8ca448fb 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -490,7 +490,7 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_extended_menu"/>
+        <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_useability_extended"/>
         <record id="crm_case_categ0-act_my_open" model="ir.actions.act_window">
             <field name="name">My Open Cases</field>
             <field name="res_model">crm.case</field>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 2c83fef3ec6..ca28ec3415a 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -180,7 +180,7 @@
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended_menu"/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_useability_extended"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 911b6c4a54a..a7c46b0e33e 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -253,7 +253,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_extended_menu" />
+        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_useability_extended" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_draft">
             <field name="name">My Draft Leave Request</field>
@@ -309,7 +309,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_extended_menu"/>
+        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_useability_extended"/>
 
 
         <record model="ir.actions.act_window" id="action_my_departments_holiday_waiting">
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 0bc345324a0..9f78c6ce236 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -212,7 +212,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended_menu"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60" groups="base.group_useability_extended"/>
         
         <record id="act_hr_timesheet_sheet_form_my_confirm" model="ir.actions.act_window">
             <field name="name">My timesheets to confirm</field>
@@ -235,7 +235,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_department" id="menu_act_hr_timesheet_sheet_form_my_department" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended_menu"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_department" id="menu_act_hr_timesheet_sheet_form_my_department" parent="hr_timesheet_sheet.next_id_60" groups="base.group_useability_extended"/>
 
         <record id="act_hr_timesheet_sheet_form_my_confirm_department" model="ir.actions.act_window">
             <field name="name">My Department's Timesheets to Confirm</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d837af47d97..a093032e9d2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -235,7 +235,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project" groups="base.group_extended_menu"
+        <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project" groups="base.group_useability_extended"
             sequence="1"/>
 
         <record id="open_view_my_project_my_run" model="ir.actions.act_window">
@@ -534,7 +534,7 @@
             <field eval="True" name="filter"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks" groups="base.group_extended_menu" />
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks" groups="base.group_useability_extended" />
 
         <record id="action_view_task_department" model="ir.actions.act_window">
             <field name="name">My Department Tasks</field>
@@ -546,7 +546,7 @@
             <field eval="True" name="filter"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task_department" id="menu_action_view_department_tasks" parent="project.menu_tasks" groups="base.group_extended_menu"/>
+        <menuitem action="action_view_task_department" id="menu_action_view_department_tasks" parent="project.menu_tasks" groups="base.group_useability_extended"/>
 
         <record id="action_view_task5_pending" model="ir.actions.act_window">
             <field name="name">My Pending Tasks</field>
diff --git a/addons/report_sale/report_sale.py b/addons/report_sale/report_sale.py
index 8c4705644ac..424b0c7042b 100644
--- a/addons/report_sale/report_sale.py
+++ b/addons/report_sale/report_sale.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,18 +15,20 @@
 #    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 tools
 from osv import fields,osv
 
+
 class report_sale_order_product(osv.osv):
     _name = "report.sale.order.product"
     _description = "Sales Orders by Products"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'state': fields.selection([
             ('draft','Quotation'),
             ('waiting_date','Waiting Schedule'),
@@ -42,14 +44,18 @@ class report_sale_order_product(osv.osv):
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True),
         'count': 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),
     }
     _order = 'name desc,price_total desc'
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sale_order_product')
         cr.execute("""
             create or replace view report_sale_order_product as (
                 select
                     min(l.id) as id,
-                    to_char(s.date_order, 'YYYY-MM-01') as name,
+                    to_char(s.date_order, 'YYYY') as name,
+                    to_char(s.date_order,'MM') as month,
                     s.state,
                     l.product_id,
                     sum(l.product_uom_qty*u.factor) as quantity,
@@ -60,7 +66,7 @@ class report_sale_order_product(osv.osv):
                     right join sale_order_line l on (s.id=l.order_id)
                     left join product_uom u on (u.id=l.product_uom)
                 where l.product_uom_qty != 0
-                group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
+                group by l.product_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state
             )
         """)
 report_sale_order_product()
@@ -70,7 +76,7 @@ class report_sale_order_category(osv.osv):
     _description = "Sales Orders by Categories"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'state': fields.selection([
             ('draft','Quotation'),
             ('waiting_date','Waiting Schedule'),
@@ -86,14 +92,19 @@ class report_sale_order_category(osv.osv):
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True),
         'count': 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),
+
     }
     _order = 'name desc,price_total desc'
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_sale_order_category')
         cr.execute("""
             create or replace view report_sale_order_category as (
                 select
                     min(l.id) as id,
-                    to_char(s.date_order, 'YYYY-MM-01') as name,
+                    to_char(s.date_order, 'YYYY') as name,
+                    to_char(s.date_order,'MM') as month,
                     s.state,
                     t.categ_id as category_id,
                     sum(l.product_uom_qty*u.factor) as quantity,
@@ -105,8 +116,8 @@ class report_sale_order_category(osv.osv):
                     left join product_product p on (p.id=l.product_id)
                     left join product_template t on (t.id=p.product_tmpl_id)
                     left join product_uom u on (u.id=l.product_uom)
-                where l.product_uom_qty != 0    
-                group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
+                where l.product_uom_qty != 0
+                group by t.categ_id,to_char(s.date_order, 'YYYY'),to_char(s.date_order,'MM'),s.state
             )
         """)
 report_sale_order_category()
@@ -119,13 +130,13 @@ class report_turnover_per_month(osv.osv):
         'name': fields.date('Month', readonly=True),
         'turnover': fields.float('Total Turnover', readonly=True),
     }
-    
+
     def init(self, cr):
         cr.execute("""
             create or replace view report_turnover_per_month as (
                 select min(am.id) as id, sum(credit) as turnover,to_char(am.date, 'YYYY-MM-01') as name from account_move_line am
-                    where am.account_id in (select distinct(account_id) from account_invoice_line) 
-                    and 
+                    where am.account_id in (select distinct(account_id) from account_invoice_line)
+                    and
                     am.move_id in(select distinct(aw.move_id) from account_invoice aw,account_invoice_line l where l.invoice_id=aw.id)
                     group by to_char(am.date, 'YYYY-MM-01')
             )
@@ -137,17 +148,17 @@ class report_turnover_per_product(osv.osv):
     _description = "Turnover Per Product"
     _auto = False
     _rec_name = 'product_id'
-    
+
     _columns = {
         'product_id': fields.many2one('product.product','Product', readonly=True),
         'turnover': fields.float('Total Turnover', readonly=True),
     }
-    
+
     def init(self, cr):
         cr.execute("""
             create or replace view report_turnover_per_product as (
-                select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id 
-                from account_move_line am                    
+                select min(am.id) as id, sum(credit) as turnover,am.product_id as product_id
+                from account_move_line am
                 group by am.product_id
             )
         """)
@@ -176,12 +187,12 @@ class report_sale_order_created(osv.osv):
         'create_date' : fields.datetime('Create Date', readolnly=True)
     }
     _order = 'create_date'
-    
+
     def init(self, cr):
         cr.execute("""create or replace view report_sale_order_created as (
             select
                 sale.id as id, sale.date_order as date_order, sale.name as name,
-                sale.partner_id as partner_id, 
+                sale.partner_id as partner_id,
                 sale.partner_shipping_id as partner_shipping_id,
                 sale.amount_untaxed as amount_untaxed, sale.state as state,
                 sale.create_date as create_date
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 4194f374d15..c7a09a1804b 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -9,6 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Sale Orders by Product">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="product_id" select="1"/>
                     <field name="count"/>
                     <field name="quantity" select="2"/>
@@ -73,6 +74,7 @@
             <field name="arch" type="xml">
                 <form string="Sale Orders by category">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="category_id" select="1"/>
                     <field name="count"/>
                     <field name="quantity" select="2"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4f31ec0e132..3cf275e9e70 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -260,7 +260,7 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
+        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
 
         <record id="action_order_tree_all" model="ir.actions.act_window">
             <field name="name">All Sales Order</field>
@@ -270,7 +270,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended_menu"/>
+        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
 
         <record id="action_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Quotation</field>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 4d9ebd7006b..81047222aa9 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -216,7 +216,7 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
+        <menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
         <record id="action_sprint_open_tree2" model="ir.actions.act_window">
             <field name="name">Draft Sprints</field>
             <field name="res_model">scrum.sprint</field>
@@ -224,7 +224,7 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
+        <menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
         <record id="action_sprint_open_tree3" model="ir.actions.act_window">
             <field name="name">Sprints Done</field>
             <field name="res_model">scrum.sprint</field>
@@ -232,7 +232,7 @@
             <field name="domain">[('state','=','done')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
+        <menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
         
         <record id="action_sprint_open_tree4" model="ir.actions.act_window">
             <field name="name">My Sprints (Product Owner)</field>
@@ -241,7 +241,7 @@
             <field name="domain">[('product_owner_id','=',uid)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
+        <menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
         <record id="action_sprint_open_tree5" model="ir.actions.act_window">
             <field name="name">My Sprints (Scrum Master)</field>
             <field name="res_model">scrum.sprint</field>
@@ -249,7 +249,7 @@
             <field name="domain">[('scrum_master_id','=',uid)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form" groups="base.group_extended_menu"/>
+        <menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
         
         <record id="action_sprint_open_tree6" model="ir.actions.act_window">
             <field name="name">My opened sprints (Product Owner)</field>
@@ -258,7 +258,7 @@
             <field name="domain">[('product_owner_id','=',uid),('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4" groups="base.group_extended_menu"/>
+        <menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4" groups="base.group_useability_extended"/>
         <record id="action_sprint_open_tree7" model="ir.actions.act_window">
             <field name="name">My opened sprints (Scrum Master)</field>
             <field name="res_model">scrum.sprint</field>
@@ -266,7 +266,7 @@
             <field name="domain">[('scrum_master_id','=',uid),('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5" groups="base.group_extended_menu"/>
+        <menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5" groups="base.group_useability_extended"/>
         
         <!--
               Daily Meeting
@@ -436,7 +436,7 @@
             <field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_extended_menu"/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_useability_extended"/>
         
         <record id="action_view_task5" model="ir.actions.act_window">
             <field name="name">My opened tasks</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e27db7d9975..456cbe2eb3f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1149,7 +1149,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree5"/>
         </record>
-        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended_menu"/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_useability_extended"/>
 
         <record id="action_picking_form" model="ir.actions.act_window">
             <field name="name">New Reception Packing</field>

From 75daa7a3a1987ce103572dc536202cacd6e2377d Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 24 Nov 2009 11:40:06 +0100
Subject: [PATCH 19/59] [IMP] purchase: removed obsolete menu entries since we
 now have filters in advanced search

bzr revid: olt@tinyerp.com-20091124104006-iwdat02s2zngav8c
---
 addons/purchase/purchase_view.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 605adbb734a..96ef44e39ae 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -149,6 +149,16 @@
         </record>
         <menuitem action="purchase_form_action_new" id="menu_purchase_form_action_new" parent="purchase.menu_purchase_root"/>
 
+        <record id="purchase_form_action3" model="ir.actions.act_window">
+            <field name="name">Purchase Order Waiting Approval</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="domain">[('state','=','confirmed')]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="view_purchase_order_filter"/>
+        </record>
 
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>

From 884459199cdaabf5b474cc9cc0d0b4ee72acf15a Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 24 Nov 2009 11:48:58 +0100
Subject: [PATCH 20/59] [IMP] sale: removed obsolete menu entries since we now
 have filters in advanced search

bzr revid: olt@tinyerp.com-20091124104858-k1iwmako7jsciv1u
---
 addons/sale/process/sale_process.xml         |  68 +++----
 addons/sale/sale_view.xml                    | 127 +++----------
 addons/sale_crm/process/sale_crm_process.xml | 182 +++++++++----------
 addons/sale_journal/sale_journal_view.xml    |  18 +-
 4 files changed, 156 insertions(+), 239 deletions(-)

diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 2eea479e5f0..0bcdd12d545 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
-        <!--        
+
+        <!--
             Process
         -->
-    
+
         <record id="process_process_salesprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;Sales&quot;&quot;&quot;" name="name"/>
         </record>
-        
-        <!--        
-            Process Node 
+
+        <!--
+            Process Node
         -->
-        
+
         <record id="process_node_order0" model="process.node">
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
@@ -27,7 +27,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_saleorderprocurement0" model="process.node">
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
@@ -39,9 +39,9 @@
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_quotation0" model="process.node">
-            <field name="menu_id" ref="sale.menu_action_order_tree10"/>
+            <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
@@ -52,7 +52,7 @@
         </record>
 
         <record id="process_node_saleorder0" model="process.node">
-            <field name="menu_id" ref="sale.menu_action_order_tree9"/>
+            <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Sale Order&quot;&quot;&quot;" name="name"/>
@@ -61,7 +61,7 @@
             <field eval="&quot;&quot;&quot;object.state=='manual'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_saleprocurement0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -119,8 +119,8 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
-        <!--        
+
+        <!--
             Process Condition
         -->
 
@@ -130,23 +130,23 @@
             <field eval="&quot;&quot;&quot;object.order_policy=='postpaid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="&quot;&quot;&quot;condition_after_delivery&quot;&quot;&quot;" name="name"/>
         </record>
-        
-        <!--        
+
+        <!--
             Process Transition
         -->
-        
+
         <record id="res_roles_salesman0" model="res.roles">
             <field eval="&quot;&quot;&quot;Salesman&quot;&quot;&quot;" name="name"/>
         </record>
-    
+
         <record id="sale.trans_draft_router" model="workflow.transition">
             <field name="role_id" ref="res_roles_salesman0"/>
         </record>
-    
-    	<record id="sale.trans_wait_invoice_invoice_manual" model="workflow.transition">
+
+        <record id="sale.trans_wait_invoice_invoice_manual" model="workflow.transition">
             <field name="role_id" ref="res_roles_salesman0"/>
         </record>
-    
+
         <record id="process_transition_confirmquotation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>
@@ -155,7 +155,7 @@
             <field model="process.node" name="source_node_id" ref="process_node_quotation0"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
-        
+
         <record id="process_transition_saleprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
@@ -171,7 +171,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
-        
+
         <record id="process_transition_deliver0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Delivery Order&quot;&quot;&quot;" name="name"/>
@@ -196,7 +196,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
         </record>
-    
+
         <record id="process_transition_saleorderprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -205,7 +205,7 @@
             <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
-        
+
         <record id="process_transition_saleinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -214,11 +214,11 @@
             <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_order0"/>
         </record>
-        
-        <!--        
+
+        <!--
             Process Action
         -->
-        
+
         <record id="process_transition_action_confirm0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_wait&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
@@ -232,7 +232,7 @@
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_confirmquotation0"/>
         </record>
-        
+
         <record id="process_transition_action_assign0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_assign&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
@@ -253,7 +253,7 @@
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_packing0"/>
         </record>
-        
+
         <record id="process_transition_action_cancelassignation0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;cancel_assign&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
@@ -274,20 +274,20 @@
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_deliver0"/>
         </record>
-        
+
         <record id="process_transition_action_createinvoice0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_invoice0"/>
         </record>
-    
-    	<record id="process_transition_action_cancelorder0" model="process.transition.action">
+
+        <record id="process_transition_action_cancelorder0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
             <field eval="&quot;&quot;&quot;Cancel Order&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_invoice0"/>
         </record>
-    
+
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7b572bed932..7be63508be2 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -218,7 +218,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_sales_order_filter" model="ir.ui.view">
             <field name="name">sale.order.list.select</field>
             <field name="model">sale.order</field>
@@ -232,46 +232,25 @@
                         <field name="name" select="1"/>
                         <field name="partner_id" select="1"/>
                         <field name="user_id" select="1" widget="selection">
-                        	<filter icon="terp-sale" domain="[('user_id','=',uid)]" help="My Sale Orders"/>
-                        	<filter icon="terp-sale" domain="[('user_id','child_of',[uid])]" help="My Departments Sale Orders"/>
+                            <filter icon="terp-sale" domain="[('user_id','=',uid)]" help="My Sale Orders"/>
+                            <filter icon="terp-sale" domain="[('user_id','child_of',[uid])]" help="My Departments Sale Orders"/>
                         </field>
                         <field name="date_order" select="1"/>
                    </group>
                </search>
             </field>
         </record>
-        
+
         <record id="action_order_form" model="ir.actions.act_window">
             <field name="name">Sales Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
 
-        <record id="action_order_tree" model="ir.actions.act_window">
-            <field name="name">My Sales Order</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
-        </record>
-        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
-
-        <record id="action_order_tree_all" model="ir.actions.act_window">
-            <field name="name">All Sales Order</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
-        </record>
-        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
-
         <record id="action_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Quotation</field>
             <field name="type">ir.actions.act_window</field>
@@ -281,7 +260,6 @@
         </record>
         <menuitem action="action_order_tree_new" id="menu_action_order_tree_new" parent="sale.menu_sale_order"/>
 
-
         <record id="action_order_tree2" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
             <field name="type">ir.actions.act_window</field>
@@ -290,9 +268,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('shipping_except','invoice_except'))]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_tree2" id="menu_action_order_tree2" parent="menu_action_order_tree_all" groups="base.group_useability_extended"/>
 
         <record id="action_order_tree3" model="ir.actions.act_window">
             <field name="name">Sales Order To Be Invoiced</field>
@@ -302,9 +279,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','manual')]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_tree3" id="menu_action_order_tree3" parent="sale.menu_action_order_tree_all" groups="base.group_useability_extended"/>
 
         <record id="action_order_tree4" model="ir.actions.act_window">
             <field name="name">Sales Order in Progress</field>
@@ -313,67 +289,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','in',('progress','waiting_date','manual'))]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_tree4" id="menu_action_order_tree4" parent="sale.menu_action_order_tree_all" sequence="2" groups="base.group_useability_extended"/>
 
-
-        <record id="action_order_tree5" model="ir.actions.act_window">
-            <field name="name">All Quotations</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
-        </record>
-        <menuitem action="action_order_tree5" id="menu_action_order_tree5" parent="sale.menu_action_order_tree_all" sequence="1" groups="base.group_useability_extended"/>
-
-        <record id="action_order_tree7" model="ir.actions.act_window">
-            <field name="name">My sales in shipping exception</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
-        </record>
-        <menuitem action="action_order_tree7" id="menu_action_order_tree7" parent="menu_action_order_tree" groups="base.group_useability_extended"/>
-
-        <record id="action_order_tree8" model="ir.actions.act_window">
-            <field name="name">My sales order waiting Invoice</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','manual'),('user_id','=',uid)]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
-        </record>
-        <menuitem action="action_order_tree8" id="menu_action_order_tree8" parent="sale.menu_action_order_tree" groups="base.group_useability_extended"/>
-
-        <record id="action_order_tree9" model="ir.actions.act_window">
-            <field name="name">My sales order in progress</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
-        </record>
-        <menuitem action="action_order_tree9" id="menu_action_order_tree9" parent="sale.menu_action_order_tree" sequence="2" groups="base.group_useability_extended"/>
-
-        <record id="action_order_tree10" model="ir.actions.act_window">
-            <field name="name">My Quotations</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
-        </record>
-        <menuitem action="action_order_tree10" id="menu_action_order_tree10" parent="sale.menu_action_order_tree" sequence="1" groups="base.group_useability_extended"/>
-
-		<record id="action_order_tree" model="ir.actions.act_window">
+        <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
@@ -381,7 +300,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="domain">[('state','=','draft'),('date_order','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_sales_order_filter"/>            
+            <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
         <record id="view_order_line_graph" model="ir.ui.view">
@@ -464,26 +383,26 @@
             </field>
         </record>
 
-		<record id="view_sales_order_line_filter" model="ir.ui.view">
+        <record id="view_sales_order_line_filter" model="ir.ui.view">
             <field name="name">sale.order.line.select</field>
             <field name="model">sale.order.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <group col='8' colspan='4'>
-						<filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
-						<separator orientation="vertical"/>
-						<field name="order_id" select="1"/>
+                        <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]" separator="1"/>
+                        <separator orientation="vertical"/>
+                        <field name="order_id" select="1"/>
                         <field name="order_partner_id" select="1"/>
                         <field name="product_id" select="1"/>
                         <field name="salesman_id" select="1" widget="selection">
-                        	<filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
-                        	<filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
+                            <filter icon="terp-sale" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+                            <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                         </field>
-					</group>
-				</search>
-			</field>
-		</record>
+                    </group>
+                </search>
+            </field>
+        </record>
 
         <record id="action_order_line_tree1" model="ir.actions.act_window">
             <field name="name">Sales Order Lines</field>
@@ -503,9 +422,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_order_line_tree2" id="menu_action_order_line_tree2" parent="sale.menu_action_order_line_tree1" groups="base.group_useability_extended"/>
 
         <record id="action_order_line_tree3" model="ir.actions.act_window">
             <field name="name">Uninvoiced and Delivered Lines</field>
@@ -514,9 +432,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_order_line_tree3" id="menu_action_order_line_tree3" parent="sale.menu_action_order_line_tree2" groups="base.group_useability_extended"/>
 
         <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_sale_order" name="Sales" res_model="sale.order" src_model="res.partner"/>
 
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index d0808a3a1bb..17c6f49d9b2 100755
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -1,94 +1,94 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-		<!--
-			Process Node
-		-->
-	
-		<record id="process_node_crmquotation0" model="process.node">
-			<field name="menu_id" ref="sale.menu_action_order_tree10"/>
+    <data>
+
+        <!--
+            Process Node
+        -->
+
+        <record id="process_node_crmquotation0" model="process.node">
+            <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
-			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Convert opportunity to quotation&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-		
-		<record id="process_node_crmopportunity0" model="process.node">
-			<field name="model_id" ref="crm.model_crm_case"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;CRM Opportunity&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The CRM Opportunity can lead to a quotation.&quot;&quot;&quot;" name="note"/>
-			<field name="subflow_id" ref="crm_configuration.process_process_contractprocess0"/>
-			<field name="process_id" ref="sale.process_process_salesprocess0"/>
-			<field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
-			<field eval="1" name="flow_start"/>
-		</record>
-		
-		<record id="process_node_contractanalytic0" model="process.node">
-			<field name="menu_id" ref="account.account_analytic_def_account"/>
-			<field name="model_id" ref="account.model_account_analytic_account"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Analytic account&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Reflect the contract made with customer&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-	
-		<record id="process_node_contractpricelist0" model="process.node">
-			<field name="menu_id" ref="product.menu_product_pricelist_action2"/>
-			<field name="model_id" ref="product.model_product_pricelist"/>
-			<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Contract Pricelist&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Contract Volume (pricelist)&quot;&quot;&quot;" name="note"/>
-			<field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
-			<field eval="0" name="flow_start"/>
-		</record>
-		
-		
-		<!--
-			Process Transition
-		-->
-		
-		<record id="process_transition_crmopportunityquotation" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Crm opportunity quotation&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Opportunity goes into the quotation&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="sale.process_node_quotation0"/>
-			<field model="process.node" name="source_node_id" ref="process_node_crmopportunity0"/>
-		</record>
-		
-		
-		<record id="process_transition_opportunityquotation0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Opportunity Quotation&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Opportunity convert into quotation&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_crmquotation0"/>
-			<field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
-		</record>
-		
-		<record id="process_transition_opportunitypricelist0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Opportunity Pricelist&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Opporunity convert to the Pricelist&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
-			<field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
-		</record>
-		
-		<record id="process_transition_opportunityanalytic0" model="process.transition">
-			<field eval="[(6,0,[])]" name="role_ids"/>
-			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Opportunity Analytic&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Analytic Account&quot;&quot;&quot;" name="note"/>
-			<field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
-			<field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
-		</record>
-		
-	</data>
-</openerp>
\ No newline at end of file
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Convert opportunity to quotation&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_crmopportunity0" model="process.node">
+            <field name="model_id" ref="crm.model_crm_case"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;CRM Opportunity&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The CRM Opportunity can lead to a quotation.&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+
+        <record id="process_node_contractanalytic0" model="process.node">
+            <field name="menu_id" ref="account.account_analytic_def_account"/>
+            <field name="model_id" ref="account.model_account_analytic_account"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Analytic account&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Reflect the contract made with customer&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_contractpricelist0" model="process.node">
+            <field name="menu_id" ref="product.menu_product_pricelist_action2"/>
+            <field name="model_id" ref="product.model_product_pricelist"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Contract Pricelist&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Contract Volume (pricelist)&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+
+        <!--
+            Process Transition
+        -->
+
+        <record id="process_transition_crmopportunityquotation" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Crm opportunity quotation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Opportunity goes into the quotation&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="sale.process_node_quotation0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_crmopportunity0"/>
+        </record>
+
+
+        <record id="process_transition_opportunityquotation0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Opportunity Quotation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Opportunity convert into quotation&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_crmquotation0"/>
+            <field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
+        </record>
+
+        <record id="process_transition_opportunitypricelist0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Opportunity Pricelist&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Opporunity convert to the Pricelist&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
+            <field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
+        </record>
+
+        <record id="process_transition_opportunityanalytic0" model="process.transition">
+            <field eval="[(6,0,[])]" name="role_ids"/>
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Opportunity Analytic&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic Account&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
+            <field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index d68007cc3db..4c1139c252e 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -30,7 +30,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    
+
     <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>
 
     <record model="ir.ui.view" id="view_sale_journal_form">
@@ -96,7 +96,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    
+
     <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>
 
     <record model="ir.actions.act_window" id="action_definition_journal_tree">
@@ -105,7 +105,7 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[]</field>
     </record>
-    
+
     <menuitem name="Sales by Journal" id="menu_definition_journal_sales" parent="sale.menu_sale_root" action="action_definition_journal_tree"/>
 
     <record model="ir.actions.act_window" id="action_definition_journal_tree_my">
@@ -114,9 +114,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-        <field name="filter" eval="True"/>        
+        <field name="filter" eval="True"/>
     </record>
-    
+
     <menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my" groups="base.group_useability_extended"/>
 
     <record model="ir.actions.act_window" id="action_definition_journal_tree_all">
@@ -125,9 +125,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open')]</field>
-        <field name="filter" eval="True"/>        
+        <field name="filter" eval="True"/>
     </record>
-    
+
     <menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all" groups="base.group_useability_extended"/>
 
     <record model="ir.ui.view" id="sale_journal_sale_order">
@@ -312,7 +312,7 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
     </record>
-    
+
     <menuitem name="Reporting" id="menu_definition_report_sales" parent="sale.menu_sale_root"/>
     <menuitem name="This Month" id="menu_definition_report_sales_this_month" parent="menu_definition_report_sales"/>
     <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_menu" parent="menu_definition_report_sales_this_month" action="action_sale_sale_stats_open_menu_month"/>
@@ -323,7 +323,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    
+
     <menuitem name="All Months" id="menu_definition_report_sales_all_month" parent="menu_definition_report_sales"/>
     <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales_all_month" action="action_sale_sale_stats_open_menu_all"/>
 

From 81db343942d90c37a2d4f842d9aa02e40a01f3f8 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 24 Nov 2009 17:01:33 +0530
Subject: [PATCH 21/59] [ADD] add corect translation files on base/i18n

bzr revid: mra@tinyerp.com-20091124113133-6zqwz2k7yh9i3ghj
---
 bin/addons/base/i18n/{ar_AR.po => ar.po} | 0
 bin/addons/base/i18n/{bg_BG.po => bg.po} | 0
 bin/addons/base/i18n/{bs_BS.po => bs.po} | 0
 bin/addons/base/i18n/{ca_ES.po => ca.po} | 0
 bin/addons/base/i18n/{cs_CZ.po => cs.po} | 0
 bin/addons/base/i18n/{de_DE.po => de.po} | 0
 bin/addons/base/i18n/{es_ES.po => es.po} | 0
 bin/addons/base/i18n/{et_EE.po => et.po} | 0
 bin/addons/base/i18n/{fi_FI.po => fi.po} | 0
 bin/addons/base/i18n/{fr_FR.po => fr.po} | 0
 bin/addons/base/i18n/{hr_HR.po => hr.po} | 0
 bin/addons/base/i18n/{hu_HU.po => hu.po} | 0
 bin/addons/base/i18n/{id_ID.po => id.po} | 0
 bin/addons/base/i18n/{it_IT.po => it.po} | 0
 bin/addons/base/i18n/{nl_NL.po => nl.po} | 0
 bin/addons/base/i18n/{pl_PL.po => pl.po} | 0
 bin/addons/base/i18n/{pt_PT.po => pt.po} | 0
 bin/addons/base/i18n/{ro_RO.po => ro.po} | 0
 bin/addons/base/i18n/{ru_RU.po => ru.po} | 0
 bin/addons/base/i18n/{sl_SL.po => sl.po} | 0
 bin/addons/base/i18n/{sq_AL.po => sq.po} | 0
 bin/addons/base/i18n/{sv_SE.po => sv.po} | 0
 bin/addons/base/i18n/{tr_TR.po => tr.po} | 0
 bin/addons/base/i18n/{vi_VN.po => vi.po} | 0
 bin/tools/misc.py                        | 7 ++++++-
 25 files changed, 6 insertions(+), 1 deletion(-)
 rename bin/addons/base/i18n/{ar_AR.po => ar.po} (100%)
 rename bin/addons/base/i18n/{bg_BG.po => bg.po} (100%)
 rename bin/addons/base/i18n/{bs_BS.po => bs.po} (100%)
 rename bin/addons/base/i18n/{ca_ES.po => ca.po} (100%)
 rename bin/addons/base/i18n/{cs_CZ.po => cs.po} (100%)
 rename bin/addons/base/i18n/{de_DE.po => de.po} (100%)
 rename bin/addons/base/i18n/{es_ES.po => es.po} (100%)
 rename bin/addons/base/i18n/{et_EE.po => et.po} (100%)
 rename bin/addons/base/i18n/{fi_FI.po => fi.po} (100%)
 rename bin/addons/base/i18n/{fr_FR.po => fr.po} (100%)
 rename bin/addons/base/i18n/{hr_HR.po => hr.po} (100%)
 rename bin/addons/base/i18n/{hu_HU.po => hu.po} (100%)
 rename bin/addons/base/i18n/{id_ID.po => id.po} (100%)
 rename bin/addons/base/i18n/{it_IT.po => it.po} (100%)
 rename bin/addons/base/i18n/{nl_NL.po => nl.po} (100%)
 rename bin/addons/base/i18n/{pl_PL.po => pl.po} (100%)
 rename bin/addons/base/i18n/{pt_PT.po => pt.po} (100%)
 rename bin/addons/base/i18n/{ro_RO.po => ro.po} (100%)
 rename bin/addons/base/i18n/{ru_RU.po => ru.po} (100%)
 rename bin/addons/base/i18n/{sl_SL.po => sl.po} (100%)
 rename bin/addons/base/i18n/{sq_AL.po => sq.po} (100%)
 rename bin/addons/base/i18n/{sv_SE.po => sv.po} (100%)
 rename bin/addons/base/i18n/{tr_TR.po => tr.po} (100%)
 rename bin/addons/base/i18n/{vi_VN.po => vi.po} (100%)

diff --git a/bin/addons/base/i18n/ar_AR.po b/bin/addons/base/i18n/ar.po
similarity index 100%
rename from bin/addons/base/i18n/ar_AR.po
rename to bin/addons/base/i18n/ar.po
diff --git a/bin/addons/base/i18n/bg_BG.po b/bin/addons/base/i18n/bg.po
similarity index 100%
rename from bin/addons/base/i18n/bg_BG.po
rename to bin/addons/base/i18n/bg.po
diff --git a/bin/addons/base/i18n/bs_BS.po b/bin/addons/base/i18n/bs.po
similarity index 100%
rename from bin/addons/base/i18n/bs_BS.po
rename to bin/addons/base/i18n/bs.po
diff --git a/bin/addons/base/i18n/ca_ES.po b/bin/addons/base/i18n/ca.po
similarity index 100%
rename from bin/addons/base/i18n/ca_ES.po
rename to bin/addons/base/i18n/ca.po
diff --git a/bin/addons/base/i18n/cs_CZ.po b/bin/addons/base/i18n/cs.po
similarity index 100%
rename from bin/addons/base/i18n/cs_CZ.po
rename to bin/addons/base/i18n/cs.po
diff --git a/bin/addons/base/i18n/de_DE.po b/bin/addons/base/i18n/de.po
similarity index 100%
rename from bin/addons/base/i18n/de_DE.po
rename to bin/addons/base/i18n/de.po
diff --git a/bin/addons/base/i18n/es_ES.po b/bin/addons/base/i18n/es.po
similarity index 100%
rename from bin/addons/base/i18n/es_ES.po
rename to bin/addons/base/i18n/es.po
diff --git a/bin/addons/base/i18n/et_EE.po b/bin/addons/base/i18n/et.po
similarity index 100%
rename from bin/addons/base/i18n/et_EE.po
rename to bin/addons/base/i18n/et.po
diff --git a/bin/addons/base/i18n/fi_FI.po b/bin/addons/base/i18n/fi.po
similarity index 100%
rename from bin/addons/base/i18n/fi_FI.po
rename to bin/addons/base/i18n/fi.po
diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr.po
similarity index 100%
rename from bin/addons/base/i18n/fr_FR.po
rename to bin/addons/base/i18n/fr.po
diff --git a/bin/addons/base/i18n/hr_HR.po b/bin/addons/base/i18n/hr.po
similarity index 100%
rename from bin/addons/base/i18n/hr_HR.po
rename to bin/addons/base/i18n/hr.po
diff --git a/bin/addons/base/i18n/hu_HU.po b/bin/addons/base/i18n/hu.po
similarity index 100%
rename from bin/addons/base/i18n/hu_HU.po
rename to bin/addons/base/i18n/hu.po
diff --git a/bin/addons/base/i18n/id_ID.po b/bin/addons/base/i18n/id.po
similarity index 100%
rename from bin/addons/base/i18n/id_ID.po
rename to bin/addons/base/i18n/id.po
diff --git a/bin/addons/base/i18n/it_IT.po b/bin/addons/base/i18n/it.po
similarity index 100%
rename from bin/addons/base/i18n/it_IT.po
rename to bin/addons/base/i18n/it.po
diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl.po
similarity index 100%
rename from bin/addons/base/i18n/nl_NL.po
rename to bin/addons/base/i18n/nl.po
diff --git a/bin/addons/base/i18n/pl_PL.po b/bin/addons/base/i18n/pl.po
similarity index 100%
rename from bin/addons/base/i18n/pl_PL.po
rename to bin/addons/base/i18n/pl.po
diff --git a/bin/addons/base/i18n/pt_PT.po b/bin/addons/base/i18n/pt.po
similarity index 100%
rename from bin/addons/base/i18n/pt_PT.po
rename to bin/addons/base/i18n/pt.po
diff --git a/bin/addons/base/i18n/ro_RO.po b/bin/addons/base/i18n/ro.po
similarity index 100%
rename from bin/addons/base/i18n/ro_RO.po
rename to bin/addons/base/i18n/ro.po
diff --git a/bin/addons/base/i18n/ru_RU.po b/bin/addons/base/i18n/ru.po
similarity index 100%
rename from bin/addons/base/i18n/ru_RU.po
rename to bin/addons/base/i18n/ru.po
diff --git a/bin/addons/base/i18n/sl_SL.po b/bin/addons/base/i18n/sl.po
similarity index 100%
rename from bin/addons/base/i18n/sl_SL.po
rename to bin/addons/base/i18n/sl.po
diff --git a/bin/addons/base/i18n/sq_AL.po b/bin/addons/base/i18n/sq.po
similarity index 100%
rename from bin/addons/base/i18n/sq_AL.po
rename to bin/addons/base/i18n/sq.po
diff --git a/bin/addons/base/i18n/sv_SE.po b/bin/addons/base/i18n/sv.po
similarity index 100%
rename from bin/addons/base/i18n/sv_SE.po
rename to bin/addons/base/i18n/sv.po
diff --git a/bin/addons/base/i18n/tr_TR.po b/bin/addons/base/i18n/tr.po
similarity index 100%
rename from bin/addons/base/i18n/tr_TR.po
rename to bin/addons/base/i18n/tr.po
diff --git a/bin/addons/base/i18n/vi_VN.po b/bin/addons/base/i18n/vi.po
similarity index 100%
rename from bin/addons/base/i18n/vi_VN.po
rename to bin/addons/base/i18n/vi.po
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 40b7413ad8b..d73422a6f34 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -775,7 +775,12 @@ get_iso = {'ca_ES':'ca',
 'sv_SE': 'sv',
 'sq_AL': 'sq',
 'uk_UA': 'uk',
-'vi_VN': 'vi' }
+'vi_VN': 'vi',
+'af_ZA': 'af',
+'be_BY': 'be',
+'ja_JP': 'ja',
+'ko_KR': 'ko'
+}
 
 def get_iso_codes(lang):
     if lang in get_iso:

From 8b52e8b93582b753c2265a3279d05e243e5d3b97 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Tue, 24 Nov 2009 13:13:46 +0100
Subject: [PATCH 22/59] [IMP] mrp: reorganized the Bill of Material form view

bzr revid: olt@tinyerp.com-20091124121346-e7clxb7ykg3vq7ku
---
 addons/mrp/mrp_view.xml | 42 +++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 23ad8fa76bc..52653780f44 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -221,8 +221,8 @@
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration"/>
 
         <!--
-    Bill of Materials
-    -->
+          Bill of Materials
+        -->
 
         <record id="mrp_bom_form_view" model="ir.ui.view">
             <field name="name">mrp.bom.form</field>
@@ -230,12 +230,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material">
-                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                    <group colspan="4" col="6">
+                      <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                      <field name="name" select="1"/>
+                      <field name="code" select="1"/>
+                    </group>
                     <newline/>
                     <field name="product_uom"/>
                     <field name="product_qty"/>
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
                     <newline/>
                     <field name="product_uos" groups="product.group_uos"/>
                     <field name="product_uos_qty" groups="product.group_uos"/>
@@ -518,7 +520,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_mrp_production_filter" model="ir.ui.view">
             <field name="name">mrp.production.select</field>
             <field name="model">mrp.production</field>
@@ -530,14 +532,14 @@
                        <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Production orders which are in production"/>
                        <separator orientation="vertical"/>
                        <field name="name" select='1'/>
-					   <field name="product_id" select='1'/>
-					   <field name="routing_id" select='1'/>	
+                       <field name="product_id" select='1'/>
+                       <field name="routing_id" select='1'/>
                        <field name="origin" select='1'/>
-					</group>
+                    </group>
                </search>
             </field>
         </record>
-        
+
         <record id="mrp_production_action" model="ir.actions.act_window">
             <field name="name">Production Orders</field>
             <field name="type">ir.actions.act_window</field>
@@ -545,7 +547,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="view_id" eval="False"/>
-            <field name="search_view_id" ref="view_mrp_production_filter"/>            
+            <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/>
 
@@ -571,7 +573,7 @@
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('state','=','ready')]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_mrp_production_filter"/>            
+            <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
         <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_useability_extended" />
         <record id="mrp_production_action3" model="ir.actions.act_window">
@@ -582,7 +584,7 @@
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('state','=','in_production')]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_mrp_production_filter"/>            
+            <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
         <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_useability_extended"/>
         <record id="mrp_production_action4" model="ir.actions.act_window">
@@ -593,7 +595,7 @@
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="domain">[('state','=','confirmed')]</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_mrp_production_filter"/>            
+            <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
         <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_useability_extended"/>
 
@@ -754,15 +756,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Procurement">
-                   	<group col='8' colspan='4'>
+                       <group col='8' colspan='4'>
                        <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement orders with exceptions"/>
                        <separator orientation="vertical"/>
                        <field name="name" select='1'/>
-					   <field name="product_id" select='1'/>
-					   <field name="date_planned" select='1'/>	
+                       <field name="product_id" select='1'/>
+                       <field name="date_planned" select='1'/>
                        <field name="state" select='1'/>
-					</group>
-				</search>
+                    </group>
+                </search>
             </field>
         </record>
         <record id="mrp_procurement_action" model="ir.actions.act_window">
@@ -874,7 +876,7 @@
         <!-- add product_uom to context to be the default value when adding new orderpoints -->
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id}"
-            domain="[('product_id', '=', active_id)]" 
+            domain="[('product_id', '=', active_id)]"
             id="act_product_product_2_stock_warehouse_orderpoint"
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"

From 253dbe213f493db0ea44f5d7fba9c64433b6ad2d Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Tue, 24 Nov 2009 18:54:19 +0530
Subject: [PATCH 23/59] [IMP]: Gave ref to group_extended to all menus

bzr revid: pso@tinyerp.com-20091124132419-1l0m03zfb8vy3lto
---
 addons/account/account_invoice_view.xml       | 18 ++++++-------
 addons/account/account_view.xml               |  4 +--
 .../account_analytic_analysis_menu.xml        |  8 +++---
 addons/account_payment/payment_view.xml       |  4 +--
 addons/auction/auction_view.xml               | 10 +++----
 addons/crm/crm_view.xml                       |  6 ++---
 addons/delivery/delivery_view.xml             |  4 +--
 addons/event/event_view.xml                   |  8 +++---
 addons/hr_expense/hr_expense_view.xml         | 14 +++++-----
 addons/hr_holidays/hr_view.xml                | 16 ++++++------
 addons/hr_timesheet/hr_timesheet_view.xml     |  4 +--
 .../hr_timesheet_sheet_view.xml               | 16 ++++++------
 addons/idea/idea_view.xml                     |  6 ++---
 addons/mrp/mrp_view.xml                       | 14 +++++-----
 addons/project/project_view.xml               | 26 +++++++++----------
 addons/sale_journal/picking_journal_view.xml  |  4 +--
 addons/sale_journal/sale_journal_view.xml     |  4 +--
 addons/scrum/scrum_view.xml                   | 22 ++++++++--------
 addons/stock/stock_view.xml                   | 22 ++++++++--------
 addons/wiki/wiki_view.xml                     |  4 +--
 20 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1ecf53b365b..e0b55bdb956 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -484,7 +484,7 @@
             <field name="act_window_id" ref="action_invoice_tree5"/>
         </record>
 
-        <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
 
         <record id="action_invoice_tree6" model="ir.actions.act_window">
             <field name="name">PRO-FORMA Customer Invoices</field>
@@ -508,7 +508,7 @@
             <field name="act_window_id" ref="action_invoice_tree6"/>
         </record>
 
-        <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
 
         <record id="action_invoice_tree7" model="ir.actions.act_window">
             <field name="name">Unpaid Customer Invoices</field>
@@ -532,7 +532,7 @@
             <field name="act_window_id" ref="action_invoice_tree7"/>
         </record>
 
-        <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_extended"/>
 
         <record id="action_invoice_tree8" model="ir.actions.act_window">
             <field name="name">Draft Supplier Invoices</field>
@@ -556,7 +556,7 @@
             <field name="act_window_id" ref="action_invoice_tree8"/>
         </record>
 
-        <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_extended"/>
 
         <record id="action_invoice_tree9" model="ir.actions.act_window">
             <field name="name">Unpaid Supplier Invoices</field>
@@ -580,7 +580,7 @@
             <field name="act_window_id" ref="action_invoice_tree9"/>
         </record>
 
-        <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_extended"/>
 
         <record id="action_invoice_tree10" model="ir.actions.act_window">
             <field name="name">Draft Customer Refunds</field>
@@ -604,7 +604,7 @@
             <field name="act_window_id" ref="action_invoice_tree10"/>
         </record>
 
-        <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_extended"/>
 
         <record id="action_invoice_tree11" model="ir.actions.act_window">
             <field name="name">Unpaid Customer Refunds</field>
@@ -628,7 +628,7 @@
             <field name="act_window_id" ref="action_invoice_tree11"/>
         </record>
 
-        <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_extended"/>
 
         <record id="action_invoice_tree12" model="ir.actions.act_window">
             <field name="name">Draft Supplier Refunds</field>
@@ -652,7 +652,7 @@
             <field name="act_window_id" ref="action_invoice_tree12"/>
         </record>
 
-        <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_extended"/>
 
         <record id="action_invoice_tree13" model="ir.actions.act_window">
             <field name="name">Unpaid Supplier Refunds</field>
@@ -676,7 +676,7 @@
             <field name="act_window_id" ref="action_invoice_tree13"/>
         </record>
 
-        <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_useability_extended"/>
+        <menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_extended"/>
 
         <act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a26dd5ae6e1..2d2a4af1f12 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -390,7 +390,7 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_useability_extended"/>
+        <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_extended"/>
 
         <record id="action_bank_statement_tree2" model="ir.actions.act_window">
             <field name="name">New Statement</field>
@@ -1343,7 +1343,7 @@
             <field name="domain">[('state','=','running')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_extended"/>
 
         <record id="action_subscription_form_new" model="ir.actions.act_window">
             <field name="name">New Subscription</field>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 83bb33651f7..6c21ede5dd3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -46,7 +46,7 @@
             <field name="filter" eval="True"/>            
         </record>
 
-        <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_useability_extended"/>
+        <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended"/>
 
         <record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
             <field name="name">My Pending Accounts</field>
@@ -57,7 +57,7 @@
             <field name="filter" eval="True"/>            
         </record>
 
-        <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_useability_extended"/>
+        <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed" groups="base.group_extended"/>
 
         <record id="action_account_analytic_new" model="ir.actions.act_window">
             <field name="name">New Analytic Account</field>
@@ -105,7 +105,7 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all" groups="base.group_useability_extended"/>
+        <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="menu_action_account_analytic_all" groups="base.group_extended"/>
 
         <record id="action_account_analytic_all_pending" model="ir.actions.act_window">
             <field name="name">Pending Analytic Accounts</field>
@@ -116,7 +116,7 @@
             <field name="domain">[('state','=','pending')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all" groups="base.group_useability_extended"/>
+        <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all" groups="base.group_extended"/>
 
     </data>
 </openerp>
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index c9d0ffa5b97..7c53d4858c1 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -192,7 +192,7 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_payment_order_draft" id="menu_action_payment_order_draft" parent="account_payment.menu_action_payment_order_form" sequence="2" groups="base.group_useability_extended"/>
+        <menuitem action="action_payment_order_draft" id="menu_action_payment_order_draft" parent="account_payment.menu_action_payment_order_form" sequence="2" groups="base.group_extended"/>
 
         <record id="action_payment_order_open" model="ir.actions.act_window">
             <field name="name">Payment Orders to Validate</field>
@@ -202,7 +202,7 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="3" groups="base.group_useability_extended"/>
+        <menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="3" groups="base.group_extended"/>
 
         <record id="action_payment_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Payment Order</field>
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index e6dc09c4305..3406fa80504 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -375,7 +375,7 @@
 	<menuitem name="Objects" parent="auction_menu_root" id="auction_objects_menu"/>
 	<menuitem name="All objects" action="action_all_objects" parent="auction_objects_menu" id="auction_all_objects_menu"/>
 
-	<menuitem name="Sold Objects" parent="auction_all_objects_menu" action="action_all_objects_sold" id="menu_all_objects_sold1" groups="base.group_useability_extended"/>
+	<menuitem name="Sold Objects" parent="auction_all_objects_menu" action="action_all_objects_sold" id="menu_all_objects_sold1" groups="base.group_extended"/>
 
 	<record model="ir.actions.act_window" id="action_all_objects_to_sell">
 		<field name="res_model">auction.lots</field>
@@ -384,7 +384,7 @@
 		<field name="domain">[('state','&lt;&gt;','sold')]</field>
         <field name="filter" eval="True"/>		
 	</record>
-	<menuitem name="Objects to sell" parent="auction_all_objects_menu" action="action_all_objects_to_sell" id="menu_all_objects_to_sell" groups="base.group_useability_extended"/>
+	<menuitem name="Objects to sell" parent="auction_all_objects_menu" action="action_all_objects_to_sell" id="menu_all_objects_to_sell" groups="base.group_extended"/>
 
 	<record model="ir.actions.act_window" id="action_all_objects_unplanned">
 		<field name="res_model">auction.lots</field>
@@ -393,7 +393,7 @@
 		<field name="domain">[('auction_id','=', False),('state','=','draft')]</field>
         <field name="filter" eval="True"/>		
 	</record>
-	<menuitem name="Unplanned objects" parent="auction_all_objects_menu" action="action_all_objects_unplanned" id="menu_all_objects_unplanned1" groups="base.group_useability_extended"/>
+	<menuitem name="Unplanned objects" parent="auction_all_objects_menu" action="action_all_objects_unplanned" id="menu_all_objects_unplanned1" groups="base.group_extended"/>
 
 
 	<!--		for the sold object  start-->
@@ -410,7 +410,7 @@
 		parent="auction_all_objects_menu"
 		action="action_all_objects_unsold"
 		id="menu_all_objects_unsold"
-		groups="base.group_useability_extended"/>
+		groups="base.group_extended"/>
 
 
 
@@ -486,7 +486,7 @@
 		<field name="view_mode">tree,form</field>
         <field name="filter" eval="True"/>		
 	 </record>
-	 <menuitem name="Unclassified objects" parent="auction_all_objects_menu" action="action_unclassified_objects" id="menu_all_objects_unclassified" groups="base.group_useability_extended"/>
+	 <menuitem name="Unclassified objects" parent="auction_all_objects_menu" action="action_unclassified_objects" id="menu_all_objects_unclassified" groups="base.group_extended"/>
 
 	<record model="ir.ui.view" id="v12">
 		<field name="name">Auction.deposit.tree</field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 50c4a75b546..add1c01c418 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -481,7 +481,7 @@
             <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_useability_extended"/>
+        <menuitem action="crm_case_categ0-act_open" id="menu_crm_case_categ0-act_open" parent="crm.menu_crm_case_categ0-act" groups="base.group_extended"/>
 
         <record id="crm_case_categ0-act_my" model="ir.actions.act_window">
             <field name="name">My cases</field>
@@ -491,7 +491,7 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_useability_extended"/>
+        <menuitem action="crm_case_categ0-act_my" id="menu_crm_case_categ0-act_my" parent="crm.next_id_52" groups="base.group_extended"/>
         <record id="crm_case_categ0-act_my_open" model="ir.actions.act_window">
             <field name="name">My Open Cases</field>
             <field name="res_model">crm.case</field>
@@ -500,7 +500,7 @@
             <field name="domain">[('user_id','=',uid),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>            
         </record>
-        <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_useability_extended"/>
+        <menuitem action="crm_case_categ0-act_my_open" id="menu_crm_case_categ0-act_my_open" parent="crm.menu_crm_case_categ0-act_my" groups="base.group_extended"/>
 
         <record id="crm_case_section_open_act" model="ir.actions.act_window">
             <field name="name">crm.case.section.open</field>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index aee36f5d843..4599ca5f5f6 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -168,7 +168,7 @@
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
         </record>
-        <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree" groups="base.group_useability_extended"/>
+        <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree" groups="base.group_extended"/>
 
         <record id="action_picking_tree5" model="ir.actions.act_window">
             <field name="name">Generate Draft Invoices On Receptions</field>
@@ -181,7 +181,7 @@
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_useability_extended"/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended"/>
 
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f0db2e64cc1..3141b1a9ee2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -149,7 +149,7 @@
 		<menuitem
 			parent="menu_event_event"
 			id="menu_event_event_draft"
-            action="action_event_view_draft" groups="base.group_useability_extended"/>
+            action="action_event_view_draft" groups="base.group_extended"/>
 		<record model="ir.actions.act_window" id="action_event_view_confirm">
 			<field name="name">Confirmed Events</field>
 			<field name="type">ir.actions.act_window</field>
@@ -159,7 +159,7 @@
 		</record>
 		<menuitem parent="menu_event_event"
 			id="menu_event_event_confirm"
-            action="action_event_view_confirm" groups="base.group_useability_extended"/>
+            action="action_event_view_confirm" groups="base.group_extended"/>
 
 
 	<!-- EVENTS/REGISTRATIONS/EVENTS  -->
@@ -307,7 +307,7 @@
 		<menuitem
 			parent="menu_action_registration"
 			id="menu_action_registration_draft"
-            action="action_registration_draft" groups="base.group_useability_extended"/>
+            action="action_registration_draft" groups="base.group_extended"/>
 		<record model="ir.actions.act_window" id="action_registration_confirm">
 		  <field name="name">Confirmed Registrations</field>
 		  <field name="res_model">event.registration</field>
@@ -318,7 +318,7 @@
 		<menuitem
 			parent="menu_action_registration"
 			id="menu_action_registration_confirm"
-            action="action_registration_confirm" groups="base.group_useability_extended"/>
+            action="action_registration_confirm" groups="base.group_extended"/>
 
 
 	<!-- report , event on registration... start -->
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 05b0ceb1358..7af1c0c92ca 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -138,7 +138,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all" groups="base.group_useability_extended"/>
+        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
         <record id="expense_all_confirm" model="ir.actions.act_window">
             <field name="name">Expenses waiting validation</field>
             <field name="res_model">hr.expense.expense</field>
@@ -148,7 +148,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all" groups="base.group_useability_extended"/>
+        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
         <record id="expense_all_valid" model="ir.actions.act_window">
             <field name="name">Expenses waiting invoice</field>
             <field name="res_model">hr.expense.expense</field>
@@ -158,7 +158,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all" groups="base.group_useability_extended"/>
+        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
         <record id="expense_all_invoiced" model="ir.actions.act_window">
             <field name="name">Expenses waiting payment</field>
             <field name="res_model">hr.expense.expense</field>
@@ -168,7 +168,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all" groups="base.group_useability_extended"/>
+        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
         
         <!--
 		My expenses menu
@@ -182,7 +182,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49" groups="base.group_useability_extended"/>
+        <menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49" groups="base.group_extended"/>
 
         <record id="expense_my_new" model="ir.actions.act_window">
             <field name="name">New Expenses Sheet</field>
@@ -203,7 +203,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my" groups="base.group_useability_extended"/>
+        <menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
         <record id="expense_my_confirm" model="ir.actions.act_window">
             <field name="name">My expenses waiting validation</field>
             <field name="res_model">hr.expense.expense</field>
@@ -213,7 +213,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my" groups="base.group_useability_extended"/>
+        <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
         
         <record id="view_product_hr_expense_form" model="ir.ui.view">
 			<field name="name">product.product.expense.form</field>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 3fc7a8ef52e..400381275d9 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -253,7 +253,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_useability_extended" />
+        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_extended" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_draft">
             <field name="name">My Draft Leave Request</field>
@@ -266,7 +266,7 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" groups="base.group_useability_extended" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" groups="base.group_extended" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_waiting">
             <field name="name">My Awaiting Confirmation Leave Requests</field>
@@ -278,7 +278,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" groups="base.group_useability_extended" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" groups="base.group_extended" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_validate">
             <field name="name">My Validated Leave Requests</field>
@@ -290,7 +290,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" groups="base.group_useability_extended" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" groups="base.group_extended" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_refuse">
             <field name="name">My Refused Leave Requests</field>
@@ -302,7 +302,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" groups="base.group_useability_extended" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" groups="base.group_extended" />
 
 
         <record model="ir.actions.act_window" id="action_departments_my_holiday">
@@ -315,7 +315,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_useability_extended"/>
+        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_extended"/>
 
 
         <record model="ir.actions.act_window" id="action_my_departments_holiday_waiting">
@@ -328,7 +328,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_my_departments_holiday" id="menu_action_my_departments_holiday_waiting" action="action_my_departments_holiday_waiting" groups="base.group_useability_extended" />
+        <menuitem parent="menu_action_my_departments_holiday" id="menu_action_my_departments_holiday_waiting" action="action_my_departments_holiday_waiting" groups="base.group_extended" />
 
 
 
@@ -342,7 +342,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-        <menuitem parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" groups="base.group_useability_extended" />
+        <menuitem parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" groups="base.group_extended" />
 
 
     <!--  Shortcuts -->
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 0f1d13fe0ad..be37bc6ee52 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -83,7 +83,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>                        
         </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form" groups="base.group_extended"/>
  
         
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
@@ -110,7 +110,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form" groups="base.group_extended"/>
        
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cc559012243..f8b9ab93d75 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -212,7 +212,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended"/>
         
         <record id="act_hr_timesheet_sheet_form_my_confirm" model="ir.actions.act_window">
             <field name="name">My timesheets to confirm</field>
@@ -224,7 +224,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" groups="base.group_extended"/>
 
         <record id="act_hr_timesheet_sheet_form_my_department" model="ir.actions.act_window">
             <field name="name">My Department's Timesheets</field>
@@ -236,7 +236,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_department" id="menu_act_hr_timesheet_sheet_form_my_department" parent="hr_timesheet_sheet.next_id_60" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_department" id="menu_act_hr_timesheet_sheet_form_my_department" parent="hr_timesheet_sheet.next_id_60" groups="base.group_extended"/>
 
         <record id="act_hr_timesheet_sheet_form_my_confirm_department" model="ir.actions.act_window">
             <field name="name">My Department's Timesheets to Confirm</field>
@@ -248,7 +248,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_confirm_department" id="menu_act_hr_timesheet_sheet_form_my_confirm_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_confirm_department" id="menu_act_hr_timesheet_sheet_form_my_confirm_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended"/>
 
         <record id="act_hr_timesheet_sheet_form_my_validate_department" model="ir.actions.act_window">
             <field name="name">My Department's Timesheets to Validate</field>
@@ -260,7 +260,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_my_validate_department" id="menu_act_hr_timesheet_sheet_form_my_validate_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_form_my_validate_department" id="menu_act_hr_timesheet_sheet_form_my_validate_department" parent="menu_act_hr_timesheet_sheet_form_my_department" groups="base.group_extended"/>
         
         <wizard id="act_hr_timesheet_sheet_form_my_current" model="hr.employee" name="hr_timesheet_sheet.current.open" string="My Current Timesheet"/>
 
@@ -276,7 +276,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended"/>
         
         <record id="act_hr_timesheet_sheet_form_all_valid" model="ir.actions.act_window">
             <field name="name">Timesheets To Validate</field>
@@ -288,7 +288,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
-        <menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended"/>
         
         <!--
             Company inheritancy
@@ -386,6 +386,6 @@
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>            
         </record>
         
-        <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_useability_extended"/>
+        <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form" groups="base.group_extended"/>
     </data>
 </openerp>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index f4b6ad10c6a..32a5d4d30d2 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -193,7 +193,7 @@
         <field name="domain">[('state','=','open')]</field>
         <field name="filter" eval="True"/>        
     </record>
-    <menuitem name="Open Ideas" parent="menu_idea_idea" id="menu_idea_idea_open" action="action_idea_idea_open" groups="base.group_useability_extended" />
+    <menuitem name="Open Ideas" parent="menu_idea_idea" id="menu_idea_idea_open" action="action_idea_idea_open" groups="base.group_extended" />
 
 
     <record model="ir.actions.act_window" id="action_idea_idea_my_idea">
@@ -217,7 +217,7 @@
         name="My Draft Ideas" parent="menu_idea_idea_my_idea"
         id="menu_idea_idea_draft_my" 
         action="action_idea_idea_draft_my"
-        groups="base.group_useability_extended" />
+        groups="base.group_extended" />
 
     <record model="ir.actions.act_window" id="action_idea_idea_open_my">
         <field name="name">My Open Ideas</field>
@@ -231,7 +231,7 @@
         name="My Open Ideas" parent="menu_idea_idea_my_idea"
         id="menu_idea_idea_open_my"
         action="action_idea_idea_open_my"
-        groups="base.group_useability_extended"
+        groups="base.group_extended"
         />
 
         <record model="ir.ui.view" id="view_idea_vote_stat_graph">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 23ad8fa76bc..dc4dda08863 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -573,7 +573,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_useability_extended" />
+        <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_extended" />
         <record id="mrp_production_action3" model="ir.actions.act_window">
             <field name="name">Production Orders in Progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -584,7 +584,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_useability_extended"/>
+        <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_extended"/>
         <record id="mrp_production_action4" model="ir.actions.act_window">
             <field name="name">Production Orders Waiting Products</field>
             <field name="type">ir.actions.act_window</field>
@@ -595,7 +595,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>            
         </record>
-        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_useability_extended"/>
+        <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_extended"/>
 
          <record id="mrp_production_new" model="ir.actions.act_window">
             <field name="name">New Production Order</field>
@@ -783,7 +783,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
-        <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_useability_extended"/>
+        <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_extended"/>
 
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
             <field name="name">Exceptions Procurements</field>
@@ -793,7 +793,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
         </record>
-        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_useability_extended"/>
+        <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_extended"/>
 
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
             <field name="name">Exceptions Procurements to Fix</field>
@@ -804,7 +804,7 @@
             <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
             <field name="filter" eval="True"/>
         </record>
-        <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/>
+        <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended"/>
 
         <record id="mrp_procurement_action11" model="ir.actions.act_window">
             <field name="name">Temporary Procurement Exceptions</field>
@@ -814,7 +814,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
         </record>
-        <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/>
+        <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_extended"/>
 
          <record id="mrp_procurement_new" model="ir.actions.act_window">
             <field name="name">New Procurement</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 04cebc06c90..e412213407b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -163,7 +163,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <menuitem action="open_view_project_open" id="menu_open_view_project_open" groups="base.group_useability_extended" parent="menu_open_view_project_all"/>
+        <menuitem action="open_view_project_open" id="menu_open_view_project_open" groups="base.group_extended" parent="menu_open_view_project_all"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
@@ -236,7 +236,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
-        <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project" groups="base.group_useability_extended"
+        <menuitem action="open_view_my_project" id="menu_open_view_my_project" parent="menu_all_project" groups="base.group_extended"
             sequence="1"/>
 
         <record id="open_view_my_project_my_run" model="ir.actions.act_window">
@@ -251,7 +251,7 @@
         <menuitem
             action="open_view_my_project_my_run"
             id="menu_open_view_my_project_my_run"
-            groups="base.group_useability_extended"
+            groups="base.group_extended"
             parent="menu_open_view_my_project"/>
 
         <record id="open_view_my_project_open" model="ir.actions.act_window">
@@ -540,7 +540,7 @@
             <field eval="True" name="filter"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks" groups="base.group_useability_extended" />
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="project.menu_tasks" groups="base.group_extended" />
 
         <record id="action_view_task_department" model="ir.actions.act_window">
             <field name="name">My Department Tasks</field>
@@ -552,7 +552,7 @@
             <field eval="True" name="filter"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task_department" id="menu_action_view_department_tasks" parent="project.menu_tasks" groups="base.group_useability_extended"/>
+        <menuitem action="action_view_task_department" id="menu_action_view_department_tasks" parent="project.menu_tasks" groups="base.group_extended"/>
 
         <record id="action_view_task5_pending" model="ir.actions.act_window">
             <field name="name">My Pending Tasks</field>
@@ -564,7 +564,7 @@
             <field name="view_id" ref="my_pending_task"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" groups="base.group_useability_extended" parent="menu_action_view_task4"/>
+        <menuitem action="action_view_task5_pending" id="menu_tasks_yours_pending" groups="base.group_extended" parent="menu_action_view_task4"/>
 
         <record id="action_view_task5_prog" model="ir.actions.act_window">
             <field name="name">My Current Tasks</field>
@@ -589,7 +589,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_prog_prog" id="menu_tasks_yours_prog_prog" groups="base.group_useability_extended" parent="menu_tasks_yours_prog"/>
+        <menuitem action="action_view_task5_prog_prog" id="menu_tasks_yours_prog_prog" groups="base.group_extended" parent="menu_tasks_yours_prog"/>
 
         <record id="action_view_task5_prog_draft" model="ir.actions.act_window">
             <field name="name">My Draft Tasks</field>
@@ -601,7 +601,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_prog_draft" id="menu_tasks_yours_prog_draft" groups="base.group_useability_extended" parent="menu_tasks_yours_prog"/>
+        <menuitem action="action_view_task5_prog_draft" id="menu_tasks_yours_prog_draft" groups="base.group_extended" parent="menu_tasks_yours_prog"/>
 
         <record id="action_view_task5_departments_pending" model="ir.actions.act_window">
             <field name="name">My Department's Pending Tasks</field>
@@ -613,7 +613,7 @@
            <field name="filter" eval="True"/>
            <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_departments_pending" id="menu_tasks_yours_departments_pending" groups="base.group_useability_extended" parent="menu_action_view_department_tasks"/>
+        <menuitem action="action_view_task5_departments_pending" id="menu_tasks_yours_departments_pending" groups="base.group_extended" parent="menu_action_view_department_tasks"/>
 
         <record id="action_view_task5_departments_prog" model="ir.actions.act_window">
             <field name="name">My Department's Current Tasks</field>
@@ -636,7 +636,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_departments_prog_prog" id="menu_tasks_yours_departments_prog_prog" groups="base.group_useability_extended" parent="menu_tasks_yours_departments_prog"/>
+        <menuitem action="action_view_task5_departments_prog_prog" id="menu_tasks_yours_departments_prog_prog" groups="base.group_extended" parent="menu_tasks_yours_departments_prog"/>
 
         <record id="action_view_task5_departments_prog_draft" model="ir.actions.act_window">
             <field name="name">My Department's Draft Tasks</field>
@@ -647,7 +647,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task5_departments_prog_draft" id="menu_tasks_yours_departments_prog_draft" groups="base.group_useability_extended" parent="menu_tasks_yours_departments_prog"/>
+        <menuitem action="action_view_task5_departments_prog_draft" id="menu_tasks_yours_departments_prog_draft" groups="base.group_extended" parent="menu_tasks_yours_departments_prog"/>
 
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
@@ -675,7 +675,7 @@
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="domain">[('state','=','open')]</field>
         </record>
-        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task" groups="base.group_useability_extended"/>
+        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task" groups="base.group_extended"/>
 
         <record id="action_view_task7" model="ir.actions.act_window">
             <field name="name">Unassigned Tasks</field>
@@ -686,7 +686,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
-        <menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task" groups="base.group_useability_extended"/>
+        <menuitem action="action_view_task7" id="menu_action_view_task7" parent="project.menu_action_view_task" groups="base.group_extended"/>
 
         <!-- Opening task when double clicking on project -->
         <record id="dblc_proj" model="ir.actions.act_window">
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 82f594c97e3..5215b89f210 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -79,7 +79,7 @@
         <field name="filter" eval="True"/>		
 	</record>
 	
-	<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"  groups="base.group_useability_extended"/>
+	<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"  groups="base.group_extended"/>
 	
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
 		<field name="name">Packing by journal</field>
@@ -90,7 +90,7 @@
         <field name="filter" eval="True"/>		
 	</record>
 	
-	<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_useability_extended"/>
+	<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_extended"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_tree">
 		<field name="name">Packing by invoice_method</field>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 4c1139c252e..124c60c4a4b 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -117,7 +117,7 @@
         <field name="filter" eval="True"/>
     </record>
 
-    <menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my" groups="base.group_useability_extended"/>
+    <menuitem name="My Open Journals" id="menu_definition_journal_sales_my_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_my" groups="base.group_extended"/>
 
     <record model="ir.actions.act_window" id="action_definition_journal_tree_all">
         <field name="name">Open journals</field>
@@ -128,7 +128,7 @@
         <field name="filter" eval="True"/>
     </record>
 
-    <menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all" groups="base.group_useability_extended"/>
+    <menuitem name="All Open Journals" id="menu_definition_journal_sales_all_open" parent="menu_definition_journal_sales" action="action_definition_journal_tree_all" groups="base.group_extended"/>
 
     <record model="ir.ui.view" id="sale_journal_sale_order">
         <field name="name">sale.order.journal.view.form</field>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 4c1a742d47c..af317e98118 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -126,7 +126,7 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_product_backlog_form_draft" id="menu_action_product_backlog_form_draft" parent="scrum.menu_action_product_backlog_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_product_backlog_form_draft" id="menu_action_product_backlog_form_draft" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended"/>
         
         <record id="action_product_backlog_form_open" model="ir.actions.act_window">
             <field name="name">Opened Backlogs</field>
@@ -136,7 +136,7 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_product_backlog_form_open" id="menu_action_product_backlog_form_open" parent="scrum.menu_action_product_backlog_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_product_backlog_form_open" id="menu_action_product_backlog_form_open" parent="scrum.menu_action_product_backlog_form" groups="base.group_extended"/>
         
         <!--
               Scrum Sprint
@@ -218,7 +218,7 @@
             <field name="domain">[('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_sprint_open_tree" id="menu_action_sprint_open_tree" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
         <record id="action_sprint_open_tree2" model="ir.actions.act_window">
             <field name="name">Draft Sprints</field>
             <field name="res_model">scrum.sprint</field>
@@ -226,7 +226,7 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_sprint_open_tree2" id="menu_action_sprint_open_tree2" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
         <record id="action_sprint_open_tree3" model="ir.actions.act_window">
             <field name="name">Sprints Done</field>
             <field name="res_model">scrum.sprint</field>
@@ -234,7 +234,7 @@
             <field name="domain">[('state','=','done')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_sprint_open_tree3" id="menu_action_sprint_open_tree3" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
         
         <record id="action_sprint_open_tree4" model="ir.actions.act_window">
             <field name="name">My Sprints (Product Owner)</field>
@@ -243,7 +243,7 @@
             <field name="domain">[('product_owner_id','=',uid)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_sprint_open_tree4" id="menu_action_sprint_open_tree4" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
         <record id="action_sprint_open_tree5" model="ir.actions.act_window">
             <field name="name">My Sprints (Scrum Master)</field>
             <field name="res_model">scrum.sprint</field>
@@ -251,7 +251,7 @@
             <field name="domain">[('scrum_master_id','=',uid)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_sprint_open_tree5" id="menu_action_sprint_open_tree5" parent="scrum.menu_action_sprint_form" groups="base.group_extended"/>
         
         <record id="action_sprint_open_tree6" model="ir.actions.act_window">
             <field name="name">My opened sprints (Product Owner)</field>
@@ -260,7 +260,7 @@
             <field name="domain">[('product_owner_id','=',uid),('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4" groups="base.group_useability_extended"/>
+        <menuitem action="action_sprint_open_tree6" id="menu_action_sprint_open_tree6" parent="scrum.menu_action_sprint_open_tree4" groups="base.group_extended"/>
         <record id="action_sprint_open_tree7" model="ir.actions.act_window">
             <field name="name">My opened sprints (Scrum Master)</field>
             <field name="res_model">scrum.sprint</field>
@@ -268,7 +268,7 @@
             <field name="domain">[('scrum_master_id','=',uid),('state','=','open')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5" groups="base.group_useability_extended"/>
+        <menuitem action="action_sprint_open_tree7" id="menu_action_sprint_open_tree7" parent="scrum.menu_action_sprint_open_tree5" groups="base.group_extended"/>
         
         <!--
               Daily Meeting
@@ -438,7 +438,7 @@
             <field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.menu_action_view_task" groups="base.group_useability_extended"/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.menu_action_view_task" groups="base.group_extended"/>
         
         <record id="action_view_task5" model="ir.actions.act_window">
             <field name="name">My opened tasks</field>
@@ -448,7 +448,7 @@
             <field name="domain">[('user_id','=',uid),('state','=','open'),('scrum','=',1)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="scrum.menu_action_view_task4" groups="base.group_useability_extended"/>
+        <menuitem action="action_view_task5" id="menu_tasks_yours" parent="scrum.menu_action_view_task4" groups="base.group_extended"/>
         
         <record id="action_view_task6" model="ir.actions.act_window">
             <field name="name">Opened tasks</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dd218f0dc65..8f6c3d21ea8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -91,7 +91,7 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_useability_extended"/>
+        <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_extended"/>
         <record id="action_inventory_form_new" model="ir.actions.act_window">
             <field name="name">New Periodical Inventory</field>
             <field name="type">ir.actions.act_window</field>
@@ -767,7 +767,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree2_delivery"/>
         </record>
-        <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_useability_extended" />
+        <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended" />
 
         <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
             <field name="name">Future Delivery Orders</field>
@@ -797,7 +797,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree3_delivery"/>
         </record>
-        <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_useability_extended" />
+        <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended" />
 
        <record id="action_picking_calendar_delivery" model="ir.actions.act_window">
             <field name="name">Calendar of Deliveries</field>
@@ -808,7 +808,7 @@
             <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
-        <menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_useability_extended" />
+        <menuitem action="action_picking_calendar_delivery" id="menu_picking_calendar_delivery" parent="menu_action_picking_tree_delivery" groups="base.group_extended" />
 
         #
         # Sending Products
@@ -966,7 +966,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree2"/>
         </record>
-        <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_useability_extended"/>
+        <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_extended"/>
 
         <record id="action_picking_tree3" model="ir.actions.act_window">
             <field name="name">Confirmed Packing Waiting Availability</field>
@@ -996,7 +996,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree3"/>
         </record>
-        <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree" groups="base.group_useability_extended"/>
+        <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree" groups="base.group_extended"/>
 
         #
         # Reception of Products
@@ -1156,7 +1156,7 @@
             <field name="view_mode">calendar</field>
             <field name="act_window_id" ref="action_picking_tree5"/>
         </record>
-        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_useability_extended"/>
+        <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended"/>
 
         <record id="action_picking_form" model="ir.actions.act_window">
             <field name="name">New Reception Packing</field>
@@ -1211,7 +1211,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/>
+        <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_extended"/>
 
         <record id="action_picking_tree8" model="ir.actions.act_window">
             <field name="name">Confirmed Packing Waiting Availability</field>
@@ -1224,7 +1224,7 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>            
         </record>
-        <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/>
+        <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_extended"/>
 
         <record id="action_picking_tree9" model="ir.actions.act_window">
             <field name="name">New Internal Packing</field>
@@ -1327,7 +1327,7 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_useability_extended"/>
+        <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_extended"/>
 
         <record id="action_move_form4" model="ir.actions.act_window">
             <field name="name">Available Moves</field>
@@ -1338,7 +1338,7 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_useability_extended"/>
+        <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_extended"/>
 
         <record id="action_picking_all" model="ir.actions.act_window">
             <field name="name">Packing</field>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 7034f029422..5a48012094d 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -159,7 +159,7 @@
             <field name="filter" eval="True"/>
         </record>
         <menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_mypages" string="My Pages" 
-        action="action_wiki_mypages" groups="base.group_useability_extended"/>
+        action="action_wiki_mypages" groups="base.group_extended"/>
         
         <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">
@@ -173,7 +173,7 @@
             <field name="filter" eval="True"/>
         </record>
         <menuitem parent="menu_action_wiki_wiki" id="menu_action_wiki_review" string="Pages Waiting Review" 
-        action="action_wiki_review" groups="base.group_useability_extended"/>
+        action="action_wiki_review" groups="base.group_extended"/>
         
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>

From caa1f39746e2582843975770ca66cff75e89eac4 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 24 Nov 2009 19:04:15 +0530
Subject: [PATCH 24/59] [IMP]: Changed the report_XXX modules. Date field in
 all monthly reports are splitted in two separate fields as year and month.

bzr revid: uco@tinyerp.co.in-20091124133415-n3qjchamrw398f0m
---
 addons/account/account.py                     |  2 +-
 addons/report_account/report_receivable.py    | 25 ++++++++++-----
 .../report_account/report_receivable_view.xml | 17 ++++++++--
 .../report_analytic_line.py                   | 11 +++++--
 .../report_analytic_line_view.xml             |  1 +
 addons/report_crm/report_crm.py               | 31 +++++++++++++------
 addons/report_crm/report_crm_view.xml         |  7 ++++-
 addons/report_document/report_document.py     | 12 ++++---
 .../report_document/report_document_view.xml  | 21 +++++++++++--
 9 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f9ec8763fc5..cf79514bcf8 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -758,7 +758,7 @@ class account_move(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
         'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', required=True, readonly=True,
-                                  help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Valid\' state.'),
+                                  help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Posted\' state.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Be Verified'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py
index 45dc1f5a376..8d106193cf7 100644
--- a/addons/report_account/report_receivable.py
+++ b/addons/report_account/report_receivable.py
@@ -24,6 +24,7 @@ import datetime
 import mx.DateTime
 
 import pooler
+import tools
 from osv import fields,osv
 
 
@@ -207,21 +208,25 @@ class report_account_type_sales(osv.osv):
     _description = "Report of the Sales by Account Type"
     _auto = False
     _columns = {
-        'name': fields.char('Month', size=64, readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period',readonly=True),
         'product_id': fields.many2one('product.product', 'Product',readonly=True),
         'quantity': fields.float('Quantity', readonly=True),
         'user_type': fields.many2one('account.account.type', 'Account Type', readonly=True),
         'amount_total': fields.float('Total', readonly=True),  
-        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),      
+        'currency_id': fields.many2one('res.currency', 'Currency', 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),      
     }
     _order = 'name desc,amount_total desc'
     
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_account_type_sales')
         cr.execute("""create or replace view report_account_type_sales as (
             select
                min(inv_line.id) as id,
-               to_char(inv.date_invoice, 'YYYY-MM-01') as name,               
+               to_char(inv.date_invoice, 'YYYY') as name,
+               to_char(inv.date_invoice,'MM') as month,
                sum(inv_line.price_subtotal) as amount_total, 
                inv.currency_id as currency_id,               
                inv.period_id,
@@ -235,7 +240,7 @@ class report_account_type_sales(osv.osv):
             where
                 inv.state in ('open','paid')
             group by
-                to_char(inv.date_invoice, 'YYYY-MM-01'),inv.currency_id, inv.period_id, inv_line.product_id, account.user_type  
+                to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.user_type  
             )""")
 report_account_type_sales()
 
@@ -245,21 +250,25 @@ class report_account_sales(osv.osv):
     _description = "Report of the Sales by Account"
     _auto = False
     _columns = {
-        'name': fields.char('Month', size=64, readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period',readonly=True),
         'product_id': fields.many2one('product.product', 'Product',readonly=True),
         'quantity': fields.float('Quantity', readonly=True),
         'account_id': fields.many2one('account.account', 'Account', readonly=True),
         'amount_total': fields.float('Total', readonly=True),  
-        'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),      
+        'currency_id': fields.many2one('res.currency', 'Currency', 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),      
     }
     _order = 'name desc,amount_total desc'
     
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_account_sales')
         cr.execute("""create or replace view report_account_sales as (
             select
                min(inv_line.id) as id,
-               to_char(inv.date_invoice, 'YYYY-MM-01') as name,               
+               to_char(inv.date_invoice, 'YYYY') as name,
+               to_char(inv.date_invoice,'MM') as month,               
                sum(inv_line.price_subtotal) as amount_total, 
                inv.currency_id as currency_id,               
                inv.period_id,
@@ -273,7 +282,7 @@ class report_account_sales(osv.osv):
             where
                 inv.state in ('open','paid')
             group by
-                to_char(inv.date_invoice, 'YYYY-MM-01'),inv.currency_id, inv.period_id, inv_line.product_id, account.id  
+                to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.id  
             )""")
 report_account_sales()
 
diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml
index 694bdf690e7..7ef469c96fe 100644
--- a/addons/report_account/report_receivable_view.xml
+++ b/addons/report_account/report_receivable_view.xml
@@ -124,8 +124,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account">
-                    <field name="name"/>
-                    <field name="period_id"/>
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="product_id"/>
                     <field name="account_id"/>
                     <field name="quantity"/>
@@ -175,6 +175,7 @@
             <field name="arch" type="xml">
                 <tree string="Sales by Account type">
                     <field name="name"/>
+                    <field name="month"/>
                     <field name="period_id"/>
                     <field name="product_id"/>
                     <field name="user_type"/>
@@ -185,6 +186,18 @@
             </field>
         </record>
         
+        <record id="view_report_account_type_sales_form" model="ir.ui.view">
+            <field name="name">report.account_type.sales.form</field>
+            <field name="model">report.account_type.sales</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <tree string="Sales by Account type">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="product_id" select="1"/>
+                </tree>
+            </field>
+        </record>
         
         <record id="view_report_account_type_sales_graph" model="ir.ui.view">
              <field name="name">report.account_type.sales.graph</field>
diff --git a/addons/report_analytic_line/report_analytic_line.py b/addons/report_analytic_line/report_analytic_line.py
index 006a36cc3a4..42f219df1f3 100644
--- a/addons/report_analytic_line/report_analytic_line.py
+++ b/addons/report_analytic_line/report_analytic_line.py
@@ -20,27 +20,32 @@
 ##############################################################################
 
 from osv import fields,osv
+import tools
 
 class report_account_analytic_line_to_invoice(osv.osv):
     _name = "report.account.analytic.line.to.invoice"
     _description = "Analytic lines to invoice report"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
         'product_uom_id':fields.many2one('product.uom', 'UoM', readonly=True),
         'unit_amount': fields.float('Units', readonly=True),
         'sale_price': fields.float('Sale price', readonly=True),
         'amount': fields.float('Amount', 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),
     }
     _order = 'name desc, product_id asc, account_id asc'
 
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_account_analytic_line_to_invoice')
         cr.execute("""
             CREATE OR REPLACE VIEW report_account_analytic_line_to_invoice AS (
                 SELECT
-                    DISTINCT(to_char(l.date,'YYYY-MM-DD')) AS name,
+                    DISTINCT(to_char(l.date,'MM')) as month,
+                    to_char(l.date, 'YYYY') as name,
                     MIN(l.id) AS id,
                     l.product_id,
                     l.account_id,
@@ -57,7 +62,7 @@ class report_account_analytic_line_to_invoice(osv.osv):
                 WHERE
                     (invoice_id IS NULL) and (to_invoice IS NOT NULL)
                 GROUP BY
-                    to_char(l.date,'YYYY-MM-DD'), product_id, product_uom_id, account_id
+                    to_char(l.date, 'YYYY'), to_char(l.date,'MM'), product_id, product_uom_id, account_id
             )
         """)
 report_account_analytic_line_to_invoice()
diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml
index ef61bd70645..e5c9a3d2c06 100644
--- a/addons/report_analytic_line/report_analytic_line_view.xml
+++ b/addons/report_analytic_line/report_analytic_line_view.xml
@@ -9,6 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Analytic Lines to Invoice">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="account_id" select="1"/>
                     <newline/>
                     <field name="product_id" select="1"/>
diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py
index df133b53b4f..d6c2e9d0066 100644
--- a/addons/report_crm/report_crm.py
+++ b/addons/report_crm/report_crm.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields,osv
+import tools
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -34,7 +35,7 @@ class report_crm_case_user(osv.osv):
     _description = "Cases by user and section"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'amount_revenue': fields.float('Est.Revenue', readonly=True),
@@ -44,14 +45,18 @@ class report_crm_case_user(osv.osv):
         'probability': fields.float('Avg. Probability', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'delay_close': fields.char('Delay to close', size=20, 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),
     }
     _order = 'name desc, user_id, section_id'
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_case_user')
         cr.execute("""
             create or replace view report_crm_case_user as (
                 select
                     min(c.id) as id,
-                    to_char(c.create_date, 'YYYY-MM-01') as name,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
                     c.state,
                     c.user_id,
                     c.section_id,
@@ -63,7 +68,7 @@ class report_crm_case_user(osv.osv):
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_case c
-                group by to_char(c.create_date, 'YYYY-MM-01'), c.state, c.user_id, c.section_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id, c.section_id
             )""")
 report_crm_case_user()
 
@@ -72,7 +77,7 @@ class report_crm_case_categ(osv.osv):
     _description = "Cases by section and category"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'amount_revenue': fields.float('Est.Revenue', readonly=True),
@@ -82,14 +87,18 @@ class report_crm_case_categ(osv.osv):
         'probability': fields.float('Avg. Probability', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'delay_close': fields.char('Delay Close', size=20, 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),
     }
     _order = 'name desc, categ_id, section_id'
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_case_categ')
         cr.execute("""
             create or replace view report_crm_case_categ as (
                 select
                     min(c.id) as id,
-                    to_char(c.create_date, 'YYYY-MM-01') as name,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
                     c.state,
                     c.categ_id,
                     c.section_id,
@@ -101,7 +110,7 @@ class report_crm_case_categ(osv.osv):
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_case c
-                group by to_char(c.create_date, 'YYYY-MM-01'), c.state, c.categ_id, c.section_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.categ_id, c.section_id
             )""")
 report_crm_case_categ()
 
@@ -134,7 +143,7 @@ class report_crm_case_section(osv.osv):
         return res
     
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
 #        'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr_cases': fields.integer('# of Cases', readonly=True),
@@ -142,14 +151,18 @@ class report_crm_case_section(osv.osv):
         'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"),
         'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
         'delay_close': fields.char('Delay to close', size=20, 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),
     }
     _order = 'name desc, section_id'
     def init(self, cr):
+        tools.drop_view_if_exists(cr, 'report_crm_case_section')
         cr.execute("""
             create or replace view report_crm_case_section as (
                 select
                     min(c.id) as id,
-                    to_char(c.create_date, 'YYYY-MM-01') as name,
+                    to_char(c.create_date, 'YYYY') as name,
+                    to_char(c.create_date, 'MM') as month,
                     c.section_id as section_id,
                     count(*) as nbr_cases,
                     0 as avg_answers,
@@ -158,7 +171,7 @@ class report_crm_case_section(osv.osv):
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_case c
-                group by to_char(c.create_date, 'YYYY-MM-01'),c.section_id
+                group by to_char(c.create_date, 'YYYY'),to_char(c.create_date, 'MM'),c.section_id
             )""")
 report_crm_case_section()
 
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index 947a457c289..4e9af483d67 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -12,7 +12,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Cases by User and Section">
-                    <field name="name"/>
+                    <field name="name" />
+                    <field name="month"/>
                     <field name="user_id"/>
                     <field name="section_id"/>
                     <field name="nbr"/>
@@ -32,6 +33,7 @@
             <field name="arch" type="xml">
                 <form string="Cases by User and Section">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
                     <field name="nbr" select="1"/>
@@ -103,6 +105,7 @@
             <field name="arch" type="xml">
                 <tree string="Cases by User and Section">
                     <field name="name"/>
+                    <field name="month"/>
                     <field name="categ_id"/>
                     <field name="section_id"/>
                     <field name="nbr"/>
@@ -122,6 +125,7 @@
             <field name="arch" type="xml">
                 <form string="Cases by User and Section">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="categ_id" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
                     <field name="nbr" select="1"/>
@@ -165,6 +169,7 @@
             <field name="arch" type="xml">
                 <tree string="Cases by Section">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="section_id" select="1"/>
                     <field name="nbr_cases" select="1"/>
                     <field name="avg_answers"/>
diff --git a/addons/report_document/report_document.py b/addons/report_document/report_document.py
index 0da5b3430e5..911dc3a6ace 100644
--- a/addons/report_document/report_document.py
+++ b/addons/report_document/report_document.py
@@ -32,7 +32,7 @@
 
 from osv import fields,osv
 import time
-
+import tools
 
 class report_document_user(osv.osv):
     _name = "report.document.user"
@@ -81,7 +81,7 @@ class report_files_partner(osv.osv):
     _description = "Files details by Partners"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'file_title': fields.char('File Name',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
@@ -90,19 +90,23 @@ class report_files_partner(osv.osv):
         'nbr':fields.integer('# of Files', readonly=True),
         'type':fields.char('Directory Type',size=64,readonly=True),
         'partner':fields.char('Partner',size=64,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),
      }
     def init(self, cr):
+         tools.drop_view_if_exists(cr, 'report_files_partner')
          cr.execute("""
             create or replace view report_files_partner as (
                 select min(f.id) as id,count(*) as nbr,
-                       min(to_char(f.create_date,'YYYY-MM-01')) as name,
+                       to_char(f.create_date,'YYYY') as name,
+                       min(to_char(f.create_date,'MM')) as month,
                        min(f.title) as file_title,
                        p.name as partner 
                 from ir_attachment f 
                 inner join res_partner p 
                 on (f.partner_id=p.id)
                 where f.datas_fname is not null
-                group by p.name
+                group by p.name, to_char(f.create_date,'YYYY')
              )
          """)
 report_files_partner()
diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml
index 746bf6d89c4..7226e953aa9 100644
--- a/addons/report_document/report_document_view.xml
+++ b/addons/report_document/report_document_view.xml
@@ -209,13 +209,14 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Files by Month">
-                    <field name="name" />
+                    <field name="name"/>
+                    <field name="month"/>
                     <field name="nbr"/>
                 </tree>
             </field>
         </record>
         
-            <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
+        <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
             <field name="name">Files by Month</field>
             <field name="res_model">report.document.user</field>
             <field name="view_id" ref="view_files_by_month_graph"></field>
@@ -269,11 +270,27 @@
             <field name="arch" type="xml">
                 <tree string="Files per Month">
                     <field name="name"/>
+                    <field name="month"/>
                     <field name="partner"/>
                     <field name="nbr"/>
                 </tree>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_files_by_partner_form">
+            <field name="name">view.files.partner.form</field>
+            <field name="model">report.files.partner</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <tree string="Files per Month">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="partner"/>
+                    <field name="nbr"/>
+                </tree>
+            </field>
+        </record>
+        
         <record model="ir.actions.act_window" id="action_view_files_by_partner">
             <field name="name">Files Per Partner</field>
             <field name="res_model">report.files.partner</field>

From 5062e64483e625f74e32f88965e337556c8a4bd8 Mon Sep 17 00:00:00 2001
From: "KUM(OpenERP)" <>
Date: Tue, 24 Nov 2009 19:28:06 +0530
Subject: [PATCH 25/59] [IMP]: report_XXX modules changes.

bzr revid: uco@tinyerp.co.in-20091124135806-880eehkk0bqej1wo
---
 addons/report_project/report_project.py       | 23 ++++++++++----
 addons/report_project/report_project_view.xml |  4 +++
 addons/report_purchase/report_purchase.py     | 22 ++++++++++----
 .../report_purchase/report_purchase_view.xml  |  2 ++
 addons/report_timesheet/report_timesheet.py   | 30 ++++++++++++-------
 .../report_timesheet_view.xml                 |  3 ++
 6 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/addons/report_project/report_project.py b/addons/report_project/report_project.py
index 321ac59d28a..e6f5fd828e1 100644
--- a/addons/report_project/report_project.py
+++ b/addons/report_project/report_project.py
@@ -20,13 +20,14 @@
 ##############################################################################
 
 from osv import fields,osv
+import tools
 
 class report_project_task_user(osv.osv):
     _name = "report.project.task.user"
     _description = "Tasks by user and project"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'project_id':fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
@@ -34,14 +35,19 @@ class report_project_task_user(osv.osv):
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
         'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
         'task_closed': fields.integer('Task Closed', 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),
+
     }
     _order = 'name desc, project_id'
     def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, 'report_project_task_user')
         cr.execute("""
             create or replace view report_project_task_user as (
                 select
                     min(t.id) as id,
-                    to_char(date_close, 'YYYY-MM-01') as name,
+                    to_char(date_close, 'YYYY') as name,
+                    to_char(date_close, 'MM') as month,
                     count(distinct t.id) as task_closed,
                     t.user_id,
                     t.project_id,
@@ -54,7 +60,7 @@ class report_project_task_user(osv.osv):
                 where
                     t.state='done'
                 group by
-                    to_char(date_close, 'YYYY-MM-01'),t.user_id,project_id
+                    to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),t.user_id,project_id
             )
         """)
 report_project_task_user()
@@ -65,21 +71,26 @@ class report_project_task(osv.osv):
     _description = "Tasks by project"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'project_id':fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
         'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
         'task_closed': fields.integer('Task Closed', 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),
+
     }
     _order = 'name desc, project_id'
     def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, 'report_project_task')
         cr.execute("""
             create or replace view report_project_task as (
                 select
                     min(t.id) as id,
-                    to_char(date_close, 'YYYY-MM-01') as name,
+                    to_char(date_close, 'YYYY') as name,
+                    to_char(date_close, 'MM') as month,
                     count(distinct t.id) as task_closed,
                     t.project_id,
                     sum(planned_hours) as hours_planned,
@@ -91,7 +102,7 @@ class report_project_task(osv.osv):
                 where
                     t.state='done'
                 group by
-                    to_char(date_close, 'YYYY-MM-01'),project_id
+                    to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),project_id
             )
         """)
 report_project_task()
diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml
index 366564c7237..6589c5cea35 100644
--- a/addons/report_project/report_project_view.xml
+++ b/addons/report_project/report_project_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Tasks by Project and User">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
@@ -29,6 +30,7 @@
             <field name="arch" type="xml">
                 <tree string="Tasks by projects and users">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
@@ -65,6 +67,7 @@
             <field name="arch" type="xml">
                 <form string="Tasks by Project">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
                     <field name="hours_planned" select="1"/>
@@ -81,6 +84,7 @@
             <field name="arch" type="xml">
                 <tree string="Tasks by project">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
                     <field name="hours_planned" select="1"/>
diff --git a/addons/report_purchase/report_purchase.py b/addons/report_purchase/report_purchase.py
index 3730e7349c9..342423422d2 100644
--- a/addons/report_purchase/report_purchase.py
+++ b/addons/report_purchase/report_purchase.py
@@ -24,13 +24,14 @@
 #
 
 from osv import fields,osv
+import tools
 
 class report_purchase_order_product(osv.osv):
     _name = "report.purchase.order.product"
     _description = "Purchases Orders by Products"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'state': fields.selection([
             ('draft','Quotation'),
             ('waiting_date','Waiting Schedule'),
@@ -46,14 +47,19 @@ class report_purchase_order_product(osv.osv):
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True),
         'count': 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),
+
     }
     _order = 'name desc,price_total desc'
     def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, 'report_purchase_order_product')
         cr.execute("""
             create or replace view report_purchase_order_product as (
                 select
                     min(l.id) as id,
-                    to_char(s.date_order, 'YYYY-MM-01') as name,
+                    to_char(s.date_order, 'YYYY') as name,
+                    to_char(s.date_order, 'MM') as month,
                     s.state,
                     l.product_id,
                     sum(l.product_qty*u.factor) as quantity,
@@ -64,7 +70,7 @@ class report_purchase_order_product(osv.osv):
                     left join purchase_order_line l on (s.id=l.order_id)
                     left join product_uom u on (u.id=l.product_uom)
                 where l.product_id is not null
-                group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
+                group by l.product_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
             )
         """)
 report_purchase_order_product()
@@ -74,7 +80,7 @@ class report_purchase_order_category(osv.osv):
     _description = "Purchases Orders by Categories"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'state': fields.selection([
             ('draft','Quotation'),
             ('waiting_date','Waiting Schedule'),
@@ -90,14 +96,18 @@ class report_purchase_order_category(osv.osv):
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True),
         'count': 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),
     }
     _order = 'name desc,price_total desc'
     def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, 'report_purchase_order_category')
         cr.execute("""
             create or replace view report_purchase_order_category as (
                 select
                     min(l.id) as id,
-                    to_char(s.date_order, 'YYYY-MM-01') as name,
+                    to_char(s.date_order, 'YYYY') as name,
+                    to_char(s.date_order, 'MM') as month,
                     s.state,
                     t.categ_id as category_id,
                     sum(l.product_qty*u.factor) as quantity,
@@ -110,7 +120,7 @@ class report_purchase_order_category(osv.osv):
                     left join product_template t on (t.id=p.product_tmpl_id)
                     left join product_uom u on (u.id=l.product_uom)
                 where l.product_id is not null
-                group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
+                group by t.categ_id, to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),s.state
              )
         """)
 report_purchase_order_category()
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index e3c625797ac..b4640915c70 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Purchases by products">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="product_id" select="1"/>
                     <field name="count"/>
                     <field name="quantity" select="1"/>
@@ -75,6 +76,7 @@
             <field name="arch" type="xml">
                 <form string="Purchases by Category of Products">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="category_id" select="1"/>
                     <field name="count"/>
                     <field name="quantity" select="1"/>
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index ee7cb8a23fd..015634b9001 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -27,10 +27,12 @@ class report_timesheet_user(osv.osv):
     _description = "Timesheet per day"
     _auto = False
     _columns = {
-        'name': fields.date('Date', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'quantity': fields.float('Quantity', readonly=True),
-        'cost': fields.float('Cost', readonly=True)
+        'cost': fields.float('Cost', 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),
     }
     _order = 'name desc,user_id desc'
     def init(self, cr):
@@ -39,7 +41,8 @@ class report_timesheet_user(osv.osv):
             create or replace view report_timesheet_user as (
                 select
                     min(l.id) as id,
-                    l.date as name,
+                    to_char(l.date,'YYYY') as name,
+                    to_char(l.date,'MM') as month,
                     l.user_id,
                     sum(l.unit_amount) as quantity,
                     sum(l.amount) as cost
@@ -47,7 +50,7 @@ class report_timesheet_user(osv.osv):
                     account_analytic_line l
                 where
                     user_id is not null
-                group by l.date, l.user_id
+                group by l.date, to_char(l.date,'YYYY'),to_char(l.date,'MM'), l.user_id
             )
         """)
 report_timesheet_user()
@@ -57,10 +60,13 @@ class report_timesheet_account(osv.osv):
     _description = "Timesheet per account"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
         'quantity': fields.float('Quantity', 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),
+
     }
     _order = 'name desc,account_id desc,user_id desc'
     def init(self, cr):
@@ -69,14 +75,15 @@ class report_timesheet_account(osv.osv):
             create or replace view report_timesheet_account as (
                 select
                     min(id) as id,
-                    to_char(create_date, 'YYYY-MM-01') as name,
+                    to_char(create_date, 'YYYY') as name,
+                    to_char(create_date,'MM') as month,
                     user_id,
                     account_id,
                     sum(unit_amount) as quantity
                 from
                     account_analytic_line
                 group by
-                    to_char(create_date, 'YYYY-MM-01'), user_id, account_id
+                    to_char(create_date, 'YYYY'),to_char(create_date, 'MM'), user_id, account_id
             )
         """)
 report_timesheet_account()
@@ -87,10 +94,12 @@ class report_timesheet_account_date(osv.osv):
     _description = "Daily timesheet per account"
     _auto = False
     _columns = {
-        'name': fields.date('Date', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
         'quantity': fields.float('Quantity', 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),
     }
     _order = 'name desc,account_id desc,user_id desc'
     
@@ -100,14 +109,15 @@ class report_timesheet_account_date(osv.osv):
             create or replace view report_timesheet_account_date as (
                 select
                     min(id) as id,
-                    date as name,
+                    to_char(date,'YYYY') as name,
+                    to_char(date,'MM') as month,
                     user_id,
                     account_id,
                     sum(unit_amount) as quantity
                 from
                     account_analytic_line
                 group by
-                    date, user_id, account_id
+                    to_char(date,'YYYY'),to_char(date,'MM'), user_id, account_id
             )
         """)
 report_timesheet_account_date()
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index ae127fdb9f8..4ebaaca7e86 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -25,6 +25,7 @@
             <field name="arch" type="xml">
                 <form string="Timesheet by user">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
                 </form>
             </field>
@@ -185,6 +186,7 @@
             <field name="arch" type="xml">
                 <form string="Daily timesheet by account">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="account_id" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="quantity"/>
@@ -246,6 +248,7 @@
             <field name="arch" type="xml">
                 <form string="Timesheet by account">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="account_id" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="quantity"/>

From e1e9f4510021ccda5ae45dddac9a7bbbca657018 Mon Sep 17 00:00:00 2001
From: fabian <fabian@fabian-openerp>
Date: Tue, 24 Nov 2009 18:15:16 +0100
Subject: [PATCH 26/59] [IMP] Added company_id fields for multicompany
 management [IMP] Improved demo datas for mutlicompany

bzr revid: fabian@fabian-openerp-20091124171516-c7dwf40yfi9wm2mu
---
 addons/account/account_move_line.py         |   2 +-
 addons/crm/crm.py                           |   1 +
 addons/multi_company/multi_company_demo.xml | 382 ++++++++++++++++++--
 addons/sale/sale.py                         |   1 +
 4 files changed, 363 insertions(+), 23 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index cfbf14c68a2..a798a57f94e 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -387,7 +387,7 @@ class account_move_line(osv.osv):
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
 #TODO: remove this
         'amount_taxed':fields.float("Taxed Amount",digits=(16,int(tools.config['price_accuracy']))),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=2),
+        'company_id': fields.related('move_id','company_id',type='many2one',object='res.company',string='Company')
 
     }
 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 603b17a1aa6..8d37bb84a20 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -517,6 +517,7 @@ class crm_case(osv.osv):
 
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
+        'company_id': fields.many2one('res.company','Company'),
     }
     def _get_default_partner_address(self, cr, uid, context):
         if not context.get('portal',False):
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 1e34162d324..7db9d77270a 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -1,34 +1,372 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="second_partner" model="res.partner">
-            <field name="name">Tiny Editor</field>
+<!--                      Partner                        -->    
+        <record id="base.main_partner" model="res.partner">
+            <field name="name">OpenERP Corp.</field>
         </record>
+		<record id="res_partner_oerp_editor" model="res.partner">
+			<field name="name">OpenERP Editor</field>
+		</record>
+		<record id="res_partner_oerp_us" model="res.partner">
+			<field name="name">OpenERP US</field>
+		</record>
+		<record id="res_partner_oerp_in" model="res.partner">
+			<field name="name">OpenERP IN</field>
+		</record>
+		<record id="res_partner_oerp_be" model="res.partner">
+			<field name="name">OpenERP BE</field>
+		</record>
+		<record id="res_partner_odoo" model="res.partner">
+			<field name="name">Odoo</field>
+		</record>
+		
+<!--                      Company                        -->    		
+		<record id="base.main_company" model="res.company">
+			<field name="name">OpenERP Corp.</field>
+		</record>
+		<record id="res_company_oerp_editor" model="res.company">
+			<field name="partner_id" ref="res_partner_oerp_editor"/>
+			<field name="parent_id" ref="base.main_company"/>
+			<field name="name">OpenERP Editor</field>
+		</record>
+		<record id="res_company_oerp_us" model="res.company">
+			<field name="partner_id" ref="res_partner_oerp_us"/>
+			<field name="parent_id" ref="res_company_oerp_editor"/>
+			<field name="name">OpenERP US</field>
+		</record>
+		<record id="res_company_oerp_be" model="res.company">
+			<field name="partner_id" ref="res_partner_oerp_be"/>
+			<field name="parent_id" ref="res_company_oerp_editor"/>
+			<field name="name">OpenERP BE</field>
+		</record>OpenERP IN
+		<record id="res_company_oerp_in" model="res.company">
+			<field name="partner_id" ref="res_partner_oerp_in"/>
+			<field name="parent_id" ref="res_company_oerp_editor"/>
+			<field name="name">OpenERP IN</field>
+		</record>
+		<record id="res_company_odoo" model="res.company">
+			<field name="partner_id" ref="res_partner_odoo"/>
+			<field name="parent_id" ref="base.main_company"/>
+			<field name="name">Odoo</field>
+		</record>
+		
+<!--                      User                        -->
+
+		<record id="res_users_editor_demo" model="res.users">
+			<field name="password">editor_demo</field>
+			<field name="name">OpenERP Editor</field>
+			<field name="login">editor_demo</field>
+			<field name="company_id" ref="res_company_oerp_editor"/>
+		</record>
+		<record id="res_users_sales_demo_us" model="res.users">
+			<field name="password">sales_demo_us</field>
+			<field name="name">OpenERP Salesman US</field>
+			<field name="login">sales_demo_us</field>
+			<field name="company_id" ref="res_company_oerp_us"/>
+		</record>
+		<record id="res_users_sales_demo_be" model="res.users">
+			<field name="password">sales_demo_be</field>
+			<field name="name">OpenERP Salesman BE</field>
+			<field name="login">sales_demo_be</field>
+			<field name="company_id" ref="res_company_oerp_be"/>
+		</record>
+		<record id="res_users_sales_demo_in" model="res.users">
+			<field name="password">sales_demo_in</field>
+			<field name="name">OpenERP Salesman IN</field>
+			<field name="login">sales_demo_in</field>
+			<field name="company_id" ref="res_company_oerp_in"/>
+		</record>
+		<record id="res_users_odoo_demo" model="res.users">
+			<field name="password">odoo_demo</field>
+			<field name="name">Odoo</field>
+			<field name="login">odoo_demo</field>
+			<field name="company_id" ref="res_company_odoo"/>
+		</record>
+
+
+        <!--
+	Resource: product.product
+	-->
         
-        <record id="second_company" model="res.company">
-            <field name="name">Tiny Editor</field>
-            <field name="partner_id" ref="base.main_partner"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field name="rml_header1">Free Business Solutions</field>
-            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
-            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
-            <field name="currency_id" ref="base.EUR"/>
+        <record id="product.product_product_0" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
-        
-        <record id="ter_partner" model="res.partner">
-            <field name="name">Tiny Integrator</field>
+        <record id="product.product_product_1" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
-        
-        <record id="ter_company" model="res.company">
-            <field name="name">Tiny Integrator</field>
-            <field name="partner_id" ref="base.main_partner"/>
-            <field name="parent_id" ref="base.main_company"/>
-            <field name="rml_header1">Free Business Solutions</field>
-            <field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
-            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
-            <field name="currency_id" ref="base.EUR"/>
+        <record id="product.product_product_pc1" model="product.product">
+    	    <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
+        <record id="product.product_product_pc2" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_pc3" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_pc4" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_mb1" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_mb2" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_cpu1" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_cpu3" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_hdd1" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_hdd2" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_hdd3" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_fan" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_fan2" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_cpu_gen" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_ram" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_ram512" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_cpu2" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_tow1" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_20" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_21" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_22" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_23" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_24" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_25" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="product.product_product_26" model="product.product">
+	    <field name="company_id" ref="res_company_oerp_editor"/>
+        </record>
+        <record id="Odoo1" model="product.category">
+            <field name="parent_id" ref="product.cat0"/>
+            <field name="name">Odoo Offers</field>
+        </record>
+        <record id="product_product_odoo1" model="product.product">
+            <field name="default_code">ODOO</field>
+            <field name="supply_method">produce</field>
+            <field name="list_price">35.0</field>
+            <field name="standard_price">10.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+            <field name="name">Odoo Offer</field>
+            <field name="categ_id" ref="Odoo1"/>
+	    <field name="company_id" ref="res_company_odoo"/>
+        </record>
+
+        <!--
+	Resource: sale.order
+	-->
+
+        <record id="sale.order" model="sale.order">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+
+        <record id="sale.order2" model="sale.order">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+
+        <record id="sale.order3" model="sale.order">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+
+        <record id="sale.order4" model="sale.order">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+
+        <record id="sale.order5" model="sale.order">
+	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+
+<!--		Project		-->
+
+        <record id="project.project_project_9" model="project.project">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_project_21" model="project.project">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_project_22" model="project.project">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_project_23" model="project.project">
+	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+
+        <record id="project.project_task_116" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_130" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="project.project_task_131" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="project.project_task_184" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_186" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_188" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_189" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="project.project_task_190" model="project.task">
+            <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_192" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_193" model="project.task">
+            <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_194" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_195" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="project.project_task_196" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_197" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_198" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_199" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_200" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_201" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="project.project_task_202" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_203" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_204" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="project.project_task_205" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="project.project_task_206" model="project.task">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+
+
+       
+        <!--
+		Resource: res.partner
+		-->
         
+        <record id="base.res_partner_asus" model="res.partner">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="base.res_partner_agrolait" model="res.partner">
+            	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_c2c" model="res.partner">
+           	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_sednacom" model="res.partner">
+          	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_thymbra" model="res.partner">
+           	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
+        	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_tinyatwork" model="res.partner">
+	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="base.res_partner_2" model="res.partner">
+	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_3" model="res.partner">
+            	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="base.res_partner_4" model="res.partner">
+        	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_5" model="res.partner">
+           	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_6" model="res.partner">
+           	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_maxtor" model="res.partner">
+          	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="base.res_partner_seagate" model="res.partner">
+          	    <field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="base.res_partner_8" model="res.partner">
+           	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="res_partner_9" model="res.partner">
+          	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_10" model="res.partner">
+       	    <field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="base.res_partner_11" model="res.partner">
+           	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_14" model="res.partner">
+          	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_15" model="res.partner">
+         	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="base.res_partner_accent" model="res.partner">
+         	    <field name="company_id" ref="res_company_oerp_be"/>
+        </record>        
         
+
+
     </data>
 </openerp>
+
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a7ec20bb3cb..5b163a3fb45 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -254,6 +254,7 @@ class sale_order(osv.osv):
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
+        'company_id': fields.many2one('res.company','Company'),
     }
     _defaults = {
         'picking_policy': lambda *a: 'direct',

From 431a66c8707c79ee66f13937d9fa59fff0829239 Mon Sep 17 00:00:00 2001
From: "hda (Tiny)" <hda@tinyerp.com>
Date: Tue, 24 Nov 2009 23:07:10 +0530
Subject: [PATCH 27/59] Removed usability extended group and merge
 functionality with extended view group

bzr revid: hda@tinyerp.com-20091124173710-okenkex75s77une2
---
 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 7468cfc730e..19886993316 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -21,10 +21,6 @@
         <field name="name">Useability / Extended View</field>
     </record>
 
-     <record model="res.groups" context="{'noadmin':True}" id="group_useability_extended">
-        <field name="name">Useability / Extended Group</field>
-    </record>
-
     <record model="res.groups" id="group_no_one" context="{'noadmin':True}">
         <field name="name">Useability / No One</field>
     </record>

From 8f029db1635a6f5f2d9162dee1a45ecab3f2684f Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 25 Nov 2009 04:48:57 +0000
Subject: [PATCH 28/59] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20091125044857-gkd61g3bf6zsoave
---
 addons/addons/dm/i18n/fi.po       | 956 ++++++++++++++++--------------
 addons/bin/addons/base/i18n/sk.po | 195 +++---
 addons/debian/po/cs.po            |  41 ++
 addons/debian/po/de.po            |  42 ++
 addons/debian/po/es.po            |  42 ++
 addons/debian/po/fi.po            |  41 ++
 addons/debian/po/fr.po            |  41 ++
 addons/debian/po/gl.po            |  41 ++
 addons/debian/po/it.po            |  41 ++
 addons/debian/po/ja.po            |  39 ++
 addons/debian/po/pt.po            |  41 ++
 addons/debian/po/ru.po            |  42 ++
 addons/debian/po/sk.po            |  39 ++
 addons/debian/po/sv.po            |  41 ++
 addons/debian/po/zh_CN.po         |  38 ++
 addons/delivery/i18n/sl.po        |  10 +-
 addons/event/i18n/fi.po           | 645 ++++++++++++++++++++
 addons/membership/i18n/sk.po      | 524 ++++++++++++++++
 addons/project/i18n/hr.po         | 292 ++++-----
 19 files changed, 2455 insertions(+), 696 deletions(-)
 create mode 100644 addons/debian/po/cs.po
 create mode 100644 addons/debian/po/de.po
 create mode 100644 addons/debian/po/es.po
 create mode 100644 addons/debian/po/fi.po
 create mode 100644 addons/debian/po/fr.po
 create mode 100644 addons/debian/po/gl.po
 create mode 100644 addons/debian/po/it.po
 create mode 100644 addons/debian/po/ja.po
 create mode 100644 addons/debian/po/pt.po
 create mode 100644 addons/debian/po/ru.po
 create mode 100644 addons/debian/po/sk.po
 create mode 100644 addons/debian/po/sv.po
 create mode 100644 addons/debian/po/zh_CN.po
 create mode 100644 addons/event/i18n/fi.po
 create mode 100644 addons/membership/i18n/sk.po

diff --git a/addons/addons/dm/i18n/fi.po b/addons/addons/dm/i18n/fi.po
index 3c14b4c9266..b23b025599d 100644
--- a/addons/addons/dm/i18n/fi.po
+++ b/addons/addons/dm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-02-24 13:16+0000\n"
-"PO-Revision-Date: 2009-11-23 19:04+0000\n"
+"PO-Revision-Date: 2009-11-24 09:32+0000\n"
 "Last-Translator: NightSpirit <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-24 04:39+0000\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: dm
@@ -1265,7 +1265,7 @@ msgstr "Sukupuolelle"
 #. module: dm
 #: model:dm.offer.step.type,name:dm.dm_offer_step_type_accompanyingletterofthestartingmailing0
 msgid "Accompanying Letter of the Starting Mailing"
-msgstr ""
+msgstr "Alkavan postituksen mukana tuleva kirje"
 
 #. module: dm
 #: model:dm.campaign.type,name:dm.dm_campaign_type_mixed
@@ -1410,6 +1410,9 @@ msgid ""
 "letter to inform the potential customer that you regret that he didn't "
 "ordered. "
 msgstr ""
+"Mukana seuraava kirje on yleensä postitus joka lähtee tilatun tuotteen "
+"mukana, kuten käyttäjänopas tai kiitoskirje. Se voi olla myös kirje jossa "
+"pahoitellaan ettei asiakas tilannut mitään. "
 
 #. module: dm
 #: field:dm.campaign,campaign_type:0
@@ -1661,7 +1664,7 @@ msgstr "Lisätiedot"
 #. module: dm
 #: model:product.template,name:dm.product_product_associationcustomerslist0_product_template
 msgid "Associations Customers List"
-msgstr ""
+msgstr "Yhteistyöasiakkaiden lista"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
@@ -1683,64 +1686,64 @@ msgstr "Maantieteellinen"
 #. module: dm
 #: help:dm.customers_list,broker_cost:0
 msgid "The amount given to the broker for the list renting"
-msgstr ""
+msgstr "Määrä joka annetaan välittäjälle listan vuokrausta varten"
 
 #. module: dm
 #: field:dm.offer.step.transition,condition:0
 msgid "Trigger Condition"
-msgstr ""
+msgstr "Laukaisimen tila"
 
 #. module: dm
 #: field:dm.offer.step.transition,step_from:0
 msgid "From Offer Step"
-msgstr ""
+msgstr "Tilausvaiheesta"
 
 #. module: dm
 #: view:res.partner:0
 msgid "Address Infos"
-msgstr ""
+msgstr "Osoitetiedot"
 
 #. module: dm
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive account."
-msgstr ""
+msgstr "Virhe! Et voi luoda rekursiivista tiliä"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_proposition_item
 msgid "dm.campaign.proposition.item"
-msgstr ""
+msgstr "dm.campaign.proposition.item"
 
 #. module: dm
 #: view:dm.campaign.proposition.prices_progression:0
 msgid "Price Progression Description"
-msgstr ""
+msgstr "Hintakehityksen kuvaus"
 
 #. module: dm
 #: field:dm.customer.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Toimitusosoite"
 
 #. module: dm
 #: model:dm.campaign.type,code:dm.dm_campaign_type_recruiting
 msgid "recruiting"
-msgstr ""
+msgstr "rekrytointi"
 
 #. module: dm
 #: view:dm.offer.step:0
 #: model:product.category,name:dm.product_category_mailingmanufacturing0
 #: model:project.task.type,name:dm.project_task_type_mailingmanufacturing0
 msgid "Mailing Manufacturing"
-msgstr ""
+msgstr "Postituksen valmistus"
 
 #. module: dm
 #: rml:offer.report:0
 msgid "Original Offer :"
-msgstr ""
+msgstr "Alkuperäinen tarjous :"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,trigger:0
 msgid "At Open"
-msgstr ""
+msgstr "Avoimessa"
 
 #. module: dm
 #: field:dm.customer.date_criteria,value:0
@@ -1748,13 +1751,13 @@ msgstr ""
 #: field:dm.offer.translation,date:0
 #: field:dm.plugins.value,date:0
 msgid "Date"
-msgstr ""
+msgstr "Päivämäärä"
 
 #. module: dm
 #: model:ir.actions.wizard,name:dm.wizard_campaign_group_task
 #: model:ir.actions.wizard,name:dm.wizard_campaign_task
 msgid "View Tasks"
-msgstr ""
+msgstr "Näytä tehtävät"
 
 #. module: dm
 #: field:dm.campaign,lang_id:0
@@ -1764,59 +1767,59 @@ msgstr ""
 #: view:product.product:0
 #: field:product.product,language_id:0
 msgid "Language"
-msgstr ""
+msgstr "Kieli"
 
 #. module: dm
 #: field:dm.customers_list,recruiting_origin:0
 msgid "Recruiting Origin"
-msgstr ""
+msgstr "Rekrytoinnin lähde"
 
 #. module: dm
 #: field:dm.plugin.argument,value:0
 msgid "Argument Value"
-msgstr ""
+msgstr "Perustelun arvo"
 
 #. module: dm
 #: model:product.template,description:dm.product_product_returnenveloppeus0_product_template
 msgid "Demo Return Enveloppe for the US"
-msgstr ""
+msgstr "Kirjekuoren demopalautus US:lle"
 
 #. module: dm
 #: field:dm.campaign,item_task_ids:0
 msgid "Items Procurement tasks"
-msgstr ""
+msgstr "Tavaroiden hankintatehtävät"
 
 #. module: dm
 #: view:dm.offer:0
 #: field:dm.offer,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: dm
 #: model:dm.campaign.type,name:dm.dm_campaign_type_loyalty
 msgid "Development of customer loyalty"
-msgstr ""
+msgstr "Asiakasuskollisuuden kehitys"
 
 #. module: dm
 #: model:ir.actions.wizard,name:dm.wizard_campaign_group
 msgid "Add to Campaign group"
-msgstr ""
+msgstr "Lisää kampanjaryhmään"
 
 #. module: dm
 #: rml:dm.campaign.report:0
 msgid "Proposition :"
-msgstr ""
+msgstr "Ehdotus :"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_step_form
 #: model:ir.ui.menu,name:dm.menu_action_offer_step_form
 msgid "All Offer Steps"
-msgstr ""
+msgstr "Kaikki tarjousvaiheet"
 
 #. module: dm
 #: view:dm.document.template:0
 msgid "Plugins"
-msgstr ""
+msgstr "Liitännäiset"
 
 #. module: dm
 #: wizard_button:campaign.group.project,init,end:0
@@ -1829,123 +1832,123 @@ msgstr ""
 #: wizard_button:wizard_proposition_items,init,end:0
 #: wizard_button:wizard_proposition_items,name_prices_prog,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_form_my2
 #: model:ir.ui.menu,name:dm.menu_action_offer_form_my2
 msgid "My Draft Offers"
-msgstr ""
+msgstr "Omat tarjousluonnokset"
 
 #. module: dm
 #: field:dm.customer.order,order_policy:0
 msgid "Shipping Policy"
-msgstr ""
+msgstr "Toimituskäytäntö"
 
 #. module: dm
 #: rml:dm.campaign.report:0
 #: rml:preoffer.report:0
 msgid "Type :"
-msgstr ""
+msgstr "Tyyppi :"
 
 #. module: dm
 #: field:dm.offer.step,flow_start:0
 #: field:dm.offer.step.type,flow_start:0
 msgid "Flow Start"
-msgstr ""
+msgstr "Kulun aloitus"
 
 #. module: dm
 #: field:dm.campaign,overlay_id:0
 #: view:dm.overlay:0
 msgid "Overlay"
-msgstr ""
+msgstr "Päällystys"
 
 #. module: dm
 #: field:dm.offer.step.transition,delay:0
 msgid "Offer Delay"
-msgstr ""
+msgstr "Tarjouksen viive"
 
 #. module: dm
 #: view:dm.offer.step.type:0
 msgid "Offer Step Type Description"
-msgstr ""
+msgstr "Tarjousvaiheen tyypin kuvaus"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_mypreoffer_form
 #: model:ir.ui.menu,name:dm.menu_action_mypreoffer_form
 msgid "My Offer Ideas"
-msgstr ""
+msgstr "Omat tarjousideat"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Intermediaries"
-msgstr ""
+msgstr "Välittäjät"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_gender
 msgid "dm.customer.gender"
-msgstr ""
+msgstr "dm.customer.gender"
 
 #. module: dm
 #: field:dm.order,customer_firstname:0
 #: view:res.partner:0
 #: field:res.partner.address,firstname:0
 msgid "First Name"
-msgstr ""
+msgstr "Etunimi"
 
 #. module: dm
 #: field:dm.campaign.proposition.segment,quantity_planned:0
 #: selection:dm.campaign.purchase_line,type_quantity:0
 msgid "planned Quantity"
-msgstr ""
+msgstr "suunniteltu määrä"
 
 #. module: dm
 #: view:dm.campaign:0
 #: view:dm.campaign.group:0
 msgid "Create Retro-Planning"
-msgstr ""
+msgstr "Luo Retro -suunnittelu"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Task Name"
-msgstr ""
+msgstr "Tehtävän nimi"
 
 #. module: dm
 #: wizard_view:wizard_proposition_items,new:0
 #: wizard_view:wizard_proposition_items,select:0
 msgid "Price Progresson Assigned"
-msgstr ""
+msgstr "Hintakehitys määrätty"
 
 #. module: dm
 #: view:res.partner:0
 #: field:res.partner,prospect_media_ids:0
 msgid "Prospect for Media"
-msgstr ""
+msgstr "Mahdollisuus medialle"
 
 #. module: dm
 #: field:dm.customer.order,partner_order_id:0
 msgid "Ordering Contact"
-msgstr ""
+msgstr "Tilauskontakti"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_manufacturing_cost
 msgid "dm.campaign.manufacturing_cost"
-msgstr ""
+msgstr "dm.campaign.manufacturing_cost"
 
 #. module: dm
 #: view:dm.offer:0
 msgid "Offer Dates"
-msgstr ""
+msgstr "Tarjouspäivämäärät"
 
 #. module: dm
 #: model:product.template,description:dm.product_product_sendingenveloppeus0_product_template
 msgid "Demo Sending Enveloppe for the US"
-msgstr ""
+msgstr "Kirjekuoren demolähetys US:lle"
 
 #. module: dm
 #: selection:dm.offer,legal_state:0
 msgid "Refused"
-msgstr ""
+msgstr "Hylätty"
 
 #. module: dm
 #: field:dm.customer.boolean_criteria,field:0
@@ -1958,22 +1961,22 @@ msgstr ""
 #: field:dm.customer.text_criteria,field:0
 #: field:dm.ddf.plugin,field:0
 msgid "Customers Field"
-msgstr ""
+msgstr "Asiakkaiden kenttä"
 
 #. module: dm
 #: model:dm.campaign.type,name:dm.dm_campaign_type_deleting
 msgid "Deleting campaign"
-msgstr ""
+msgstr "Poistetaan kampanjaa"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_order_date_criteria
 msgid "Customer Order Segmentation Date Criteria"
-msgstr ""
+msgstr "Asiakastilaussegmentin päivämäärä kriteeri"
 
 #. module: dm
 #: view:dm.offer.document:0
 msgid "Dynamic Fields"
-msgstr ""
+msgstr "Dynaamiset kentät"
 
 #. module: dm
 #: view:dm.campaign:0
@@ -2000,139 +2003,139 @@ msgstr ""
 #: field:dm.trademark,name:0
 #: wizard_field:wizard_proposition_items,name_prices_prog,prices_prog_name:0
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #. module: dm
 #: field:dm.campaign,manufacturing_cost_ids:0
 #: field:dm.campaign.proposition,manufacturing_costs:0
 msgid "Manufacturing Costs"
-msgstr ""
+msgstr "Valmistuskustannukset"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,togroup:0
 msgid "Apply to Campaign Group"
-msgstr ""
+msgstr "Käytä kampanjaryhmässä"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,date_delivery:0
 #: field:dm.customers_file,delivery_date:0
 #: field:dm.offer,delivery_date:0
 msgid "Delivery Date"
-msgstr ""
+msgstr "Toimituspäivämäärä"
 
 #. module: dm
 #: field:dm.campaign.proposition,keep_prices:0
 msgid "Keep Prices At Duplication"
-msgstr ""
+msgstr "Pidä hinnat kahdentumisessa"
 
 #. module: dm
 #: field:dm.campaign.proposition.prices_progression,percent_prog:0
 msgid "Percentage Prices Progression"
-msgstr ""
+msgstr "Hintojenkehitys prosentteina"
 
 #. module: dm
 #: code:addons/dm/offer.py:0
 #, python-format
 msgid "Could not open this offer !"
-msgstr ""
+msgstr "Ei voitu avata tätä tarjousta !"
 
 #. module: dm
 #: view:dm.campaign:0
 #: field:dm.campaign,manufacturing_task_ids:0
 msgid "Manufacturing tasks"
-msgstr ""
+msgstr "Valmistuksen tehtävät"
 
 #. module: dm
 #: model:dm.campaign.type,code:dm.dm_campaign_type_model
 msgid "model"
-msgstr ""
+msgstr "malli"
 
 #. module: dm
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Copywriter :"
-msgstr ""
+msgstr "Mainostekstien laatija :"
 
 #. module: dm
 #: field:dm.customers_list,invoice_base:0
 msgid "Invoicing based on"
-msgstr ""
+msgstr "Laskutus perustuen"
 
 #. module: dm
 #: field:dm.offer,production_cost:0
 msgid "Production Cost"
-msgstr ""
+msgstr "Tuotantokustannus"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_text_criteria
 msgid "Customer Segmentation Textual Criteria"
-msgstr ""
+msgstr "Asiakassegmentin kirjallinen kriteeri"
 
 #. module: dm
 #: model:dm.offer.step.type,name:dm.dm_offer_step_type_packageinsert0
 msgid "Package Insert"
-msgstr ""
+msgstr "Pakkauslisäke"
 
 #. module: dm
 #: selection:dm.ddf.plugin,type:0
 msgid "Dynamic"
-msgstr ""
+msgstr "Dynaaminen"
 
 #. module: dm
 #: view:dm.offer.history:0
 msgid "Actions"
-msgstr ""
+msgstr "Toiminnot"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_trademark_form
 #: model:ir.ui.menu,name:dm.menu_action_trademark_form
 msgid "All Trademarks"
-msgstr ""
+msgstr "Kaikki tuotemerkit"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,trigger:0
 msgid "At Draft"
-msgstr ""
+msgstr "Luonnoksessa"
 
 #. module: dm
 #: help:res.partner,decoy_for_campaign:0
 msgid "Define if this decoy address can be used with campaigns"
-msgstr ""
+msgstr "Määritä jos tätä houkutinosoitetta voidaan käyttää kampanjoissa"
 
 #. module: dm
 #: field:res.partner,decoy_for_renting:0
 msgid "Used for File Renting"
-msgstr ""
+msgstr "Käytetty kortiston vuokraukseen"
 
 #. module: dm
 #: model:ir.actions.report.xml,name:dm.dm_preoffer_report
 msgid "PreOffer"
-msgstr ""
+msgstr "Etukäteistarjous"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_numeric_criteria
 msgid "Customer Segmentation Numeric Criteria"
-msgstr ""
+msgstr "Asiakassegmentin numeerinen kriteria"
 
 #. module: dm
 #: rml:dm.campaign.report:0
 msgid "Sent Quantity"
-msgstr ""
+msgstr "Lähetetty määrä"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Delay After Trigger Date:"
-msgstr ""
+msgstr "Viive asetetun päivämäärän jälkeen"
 
 #. module: dm
 #: selection:dm.customer.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Osittaistoimitus"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Set to In Progress"
-msgstr ""
+msgstr "Asetettu käynnissä olevaksi"
 
 #. module: dm
 #: help:dm.campaign.proposition.segment,quantity_purged:0
@@ -2140,54 +2143,56 @@ msgid ""
 "The purged quantity is the number of addresses removed from deduplication "
 "and cleaning."
 msgstr ""
+"Puhdistettu määrä on se määrä osoitteita, jotka on poistettu "
+"kahdennuksenpoistajalla tai puhdistamalla."
 
 #. module: dm
 #: field:dm.offer,offer_origin_id:0
 msgid "Original Offer"
-msgstr ""
+msgstr "Alkuperäinen tarjous"
 
 #. module: dm
 #: field:dm.customer.order,picking_ids:0
 msgid "Related Packing"
-msgstr ""
+msgstr "Liittyvä pakkaus"
 
 #. module: dm
 #: field:dm.campaign.proposition.item,proposition_id:0
 msgid "Commercial Proposition"
-msgstr ""
+msgstr "Mainosehdotus"
 
 #. module: dm
 #: field:dm.campaign,deduplicator_id:0
 #: model:res.partner.category,name:dm.cat_deduplicator
 msgid "Deduplicator"
-msgstr ""
+msgstr "Kahdennuksenpoistaja"
 
 #. module: dm
 #: field:dm.customers_list,per_thousand_price:0
 msgid "Price per Thousand"
-msgstr ""
+msgstr "Hinta / Tuhat"
 
 #. module: dm
 #: field:dm.campaign.proposition.segment,all_add_avail:0
 msgid "All Adresses Available"
-msgstr ""
+msgstr "Kaikki saatavilla olevat osoitteet"
 
 #. module: dm
 #: view:dm.campaign.purchase_line:0
 #: field:ir.actions.report.xml,document_id:0
 msgid "Document"
-msgstr ""
+msgstr "Dokumentti"
 
 #. module: dm
 #: model:product.template,description:dm.product_product_defaulttranslation0_product_template
 msgid "Default Translation for Direct Marketing Campaigns"
-msgstr ""
+msgstr "Oletuskäännös suoramarkkinointikampanjoille"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_dm_order_form
 #: model:ir.ui.menu,name:dm.menu_action_dm_order_form
 msgid "All Orders"
-msgstr ""
+msgstr "Kaikki tilaukset"
 
 #. module: dm
 #: help:dm.customer.order,invoice_ids:0
@@ -2196,43 +2201,46 @@ msgid ""
 "The same sale order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Tässä on lista laskuista jotka on luotu tälle myytitilaukselle. Yhtä "
+"myyntitilausta on saatettu laskuttaa useamman kerran (esimerkiksi "
+"rivikohtaisesti)."
 
 #. module: dm
 #: field:dm.customers_list,broker_cost:0
 msgid "Broker Cost"
-msgstr ""
+msgstr "Välittäjäkustannus"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,type_document:0
 msgid "Request For Quotation"
-msgstr ""
+msgstr "Tarjouspyyntö"
 
 #. module: dm
 #: selection:dm.customers_list,invoice_base:0
 msgid "Raw Addresses Quantity"
-msgstr ""
+msgstr "Raakaosoitteiden määrä"
 
 #. module: dm
 #: field:dm.order,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postinumero"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,date_order:0
 msgid "Order date"
-msgstr ""
+msgstr "Tilauspäivämäärä"
 
 #. module: dm
 #: field:dm.offer.translation,translator_id:0
 #: model:res.partner.category,name:dm.cat_translator
 msgid "Translator"
-msgstr ""
+msgstr "Kääntäjä"
 
 #. module: dm
 #: help:dm.customer.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this invoice"
-msgstr ""
+msgstr "Tämä on keräilylista joka on luotu laskulle"
 
 #. module: dm
 #: model:dm.offer.step.type,description:dm.dm_offer_step_type_startingmailing0
@@ -2241,43 +2249,46 @@ msgid ""
 "a multimedia context, the term mailing could be a paper mail, an e-mail, an "
 "sms, a rss feed, etc."
 msgstr ""
+"Aloittava postitus on ensimmäinen postitus joka on lähetetty "
+"potentiaaliselle asiakkaalle. Multimediaviitekehyksessä sana \"postitus\" "
+"voi olla paperipostia, sähköpostia, tekstiviesti, rss -syöte jne."
 
 #. module: dm
 #: model:product.template,description:dm.product_product_printingus0_product_template
 msgid "Demo Paper Printing for the US"
-msgstr ""
+msgstr "Paperin demotulostus US:lle"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,type:0
 #: view:dm.offer:0
 #: model:product.category,name:dm.product_category_translation0
 msgid "Translation"
-msgstr ""
+msgstr "Käännös"
 
 #. module: dm
 #: field:dm.offer,forbidden_state_ids:0
 msgid "Forbidden States"
-msgstr ""
+msgstr "Kielletyt osavaltiot"
 
 #. module: dm
 #: model:dm.offer.step.type,name:dm.dm_offer_step_type_accompanyingletterofthepackageinsert0
 msgid "Accompanying Letter of the Package Insert"
-msgstr ""
+msgstr "Pakkauslisäkkeen mukana oleva kirje"
 
 #. module: dm
 #: field:dm.overlay,bank_account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Tili"
 
 #. module: dm
 #: model:product.template,name:dm.product_product_returnenveloppeus0_product_template
 msgid "Return Enveloppe US"
-msgstr ""
+msgstr "Palautuskirjekuori US"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Planning Advices"
-msgstr ""
+msgstr "Suunnittelmaneuvot"
 
 #. module: dm
 #: help:dm.campaign,project_id:0
@@ -2285,43 +2296,45 @@ msgid ""
 "Generating the Retro Planning will create and assign the different tasks "
 "used to plan and manage the campaign"
 msgstr ""
+"Retro -suunnittelun luonti luo ja määrää erilaisia tehtäviä kampanjan "
+"suunnitteluun ja hallintaan"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "DTP Tasks"
-msgstr ""
+msgstr "DTP Tehtävät"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_dm_template
 #: model:ir.ui.menu,name:dm.menu_action_dm_template
 msgid "All DTP Plugins Template"
-msgstr ""
+msgstr "Kaikkien DTP liitännäisten malli"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_order_text_criteria
 msgid "Customer Order Segmentation Textual Criteria"
-msgstr ""
+msgstr "Asiakastilaussegementtien kirjalliset kriteerit"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Myyntitilaus"
 
 #. module: dm
 #: selection:dm.mail_service,unit_interval:0
 #: selection:dm.offer.step.transition,delay_type:0
 msgid "Days"
-msgstr ""
+msgstr "Päivää"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Item Purchase Line"
-msgstr ""
+msgstr "Tavaran ostorivi"
 
 #. module: dm
 #: model:dm.campaign.type,code:dm.dm_campaign_type_deleting
 msgid "deleting"
-msgstr ""
+msgstr "poistaminen"
 
 #. module: dm
 #: view:dm.campaign:0
@@ -2351,66 +2364,66 @@ msgstr ""
 #: rml:offer.model.report:0
 #: rml:offer.report:0
 msgid "Code"
-msgstr ""
+msgstr "Koodi"
 
 #. module: dm
 #: field:dm.plugins.value,customer_id:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Asiakkaan nimi"
 
 #. module: dm
 #: field:dm.campaign.proposition,quantity_planned:0
 #: field:dm.campaign.proposition.item,qty_planned:0
 msgid "Planned Quantity"
-msgstr ""
+msgstr "Suunniteltu määrä"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_form_my
 #: model:ir.ui.menu,name:dm.menu_action_campaign_form_my
 msgid "My Campaigns"
-msgstr ""
+msgstr "Omat kampanjat"
 
 #. module: dm
 #: selection:dm.mail_service,unit_interval:0
 #: selection:dm.offer.step.transition,delay_type:0
 msgid "Minutes"
-msgstr ""
+msgstr "Minuuttia"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Campaign Status"
-msgstr ""
+msgstr "Kampanjan status"
 
 #. module: dm
 #: view:dm.offer:0
 msgid "Forbiden States"
-msgstr ""
+msgstr "Kielletut osavaltiot"
 
 #. module: dm
 #: field:dm.campaign,cleaner_id:0
 #: model:res.partner.category,name:dm.cat_cleaner
 msgid "Cleaner"
-msgstr ""
+msgstr "Puhdistaja"
 
 #. module: dm
 #: field:dm.document.template,name:0
 msgid "Template Name"
-msgstr ""
+msgstr "Mallin nimi"
 
 #. module: dm
 #: selection:dm.offer,legal_state:0
 msgid "Not Validated"
-msgstr ""
+msgstr "Ei tarkistettu"
 
 #. module: dm
 #: field:dm.campaign,planning_state:0
 msgid "Planning Status"
-msgstr ""
+msgstr "Suunnittelun status"
 
 #. module: dm
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "ALV vaikuttaisi olevan väärin."
 
 #. module: dm
 #: view:product.product:0
@@ -2418,18 +2431,18 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,state_ids:0
 msgid "Allowed States"
-msgstr ""
+msgstr "Sallitut osavaltiot"
 
 #. module: dm
 #: view:dm.offer:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Palauta Luonnokseksi"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_form_my2
 #: model:ir.ui.menu,name:dm.menu_action_campaign_form_my2
 msgid "My Draft Campaigns"
-msgstr ""
+msgstr "Omat kampanjaluonnokset"
 
 #. module: dm
 #: model:dm.offer.step.type,description:dm.dm_offer_step_type_accompanyingletteroftheintermediatemailing0
@@ -2440,22 +2453,25 @@ msgid ""
 "letter to inform the potential customer that you regret that he didn't "
 "ordered."
 msgstr ""
+"Liitännäiskirje on tuotteen tilauksen mukana postitettava kirje, kuten "
+"käyttäjäopas tai kiitoskirje. Se voi olla myös kirje, jossa pahoitellaan "
+"ettei asiakas tilannut mitään."
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customers_list_type
 msgid "Type of the adress list"
-msgstr ""
+msgstr "Osoitelistan tyyppi"
 
 #. module: dm
 #: view:dm.offer.category:0
 msgid "Offer Category"
-msgstr ""
+msgstr "Tarjouskategoria"
 
 #. module: dm
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Categories :"
-msgstr ""
+msgstr "Kategoriat :"
 
 #. module: dm
 #: rml:dm.campaign.report:0
@@ -2463,141 +2479,143 @@ msgstr ""
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Code :"
-msgstr ""
+msgstr "Koodi :"
 
 #. module: dm
 #: view:dm.ddf.plugin:0
 msgid "Dynamic Plugin"
-msgstr ""
+msgstr "Dynaaminen liitännäinen"
 
 #. module: dm
 #: field:dm.offer.step.transition.trigger,name:0
 msgid "Trigger Name"
-msgstr ""
+msgstr "Liipaisimen nimi"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Trademark Advices"
-msgstr ""
+msgstr "Tuotemerkki neuvot"
 
 #. module: dm
 #: selection:dm.customer.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Toimitetut määrät"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Campaign Description"
-msgstr ""
+msgstr "Kampanjan kuvaus"
 
 #. module: dm
 #: field:dm.offer.step.type,flow_stop:0
 msgid "Flow Stop"
-msgstr ""
+msgstr "Kulku seis"
 
 #. module: dm
 #: view:dm.campaign:0
 #: field:dm.campaign,manufacturing_state:0
 msgid "Manufacturing Status"
-msgstr ""
+msgstr "Valmistuksen status"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_type_form
 #: model:ir.ui.menu,name:dm.menu_action_campaign_type_form
 msgid "All Campaign Types"
-msgstr ""
+msgstr "Kaikki kampanjatyypit"
 
 #. module: dm
 #: view:dm.ddf.plugin:0
 msgid "Customer Plugin"
-msgstr ""
+msgstr "Asiakasliitännäinen"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_step
 msgid "dm.offer.step"
-msgstr ""
+msgstr "dm.offer.stop"
 
 #. module: dm
 #: view:dm.customers_list.recruit_origin:0
 msgid "Customers List Recruiting Origin Description"
-msgstr ""
+msgstr "Asiakaslistarekrytointilähteen kuvaus"
 
 #. module: dm
 #: model:dm.offer.step.type,name:dm.dm_offer_step_type_intermediatemailing0
 msgid "Intermediate Mailing"
-msgstr ""
+msgstr "Välittäjäpostitus"
 
 #. module: dm
 #: view:dm.customers_list:0
 msgid "Customers List Description"
-msgstr ""
+msgstr "Asiakaslistan kuvaus"
 
 #. module: dm
 #: field:project.task,date_planned:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Suunniteltu päivämäärä"
 
 #. module: dm
 #: selection:dm.mail_service,unit_interval:0
 #: selection:dm.offer.step.transition,delay_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Tuntia"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_form_all
 #: model:ir.ui.menu,name:dm.menu_action_campaign_form_all
 msgid "All Campaigns"
-msgstr ""
+msgstr "Kaikki kampanjat"
 
 #. module: dm
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Planned Delivery Date :"
-msgstr ""
+msgstr "Suunniteltu toimituspäivämäärä :"
 
 #. module: dm
 #: field:dm.mail_service,unit_interval:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Väliyksikkö"
 
 #. module: dm
 #: code:addons/dm/offer.py:0
 #, python-format
 msgid "You must first open all offer steps related to this offer."
 msgstr ""
+"Sinun täytyy ensin avata kaikki tarjousvaiheet jotka liittyvät tähän "
+"tarjoukseen."
 
 #. module: dm
 #: model:dm.offer.step.type,code:dm.dm_offer_step_type_packageinsert0
 msgid "PI"
-msgstr ""
+msgstr "PI"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Advanced"
-msgstr ""
+msgstr "Kehittynyt"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_dm_customer_form
 #: model:ir.ui.menu,name:dm.menu_dm_customer_form
 msgid "All Customers"
-msgstr ""
+msgstr "Kaikki asiakkaat"
 
 #. module: dm
 #: wizard_button:wizard_proposition_items,name_prices_prog,new:0
 #: wizard_view:wizard_proposition_items,new:0
 #: wizard_view:wizard_proposition_items,select:0
 msgid "Create Prices Progression"
-msgstr ""
+msgstr "Luo hintakehitys"
 
 #. module: dm
 #: field:dm.customer.order,client_order_ref:0
 msgid "Customer Ref"
-msgstr ""
+msgstr "Asiakkaan viite"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,trigger:0
 msgid "Manual"
-msgstr ""
+msgstr "Manuaalinen"
 
 #. module: dm
 #: view:product.product:0
@@ -2605,51 +2623,52 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,country_ids:0
 msgid "Allowed Countries"
-msgstr ""
+msgstr "Sallitut Valtiot"
 
 #. module: dm
 #: view:dm.offer:0
 #: field:dm.offer,keywords:0
 msgid "Keywords"
-msgstr ""
+msgstr "Avainsanat"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customers_file
 msgid "A File of addresses delivered by an addresses broker"
-msgstr ""
+msgstr "Osoitevälittäjä on toimittanut osoitekortiston"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_mygroup_form
 #: model:ir.ui.menu,name:dm.menu_action_campaign_mygroup_form
 msgid "My Campaign Groups"
-msgstr ""
+msgstr "Omat kampanjaryhmät"
 
 #. module: dm
 #: field:dm.offer.step,document_ids:0
 #: model:ir.actions.act_window,name:dm.act_offer_document_opened
 msgid "DTP Documents"
-msgstr ""
+msgstr "DTP Dokumentit"
 
 #. module: dm
 #: code:addons/dm/campaign.py:0
 #, python-format
 msgid "You must first close all states related to this campaign."
 msgstr ""
+"Sinun täytyy ensin sulkea kaikki tilat jotka liittyvät tähän kampanjaan."
 
 #. module: dm
 #: view:dm.offer:0
 msgid "Create Offers"
-msgstr ""
+msgstr "Luo tarjouksia"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_group
 msgid "dm.campaign.group"
-msgstr ""
+msgstr "dm.campaign.group"
 
 #. module: dm
 #: selection:dm.customer.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "Toimitus ja manuaalinen lasku"
 
 #. module: dm
 #: field:dm.campaign,offer_id:0
@@ -2659,76 +2678,76 @@ msgstr ""
 #: field:dm.offer.translation,offer_id:0
 #: model:ir.actions.report.xml,name:dm.dm_offer_report
 msgid "Offer"
-msgstr ""
+msgstr "Tarjous"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_document_template
 msgid "dm.document.template"
-msgstr ""
+msgstr "dm.document.template"
 
 #. module: dm
 #: selection:dm.customers_list,invoice_base:0
 msgid "Net Addresses Quantity"
-msgstr ""
+msgstr "Verkko-osoitteiden määrä"
 
 #. module: dm
 #: field:dm.offer,purchase_category_ids:0
 msgid "Purchase Categories"
-msgstr ""
+msgstr "Ostokategoriat"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_document
 msgid "dm.offer.document"
-msgstr ""
+msgstr "dm.offer.document"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign
 msgid "dm.campaign"
-msgstr ""
+msgstr "dm.campaign"
 
 #. module: dm
 #: view:dm.trademark:0
 #: field:dm.trademark,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: dm
 #: field:dm.campaign,dealer_id:0
 #: field:dm.overlay,dealer_id:0
 #: model:res.partner.category,name:dm.cat_dealer
 msgid "Dealer"
-msgstr ""
+msgstr "Jälleenmyyjä"
 
 #. module: dm
 #: model:dm.offer.step.type,name:dm.dm_offer_step_type_startingmailing0
 msgid "Starting Mailing"
-msgstr ""
+msgstr "Postituksen aloitus"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "DTP Purchase Line"
-msgstr ""
+msgstr "DTP ostorivi"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,type:0
 #: view:dm.customers_file:0
 msgid "Customer Files"
-msgstr ""
+msgstr "Asiakasarkisto"
 
 #. module: dm
 #: view:dm.customer.segmentation:0
 msgid "Customer Order Boolean Criteria"
-msgstr ""
+msgstr "Asiakastilauksen totuuskriteria"
 
 #. module: dm
 #: field:dm.ddf.plugin,file_id:0
 msgid "File Content"
-msgstr ""
+msgstr "Tiedoston sisältö"
 
 #. module: dm
 #: model:ir.ui.menu,name:dm.menu_dm_config_camp_custlist
 msgid "Customers Lists"
-msgstr ""
+msgstr "Asiakaslistat"
 
 #. module: dm
 #: help:dm.customer.order,order_policy:0
@@ -2744,33 +2763,45 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
+"Kuljetuskäytäntöä käytetään synkronoimaan lasku -ja toimitustoimintoja.\n"
+"  - 'Maksa ennen toimitusta' -valinta luo ensin laskun jonka jälkeen se luo "
+"pakkaustilauksen laskun maksamisen jälkeen.\n"
+"  - 'Kuljetus & Käsinlaskutus' -valinta luo välittömästi pakkaustilauksen ja "
+"odottaa, että käyttäjä painaa \"Lasku\" -painiketta luodakseen "
+"laskuluonnoksen.\n"
+"  - 'Lasku tilauksesta toimituksen jälkeen' -valinta luo laskuluonnoksen "
+"perustuen myyntitilaukseen kun kaikki pakkauslistat on valmiita.\n"
+"  - 'Lasku pakkaukselta' -valinta luo laskun samaan aikaan kun "
+"pakkausprosessi etenee."
 
 #. module: dm
 #: help:dm.customers_list,recruiting_origin:0
 msgid "Origin of the recruiting of the adresses"
-msgstr ""
+msgstr "Osoitteiden rekrytointilähde"
 
 #. module: dm
 #: selection:dm.campaign.proposition,proposition_type:0
 msgid "Initial"
-msgstr ""
+msgstr "Ensimmäinen"
 
 #. module: dm
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Virhe: Oletusmittayksikkö ja ostojen mittayksikkö on oltava samassa "
+"kategoriassa."
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_dealer_form
 #: model:ir.ui.menu,name:dm.menu_action_campaign_dealer_form
 msgid "All Dealers"
-msgstr ""
+msgstr "Kaikki jälleenmyyjät"
 
 #. module: dm
 #: field:dm.campaign,dtp_purchase_line_ids:0
 msgid "DTP Purchase Lines"
-msgstr ""
+msgstr "DTP ostorivit"
 
 #. module: dm
 #: help:dm.customer.order,invoice_quantity:0
@@ -2780,13 +2811,17 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
+"Myyntitilaukselle luodaan automaattisesti luonnoslasku. Tilatut ja "
+"toimitetut määrät eivät välttämättä ole samoja. Sinun täytyy valita "
+"perustuuko lasku tilattuihin vai toimitettuihin määriin. Jos tuote on "
+"palvelua tarkoittaa toimitettu määrä työtehtäviin käytettyjä tunteja."
 
 #. module: dm
 #: rml:offer.model.report:0
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Attached Documents :"
-msgstr ""
+msgstr "Liitetyt dokumentit :"
 
 #. module: dm
 #: selection:dm.campaign,customer_file_state:0
@@ -2797,57 +2832,57 @@ msgstr ""
 #: selection:dm.campaign,translation_state:0
 #: selection:dm.campaign.purchase_line,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Odottaa"
 
 #. module: dm
 #: view:dm.offer:0
 msgid "Steps By Offers"
-msgstr ""
+msgstr "Tarjouksien vaiheet"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Advises"
-msgstr ""
+msgstr "Neuvot"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Purchase Advices"
-msgstr ""
+msgstr "Ostoneuvot"
 
 #. module: dm
 #: field:dm.order,customer_add1:0
 msgid "Address1"
-msgstr ""
+msgstr "Osoite1"
 
 #. module: dm
 #: field:dm.order,customer_add2:0
 msgid "Address2"
-msgstr ""
+msgstr "Osoite2"
 
 #. module: dm
 #: field:dm.order,customer_add3:0
 msgid "Address3"
-msgstr ""
+msgstr "Osoite3"
 
 #. module: dm
 #: field:dm.order,customer_add4:0
 msgid "Address4"
-msgstr ""
+msgstr "Osoite4"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_trademark
 msgid "dm.trademark"
-msgstr ""
+msgstr "dm.trademark"
 
 #. module: dm
 #: field:dm.customer.order,invoiced:0
 msgid "Paid"
-msgstr ""
+msgstr "Maksettu"
 
 #. module: dm
 #: model:dm.media,name:dm.media_phone
 msgid "Phone"
-msgstr ""
+msgstr "Puhelin"
 
 #. module: dm
 #: help:dm.campaign,deduplicator_id:0
@@ -2855,36 +2890,38 @@ msgid ""
 "The deduplicator is a partner responsible to remove identical addresses from "
 "the customers list"
 msgstr ""
+"Kahdennukspoistaja on asiakasosoitelistoilla olevien identtisten osoitteiden "
+"poistamisesta vastavaava kumppani"
 
 #. module: dm
 #: selection:dm.campaign.proposition,proposition_type:0
 #: field:dm.campaign.proposition.segment,split_id:0
 msgid "Split"
-msgstr ""
+msgstr "Jaa"
 
 #. module: dm
 #: view:dm.campaign.group:0
 msgid "Groups"
-msgstr ""
+msgstr "Ryhmät"
 
 #. module: dm
 #: field:dm.campaign.proposition,quantity_wanted:0
 #: field:dm.campaign.proposition.segment,quantity_wanted:0
 #: selection:dm.campaign.purchase_line,type_quantity:0
 msgid "Wanted Quantity"
-msgstr ""
+msgstr "Haluttu määrä"
 
 #. module: dm
 #: field:dm.campaign.proposition.segment,active:0
 #: field:dm.offer,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_dm_ddf_plugin
 #: model:ir.ui.menu,name:dm.menu_action_dm_ddf_plugin
 msgid "All DTP Plugins"
-msgstr ""
+msgstr "Kaikki DTP liitännäiset"
 
 #. module: dm
 #: help:dm.campaign,cleaner_id:0
@@ -2892,60 +2929,62 @@ msgid ""
 "The cleaner is a partner responsible to remove bad addresses from the "
 "customers list"
 msgstr ""
+"Puhdistaja on asiakasosoitelistoilla olevien kelvottomien osoitteiden "
+"poistamisesta vastavaava kumppani"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.act_campaign_opened
 msgid "Back To Campaign"
-msgstr ""
+msgstr "Takaisin kampanjaan"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customers_list
 msgid "A list of addresses proposed by an adresses broker"
-msgstr ""
+msgstr "Lista osoitteista, joita osoitevälittäjä on ehdottanut"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Arvioitu päivämäärä"
 
 #. module: dm
 #: field:dm.campaign.proposition,forwarding_charges:0
 msgid "Forwarding Charges"
-msgstr ""
+msgstr "Välityspalkkiot"
 
 #. module: dm
 #: code:addons/dm/campaign.py:0
 #, python-format
 msgid "Could not open this Campaign !"
-msgstr ""
+msgstr "Kampanjaa ei voitu avata !"
 
 #. module: dm
 #: view:dm.customer.gender:0
 msgid "Customer Genders"
-msgstr ""
+msgstr "Asiakkaiden sukupuolet"
 
 #. module: dm
 #: wizard_button:wizard_campaign_group,init,next:0
 msgid "Add in Group"
-msgstr ""
+msgstr "Lisää ryhmään"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_copywriter_form
 #: model:ir.ui.menu,name:dm.menu_action_offer_copywriter_from
 msgid "All Copywriters"
-msgstr ""
+msgstr "Kaikki mainostekstien kirjoittajat"
 
 #. module: dm
 #: field:dm.campaign.proposition,quantity_usable:0
 #: field:dm.campaign.proposition.segment,quantity_usable:0
 #: selection:dm.campaign.purchase_line,type_quantity:0
 msgid "Usable Quantity"
-msgstr ""
+msgstr "Käytettävissä oleva määrä"
 
 #. module: dm
 #: field:dm.campaign,campaign_group_id:0
 msgid "Campaign group"
-msgstr ""
+msgstr "Kampanjaryhmä"
 
 #. module: dm
 #: field:dm.campaign.mail_service,action_id:0
@@ -2953,63 +2992,63 @@ msgstr ""
 #: field:dm.offer.step,action:0
 #: field:ir.actions.server,dm_action:0
 msgid "Action"
-msgstr ""
+msgstr "Toimenpide"
 
 #. module: dm
 #: wizard_button:wizard_proposition_items,error,init:0
 #: wizard_field:wizard_proposition_items,init,prices_progression:0
 #: wizard_view:wizard_proposition_items,name_prices_prog:0
 msgid "Select Prices Progression"
-msgstr ""
+msgstr "Valitse hintojenkehitys"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 #: view:dm.campaign.proposition.segment:0
 msgid "= Usable Quantity"
-msgstr ""
+msgstr "= Käytettävissä oleva määrä"
 
 #. module: dm
 #: selection:dm.offer.step,split_mode:0
 msgid "And"
-msgstr ""
+msgstr "Ja"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,state:0
 msgid "Ordered"
-msgstr ""
+msgstr "Tilattu"
 
 #. module: dm
 #: field:dm.customer.segmentation,order_text_criteria_ids:0
 msgid "Customers Order Textual Criteria"
-msgstr ""
+msgstr "Asiakastilauksien kirjallinen kriteria"
 
 #. module: dm
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Delivery Date :"
-msgstr ""
+msgstr "Toimituspäivämäärä :"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_dm_mail_service_form
 #: model:ir.ui.menu,name:dm.menu_dm_mail_service_form
 msgid "All Mail Service"
-msgstr ""
+msgstr "Kaikki postipalvelut"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_broker_form
 #: model:ir.ui.menu,name:dm.menu_action_campaign_broker_form
 msgid "All Customers Lists Brokers"
-msgstr ""
+msgstr "Kaikki asiakaslistojen välittäjät"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,trigger:0
 msgid "At Planning"
-msgstr ""
+msgstr "Sunnittelussa"
 
 #. module: dm
 #: field:dm.campaign.proposition.segment,deduplication_level:0
 msgid "Deduplication Level"
-msgstr ""
+msgstr "Kahdennuksenpoistotaso"
 
 #. module: dm
 #: view:dm.campaign:0
@@ -3022,23 +3061,23 @@ msgstr ""
 #: selection:dm.customer.order,state:0
 #: selection:dm.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Valmis"
 
 #. module: dm
 #: field:dm.customer.order,invoice_ids:0
 msgid "Invoice"
-msgstr ""
+msgstr "Lasku"
 
 #. module: dm
 #: field:dm.plugin.argument,name:0
 msgid "Argument Name"
-msgstr ""
+msgstr "Väitenimi"
 
 #. module: dm
 #: selection:dm.offer,legal_state:0
 #: selection:dm.offer.document,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Tarkistettu"
 
 #. module: dm
 #: view:dm.offer:0
@@ -3046,46 +3085,46 @@ msgstr ""
 #: view:dm.offer.step:0
 #: selection:dm.offer.step,state:0
 msgid "Open"
-msgstr ""
+msgstr "Avaa"
 
 #. module: dm
 #: model:ir.actions.wizard,name:dm.wizard_campaign_group_pos
 #: model:ir.actions.wizard,name:dm.wizard_campaign_pos
 msgid "Purchase Orders"
-msgstr ""
+msgstr "Hankintatilaukset"
 
 #. module: dm
 #: wizard_button:wizard_campaign_group,error,init:0
 msgid "Select the group"
-msgstr ""
+msgstr "Valitse ryhmä"
 
 #. module: dm
 #: view:dm.offer:0
 msgid "Forbiden Countries"
-msgstr ""
+msgstr "Kielletyt Valtiot"
 
 #. module: dm
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
 
 #. module: dm
 #: wizard_view:wizard_campaign_group,error:0
 #: wizard_view:wizard_proposition_items,error:0
 msgid "Error!!!"
-msgstr ""
+msgstr "Virhe!!!"
 
 #. module: dm
 #: field:dm.campaign.proposition,force_sm_price:0
 msgid "Force Starting Mail Price"
-msgstr ""
+msgstr "Pakota aloittavan postin hinta"
 
 #. module: dm
 #: selection:dm.customer.boolean_criteria,operator:0
 #: selection:dm.customer.order.boolean_criteria,operator:0
 msgid "is"
-msgstr ""
+msgstr "on"
 
 #. module: dm
 #: field:dm.campaign,dtp_responsible_id:0
@@ -3096,39 +3135,39 @@ msgstr ""
 #: field:dm.offer,offer_responsible_id:0
 #: field:dm.offer.history,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Vastuullinen"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 #: view:dm.campaign.proposition.segment:0
 msgid "- Cleaning"
-msgstr ""
+msgstr "- Puhdistava"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_translation
 msgid "dm.offer.translation"
-msgstr ""
+msgstr "dm.offer.translation"
 
 #. module: dm
 #: view:dm.customers_list.recruit_origin:0
 msgid "Customer Lists Recruiting Origin"
-msgstr ""
+msgstr "Asiakaslistojen rekrytointilähde"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,desc_from_offer:0
 msgid "Insert Description from Offer"
-msgstr ""
+msgstr "Lisää kuvaus tarjoukselta"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_form_my3
 #: model:ir.ui.menu,name:dm.menu_action_campaign_form_my3
 msgid "My Closed Campaigns"
-msgstr ""
+msgstr "Omat suljetut kampanjat"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 msgid "Propositions"
-msgstr ""
+msgstr "Ehdotukset"
 
 #. module: dm
 #: model:ir.module.module,shortdesc:dm.module_meta_information
@@ -3138,60 +3177,60 @@ msgstr ""
 #: view:res.partner:0
 #: model:res.partner.category,name:dm.res_partner_category_directmarketing0
 msgid "Direct Marketing"
-msgstr ""
+msgstr "Suoramarkkinointi"
 
 #. module: dm
 #: field:dm.customer.order,incoterm:0
 msgid "Incoterm"
-msgstr ""
+msgstr "Incoterm"
 
 #. module: dm
 #: field:dm.campaign.proposition.item,product_id:0
 #: field:dm.campaign.purchase_line,product_id:0
 #: field:dm.customers_list,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Tuote"
 
 #. module: dm
 #: field:dm.offer,planned_delivery_date:0
 msgid "Planned Delivery Date"
-msgstr ""
+msgstr "Suunniteltu toimituspäivämäärä"
 
 #. module: dm
 #: help:dm.campaign.proposition.segment,quantity_dedup_cleaner:0
 msgid "The quantity of duplicated addresses removed by the cleaner."
-msgstr ""
+msgstr "Puhdistaja on poistanut osoitteiden kaksoiskappaleiden määrän"
 
 #. module: dm
 #: view:dm.order:0
 #: view:res.partner:0
 msgid "Address"
-msgstr ""
+msgstr "Osoite"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Theorical Date"
-msgstr ""
+msgstr "Teoreettinen päivämäärä"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 msgid "Commercial Proposition Description"
-msgstr ""
+msgstr "Mainosehdotuksen kuvaus"
 
 #. module: dm
 #: field:dm.campaign,cust_file_task_ids:0
 msgid "Customer Files tasks"
-msgstr ""
+msgstr "Asiakasarkistojen tehtävät"
 
 #. module: dm
 #: view:dm.campaign.type:0
 msgid "Types"
-msgstr ""
+msgstr "Tyypit"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "End Date"
-msgstr ""
+msgstr "Loppupäivämäärä"
 
 #. module: dm
 #: help:dm.campaign,offer_id:0
@@ -3199,58 +3238,61 @@ msgid ""
 "Choose the commercial offer to use with this campaign, only offers in ready "
 "to plan or open state can be assigned"
 msgstr ""
+"Valitse mainostarjous jota käytetään tässä kampanjassa, vain niitä "
+"tarjouksia voidaan käyttää jotka ovat valmiina suunniteltavaksi tai niitä "
+"jotka ovat avoimessa tilassa"
 
 #. module: dm
 #: view:res.partner:0
 #: field:res.partner,client_media_ids:0
 msgid "Client for Media"
-msgstr ""
+msgstr "Päämies medialle"
 
 #. module: dm
 #: field:dm.customer.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr ""
+msgstr "Laskutetaan kun"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer
 msgid "dm.offer"
-msgstr ""
+msgstr "dm.offer"
 
 #. module: dm
 #: field:dm.customer.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Tilauspäivämäärä"
 
 #. module: dm
 #: view:res.partner:0
 msgid "Customer Description"
-msgstr ""
+msgstr "Asiakaskuvaus"
 
 #. module: dm
 #: field:dm.campaign.proposition.segment,quantity_dedup_cleaner:0
 #: field:dm.campaign.proposition.segment,quantity_dedup_dedup:0
 msgid "Deduplication Quantity"
-msgstr ""
+msgstr "Kahdennuksenpoiston määrä"
 
 #. module: dm
 #: field:dm.order,distribution_office:0
 msgid "Distribution Office"
-msgstr ""
+msgstr "Jakelutoimisto"
 
 #. module: dm
 #: model:dm.offer.step.type,code:dm.dm_offer_step_type_intermediatemailing0
 msgid "IM"
-msgstr ""
+msgstr "IM"
 
 #. module: dm
 #: view:dm.order:0
 msgid "Order"
-msgstr ""
+msgstr "Tilaus"
 
 #. module: dm
 #: field:dm.customers_list,delivery_cost:0
 msgid "Delivery Cost"
-msgstr ""
+msgstr "Toimituskustannus"
 
 #. module: dm
 #: view:dm.offer.step.transition.tigger:0
@@ -3258,7 +3300,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:dm.action_offer_step_transition_trigger
 #: model:ir.ui.menu,name:dm.menu_offer_step_transition_trigger
 msgid "Transition Trigger"
-msgstr ""
+msgstr "Muutoslaukaisin"
 
 #. module: dm
 #: view:dm.campaign:0
@@ -3271,33 +3313,33 @@ msgstr ""
 #: view:dm.offer.document:0
 #: view:dm.offer.step:0
 msgid "General"
-msgstr ""
+msgstr "Yleinen"
 
 #. module: dm
 #: view:res.partner:0
 #: field:res.partner,language_ids:0
 msgid "Other Languages"
-msgstr ""
+msgstr "Muut kielet"
 
 #. module: dm
 #: model:dm.offer.step.type,code:dm.dm_offer_step_type_accompanyingletterofthepackageinsert0
 msgid "ALPI"
-msgstr ""
+msgstr "PLLK (pakkauslisäkkeen liitännäiskirje)"
 
 #. module: dm
 #: field:dm.customer.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Yhteensä"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,type_document:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumenttityyppi"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_proposition
 msgid "dm.campaign.proposition"
-msgstr ""
+msgstr "dm.campaign.proposition"
 
 #. module: dm
 #: help:dm.campaign.proposition,quantity_wanted:0
@@ -3308,6 +3350,10 @@ msgid ""
 "This is usually the quantity used to order Customers Lists\n"
 "The wanted quantity could be AAA for All Addresses Available"
 msgstr ""
+"Haluttu määrä on osoitteiden määrä jonka haluat jollekkin segmentille.\n"
+"Tätä määrää käytetään tilaamaan asiakaslistoja\n"
+"Haluttu määrä voi olla AAA eli kaikki käytettävissä olevat osoitteet (All "
+"Addresses Available)"
 
 #. module: dm
 #: field:dm.customer.order,state:0
@@ -3320,89 +3366,90 @@ msgstr ""
 #: view:dm.order:0
 #: field:dm.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: dm
 #: field:dm.campaign.proposition.item,offer_step_type_id:0
 #: view:dm.offer.step.type:0
 msgid "Offer Step Type"
-msgstr ""
+msgstr "Tarjousvaiheen tyyppi"
 
 #. module: dm
 #: help:dm.campaign.proposition.segment,quantity_dedup_dedup:0
 msgid "The quantity of duplicated addresses removed by the deduplicator."
 msgstr ""
+"Kahdennuksenpoistaja on poistanut osoitteiden kaksoiskappalaiden määrän"
 
 #. module: dm
 #: wizard_view:wizard_proposition_items,error:0
 msgid "error test"
-msgstr ""
+msgstr "vikatesti"
 
 #. module: dm
 #: model:product.template,name:dm.product_product_openerpdiscoverydayonmay0_product_template
 msgid "Open ERP Discovery Day on May 2009"
-msgstr ""
+msgstr "OpenERP:n julkaisupäivä toukokuussa 2009"
 
 #. module: dm
 #: field:dm.campaign,quantity_delivered_total:0
 #: field:dm.campaign.group,quantity_delivered_total:0
 msgid "Total Delivered Quantity"
-msgstr ""
+msgstr "Toimitettu kokonaismäärä"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_purchase_line
 msgid "dm.campaign.purchase_line"
-msgstr ""
+msgstr "dm.campaign.purchase_line"
 
 #. module: dm
 #: field:dm.ddf.plugin,file_fname:0
 msgid "Filename"
-msgstr ""
+msgstr "Tiedostonimi"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,trigger:0
 msgid "Trigger"
-msgstr ""
+msgstr "Laukaisin"
 
 #. module: dm
 #: view:dm.offer.step.manufacturing_constraint:0
 msgid "Manufacturing Description"
-msgstr ""
+msgstr "Valmistuksen kuvaus"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_history
 msgid "dm.offer.history"
-msgstr ""
+msgstr "dm.offer.history"
 
 #. module: dm
 #: field:dm.campaign,items_state:0
 msgid "Items Status"
-msgstr ""
+msgstr "Tavaroiden tilat"
 
 #. module: dm
 #: field:dm.campaign,quantity_planned_total:0
 msgid "Total planned Quantity"
-msgstr ""
+msgstr "Suunniteltu kokonaismäärä"
 
 #. module: dm
 #: selection:dm.mail_service,unit_interval:0
 msgid "Weeks"
-msgstr ""
+msgstr "Viikkoa"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_order
 msgid "dm.order"
-msgstr ""
+msgstr "dm.order"
 
 #. module: dm
 #: wizard_field:wizard_campaign_group,name_group,group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Ryhmän nimi"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Customers Files"
-msgstr ""
+msgstr "Asiakasarkistot"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
@@ -3418,42 +3465,42 @@ msgstr ""
 #: field:dm.customer.text_criteria,segmentation_id:0
 #: model:ir.model,name:dm.model_dm_customer_segmentation
 msgid "Segmentation"
-msgstr ""
+msgstr "Segmentointi"
 
 #. module: dm
 #: view:dm.campaign:0
 #: view:dm.campaign.proposition:0
 #: view:dm.offer:0
 msgid "Global Information"
-msgstr ""
+msgstr "Yleismaailmalliset tiedot"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_form_my1
 #: model:ir.ui.menu,name:dm.menu_action_offer_form_my1
 msgid "My Open Offers"
-msgstr ""
+msgstr "Omat avoimet tarjoukset"
 
 #. module: dm
 #: field:dm.customers_list,broker_id:0
 #: model:res.partner.category,name:dm.cat_broker
 msgid "Broker"
-msgstr ""
+msgstr "Välittäjä"
 
 #. module: dm
 #: view:dm.document.template:0
 #: field:dm.offer.document,document_template_id:0
 msgid "Document Template"
-msgstr ""
+msgstr "Dokumenttimalli"
 
 #. module: dm
 #: field:purchase.order,dm_campaign_purchase_line:0
 msgid "DM Campaign Purchase Line"
-msgstr ""
+msgstr "DM Kampajan ostorivi"
 
 #. module: dm
 #: view:dm.trademark:0
 msgid "Trademarks"
-msgstr ""
+msgstr "Tuotemerkit"
 
 #. module: dm
 #: view:dm.campaign:0
@@ -3463,22 +3510,22 @@ msgstr ""
 #: view:res.country:0
 #: field:res.country,payment_methods:0
 msgid "Payment Methods"
-msgstr ""
+msgstr "Maksutavat"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Campaigns Model"
-msgstr ""
+msgstr "Kampanjamalli"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Lähtevät siirtymät"
 
 #. module: dm
 #: field:dm.customer.order,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Myymälä"
 
 #. module: dm
 #: wizard_button:campaign.group.project,init,done:0
@@ -3488,42 +3535,42 @@ msgstr ""
 #: wizard_button:wizard_proposition_items,new,end:0
 #: wizard_button:wizard_proposition_items,select,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Customers Files Tasks"
-msgstr ""
+msgstr "Asiakasarkistojen tehtävät"
 
 #. module: dm
 #: field:dm.offer,last_modification_date:0
 msgid "Last Modification Date"
-msgstr ""
+msgstr "Viimeisin muokkauspäivä"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_step_type
 msgid "dm.offer.step.type"
-msgstr ""
+msgstr "dm.offer.step.type"
 
 #. module: dm
 #: view:dm.customer.segmentation:0
 msgid "Customer Numeric Criteria"
-msgstr ""
+msgstr "Asiakkaan numeerinen kriteria"
 
 #. module: dm
 #: rml:offer.report:0
 msgid "Quotation :"
-msgstr ""
+msgstr "Hintatarjous :"
 
 #. module: dm
 #: field:dm.offer.step,planning_note:0
 msgid "Planning Notes"
-msgstr ""
+msgstr "Suunnittelun huomautukset"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,type_document:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Ostotilaus"
 
 #. module: dm
 #: wizard_field:campaign.group.project,init,project_id:0
@@ -3533,82 +3580,82 @@ msgstr ""
 #: model:ir.actions.wizard,name:dm.campaign_group_wiz
 #: model:ir.actions.wizard,name:dm.campaign_wiz
 msgid "Project"
-msgstr ""
+msgstr "Projekti"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_form_all2
 #: model:ir.ui.menu,name:dm.menu_action_offer_form_all2
 msgid "Draft Offers"
-msgstr ""
+msgstr "Luonnostele tarjoukset"
 
 #. module: dm
 #: help:dm.campaign,router_id:0
 msgid ""
 "The router is the partner who will send the mailing to the final customer"
-msgstr ""
+msgstr "Reitittäjä on kumppani joka lähettää postitukset loppuasiakkaalle"
 
 #. module: dm
 #: selection:dm.offer.step,split_mode:0
 msgid "Or"
-msgstr ""
+msgstr "Tai"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_document_category
 msgid "dm.offer.document.category"
-msgstr ""
+msgstr "dm.offer.document.category"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_proposition_my
 #: model:ir.ui.menu,name:dm.menu_action_campaign_proposition_my
 msgid "My Campaign Propositions"
-msgstr ""
+msgstr "Omat kampanjaehdotukset"
 
 #. module: dm
 #: view:dm.customer.order:0
 msgid "Sale Infos"
-msgstr ""
+msgstr "Myyntitiedot"
 
 #. module: dm
 #: view:dm.customer.order:0
 msgid "Note"
-msgstr ""
+msgstr "Huomautus"
 
 #. module: dm
 #: field:dm.order,segment_code:0
 msgid "Segment Code"
-msgstr ""
+msgstr "Segmenttikoodi"
 
 #. module: dm
 #: selection:dm.customer.order.text_criteria,operator:0
 #: selection:dm.customer.text_criteria,operator:0
 msgid "like"
-msgstr ""
+msgstr "kuten"
 
 #. module: dm
 #: view:dm.campaign:0
 #: field:dm.offer.history,date:0
 msgid "Drop Date"
-msgstr ""
+msgstr "Lopetuspäivämäärä"
 
 #. module: dm
 #: model:product.template,name:dm.product_product_ondemandassociationfreetrial0_product_template
 msgid "OnDemand Association Free Trial"
-msgstr ""
+msgstr "OnDemand -assosiaation ilmainen kokeilu"
 
 #. module: dm
 #: view:dm.campaign.type:0
 msgid "Campaign Type Description"
-msgstr ""
+msgstr "Kampanjan tyyppikuvaus"
 
 #. module: dm
 #: rml:dm.campaign.report:0
 msgid "Sale Rate"
-msgstr ""
+msgstr "Myyntiaste"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Transitions"
-msgstr ""
+msgstr "Siirtymät"
 
 #. module: dm
 #: wizard_view:campaign.group.project,init:0
@@ -3616,7 +3663,7 @@ msgstr ""
 #: view:dm.campaign.group:0
 #: field:dm.campaign.purchase_line,campaign_group_id:0
 msgid "Campaign Group"
-msgstr ""
+msgstr "Kampanjaryhmä"
 
 #. module: dm
 #: help:res.partner,decoy_address:0
@@ -3624,11 +3671,13 @@ msgid ""
 "A decoy address is an address used to identify unleagal uses of a customers "
 "file"
 msgstr ""
+"Houkutinosoite on osoite jota käytetään huomaamaan asiakaskortiston laiton "
+"käyttö"
 
 #. module: dm
 #: view:dm.customer.segmentation:0
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #. module: dm
 #: field:dm.customer.boolean_criteria,operator:0
@@ -3640,22 +3689,22 @@ msgstr ""
 #: field:dm.customer.order.text_criteria,operator:0
 #: field:dm.customer.text_criteria,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operaattori"
 
 #. module: dm
 #: model:product.template,description:dm.product_product_ondemandassociationfreetrial0_product_template
 msgid "A 1 month Free Trial for the Association profile"
-msgstr ""
+msgstr "1 kuukauden ilmainen kokeilu liittyvälle profiilille"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_type
 msgid "dm.campaign.type"
-msgstr ""
+msgstr "dm.campaign.type"
 
 #. module: dm
 #: field:dm.campaign,item_purchase_line_ids:0
 msgid "Items Purchase Lines"
-msgstr ""
+msgstr "Tavaroiden ostorivit"
 
 #. module: dm
 #: view:dm.offer.document:0
@@ -3663,56 +3712,56 @@ msgstr ""
 #: rml:offer.model.report:0
 #: rml:offer.report:0
 msgid "Documents"
-msgstr ""
+msgstr "Dokumentit"
 
 #. module: dm
 #: code:addons/dm/offer_step.py:0
 #, python-format
 msgid "Could not open this offer step !"
-msgstr ""
+msgstr "Tarjousvaihetta ei voitu avata !"
 
 #. module: dm
 #: view:dm.customer.order:0
 #: view:dm.order:0
 msgid "Confirm"
-msgstr ""
+msgstr "Hyväksy"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Documents Generation"
-msgstr ""
+msgstr "Dokumenttien luominen"
 
 #. module: dm
 #: selection:dm.campaign.proposition.item,item_type:0
 msgid "Main Item"
-msgstr ""
+msgstr "Päätavara"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_proposition_prices_progression
 msgid "dm.campaign.proposition.prices_progression"
-msgstr ""
+msgstr "dm.campaign.proposition.prices_progression"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_order_numeric_criteria
 msgid "Customer Order Segmentation Numeric Criteria"
-msgstr ""
+msgstr "Asiakastilaussegementin numeerinen kriteria"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_category
 msgid "dm.offer.category"
-msgstr ""
+msgstr "dm.offer.category"
 
 #. module: dm
 #: view:dm.offer:0
 #: model:ir.ui.menu,name:dm.menu_dm_config_offer
 #: model:ir.ui.menu,name:dm.menu_dm_offer
 msgid "Offers"
-msgstr ""
+msgstr "Tarjoukset"
 
 #. module: dm
 #: field:dm.offer.step,mailing_at_dates:0
 msgid "Mailing at dates"
-msgstr ""
+msgstr "Postituspäivämäärät"
 
 #. module: dm
 #: help:dm.campaign,country_id:0
@@ -3720,171 +3769,172 @@ msgid ""
 "The language and currency will be automaticaly assigned if they are defined "
 "for the country"
 msgstr ""
+"Kieli ja valuutta määrätään automaattisesti jos ne on määritelty valtiolle"
 
 #. module: dm
 #: field:dm.offer.document,has_attachment:0
 msgid "Has Attachment"
-msgstr ""
+msgstr "Sisältää liitteen"
 
 #. module: dm
 #: model:dm.media,name:dm.media_email
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
 #. module: dm
 #: field:dm.offer,production_category_ids:0
 msgid "Production Categories"
-msgstr ""
+msgstr "Tuotantokategoriat"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,product_category:0
 msgid "Product Category"
-msgstr ""
+msgstr "Tuotekategoria"
 
 #. module: dm
 #: model:res.partner.category,name:dm.cat_item_supplier
 msgid "Item Supplier"
-msgstr ""
+msgstr "Tavarantoimittaja"
 
 #. module: dm
 #: selection:dm.customer.order.text_criteria,operator:0
 #: selection:dm.customer.text_criteria,operator:0
 msgid "ilike"
-msgstr ""
+msgstr "pidän"
 
 #. module: dm
 #: help:res.partner,decoy_owner:0
 msgid "The partner this decoy address belongs to"
-msgstr ""
+msgstr "Kumppani jolle tämä houkutinosoite kuuluu"
 
 #. module: dm
 #: field:res.partner,decoy_media_ids:0
 msgid "decoy address for Media"
-msgstr ""
+msgstr "houkutinosoite medialle"
 
 #. module: dm
 #: field:dm.campaign.purchase_line,quantity_warning:0
 msgid "Warning"
-msgstr ""
+msgstr "Varoitus"
 
 #. module: dm
 #: field:dm.offer.step,trademark_note:0
 msgid "Trademark Notes"
-msgstr ""
+msgstr "Tuotemerkki huomautukset"
 
 #. module: dm
 #: model:product.template,description:dm.product_product_openerpuserbook0_product_template
 msgid "The Open ERP User Book"
-msgstr ""
+msgstr "OpenERP käyttäjän kirja"
 
 #. module: dm
 #: field:dm.offer.document,gender_id:0
 msgid "Gender"
-msgstr ""
+msgstr "Sukupuoli"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_proposition
 #: model:ir.ui.menu,name:dm.menu_action_campaign_proposition
 msgid "All Campaign Propositions"
-msgstr ""
+msgstr "Kaikki kampanjaehdotukset"
 
 #. module: dm
 #: field:dm.offer.step,production_note:0
 msgid "Production Notes"
-msgstr ""
+msgstr "Tuotantohuomautukset"
 
 #. module: dm
 #: model:ir.ui.menu,name:dm.menu_dm_config
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguraatio"
 
 #. module: dm
 #: view:dm.offer:0
 msgid "Offer Description"
-msgstr ""
+msgstr "Tarjouskuvaus"
 
 #. module: dm
 #: view:dm.campaign.group:0
 msgid "Supplying"
-msgstr ""
+msgstr "Toimittavat"
 
 #. module: dm
 #: selection:dm.customer.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr ""
+msgstr "Lasku toimituksen jälkeen"
 
 #. module: dm
 #: model:ir.actions.wizard,name:dm.wizard_offer_documents
 msgid "View Documents"
-msgstr ""
+msgstr "Näytä dokumentit"
 
 #. module: dm
 #: selection:dm.customer.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr ""
+msgstr "Kokonaistoimitus"
 
 #. module: dm
 #: view:dm.customer.segmentation:0
 msgid "Customer Order Textual Criteria"
-msgstr ""
+msgstr "Asiakastilauksen kirjallinen kriteria"
 
 #. module: dm
 #: field:dm.customer.segmentation,order_numeric_criteria_ids:0
 msgid "Customers Order Numeric Criteria"
-msgstr ""
+msgstr "Asiakastilauksen numeerinen kriteria"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customer_boolean_criteria
 msgid "Customer Segmentation Boolean Criteria"
-msgstr ""
+msgstr "Asiakassegmentin totuuskriteria"
 
 #. module: dm
 #: field:dm.campaign.proposition.segment,end_census:0
 msgid "End Census (days)"
-msgstr ""
+msgstr "Päätä laskenta (päiviä)"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_form_all3
 #: model:ir.ui.menu,name:dm.menu_action_campaign_form_all3
 msgid "Closed Campaigns"
-msgstr ""
+msgstr "Suljetut kampanjat"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 #: view:dm.campaign.proposition.segment:0
 msgid "Segment Origin"
-msgstr ""
+msgstr "Segmentinlähde"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_group_form
 #: model:ir.ui.menu,name:dm.menu_action_campaign_group_form
 msgid "All Campaign Groups"
-msgstr ""
+msgstr "Kaikki kampanjaryhmät"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_overlay
 msgid "dm.overlay"
-msgstr ""
+msgstr "dm.overlay"
 
 #. module: dm
 #: model:product.template,description:dm.product_product_papermailingus0_product_template
 msgid "Demo Paper Mailing for the US"
-msgstr ""
+msgstr "Paperin demolähetys US:lle"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.act_offer_opened
 msgid "Back To Offer"
-msgstr ""
+msgstr "Takaisin tarjoukseen"
 
 #. module: dm
 #: view:dm.customers_list:0
 msgid "Costs"
-msgstr ""
+msgstr "Kustannukset"
 
 #. module: dm
 #: model:dm.campaign.type,code:dm.dm_campaign_type_mixed
 msgid "mixed"
-msgstr ""
+msgstr "sekoitettu"
 
 #. module: dm
 #: field:dm.campaign.mail_service,offer_step_id:0
@@ -3892,53 +3942,53 @@ msgstr ""
 #: field:dm.offer.document,step_id:0
 #: view:dm.offer.step:0
 msgid "Offer Step"
-msgstr ""
+msgstr "Tarjousvaihe"
 
 #. module: dm
 #: field:dm.customer.order,user_id:0
 msgid "Salesman"
-msgstr ""
+msgstr "Myyjä"
 
 #. module: dm
 #: help:res.partner,decoy_external_ref:0
 msgid "The reference of the decoy address for the owner"
-msgstr ""
+msgstr "Viite houkutinosoitteen omistajalle"
 
 #. module: dm
 #: field:dm.customer.order,invoiced_rate:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Laskutettu"
 
 #. module: dm
 #: field:dm.offer,lang_orig:0
 msgid "Original Language"
-msgstr ""
+msgstr "Alkuperäinen kieli"
 
 #. module: dm
 #: model:product.template,name:dm.product_product_defaulttranslation0_product_template
 msgid "Default Translation"
-msgstr ""
+msgstr "Oletuskäännös"
 
 #. module: dm
 #: field:dm.campaign.proposition,keep_segments:0
 msgid "Keep Segments"
-msgstr ""
+msgstr "Pidä segmentit"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_categ_form
 #: model:ir.ui.menu,name:dm.menu_action_offer_categ_main_form
 msgid "Edit Categories"
-msgstr ""
+msgstr "Muokkaa kategorioita"
 
 #. module: dm
 #: field:dm.customers_list,broker_discount:0
 msgid "Broker Discount (%)"
-msgstr ""
+msgstr "Välittäjän alennus (%)"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 msgid "Items and Prices"
-msgstr ""
+msgstr "Tavarat ja Hinnat"
 
 #. module: dm
 #: selection:dm.customer.order,state:0
@@ -3947,71 +3997,71 @@ msgstr ""
 #: selection:dm.offer.step,state:0
 #: selection:dm.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
 
 #. module: dm
 #: field:dm.customer.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Veroton määrä"
 
 #. module: dm
 #: field:dm.customer.gender,from_gender:0
 msgid "From Gender"
-msgstr ""
+msgstr "Sukupuolesta"
 
 #. module: dm
 #: view:dm.plugins.value:0
 msgid "Plugins Values"
-msgstr ""
+msgstr "Liitännäisten arvot"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_form_my1
 #: model:ir.ui.menu,name:dm.menu_action_campaign_form_my1
 msgid "My Open Campaigns"
-msgstr ""
+msgstr "Omat avoimet kampanjat"
 
 #. module: dm
 #: view:dm.customers_list:0
 msgid "Customer Lists"
-msgstr ""
+msgstr "Asiakaslistat"
 
 #. module: dm
 #: field:dm.ddf.plugin,store_value:0
 msgid "Store Value"
-msgstr ""
+msgstr "Säilytysarvo"
 
 #. module: dm
 #: model:product.template,name:dm.product_product_ondemandbookstorefreetrial0_product_template
 msgid "OnDemand Bookstore Free Trial"
-msgstr ""
+msgstr "OnDemand kirjakaupan ilmainen kokeilu"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_form_all1
 #: model:ir.ui.menu,name:dm.menu_action_offer_form_all1
 msgid "Open Offers"
-msgstr ""
+msgstr "Avoimet tarjoukset"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Transition"
-msgstr ""
+msgstr "Siirtymä"
 
 #. module: dm
 #: field:dm.campaign.proposition,quantity_real:0
 #: field:dm.campaign.proposition.item,qty_real:0
 #: field:dm.campaign.proposition.segment,quantity_real:0
 msgid "Real Quantity"
-msgstr ""
+msgstr "Todellinen määrä"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_campaign_proposition_segment
 msgid "A subset of addresses coming from a customers file"
-msgstr ""
+msgstr "Osoitteiden osajoukko joka tulee asiakaskortistosta"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Create Campaign"
-msgstr ""
+msgstr "Luo kampanja"
 
 #. module: dm
 #: wizard_view:wizard_campaign_group,add:0
@@ -4019,12 +4069,12 @@ msgstr ""
 #: wizard_button:wizard_campaign_group,name_group,new:0
 #: wizard_view:wizard_campaign_group,new:0
 msgid "Create Group"
-msgstr ""
+msgstr "Luo ryhmä"
 
 #. module: dm
 #: field:dm.offer.step,interactive:0
 msgid "Interactive"
-msgstr ""
+msgstr "Vuorovaikutteinen"
 
 #. module: dm
 #: field:dm.offer,legal_state:0
@@ -4032,61 +4082,61 @@ msgstr ""
 #: rml:offer.model.report:0
 #: rml:offer.report:0
 msgid "Legal State"
-msgstr ""
+msgstr "Laillinen osio"
 
 #. module: dm
 #: selection:dm.offer,preoffer_type:0
 #: selection:dm.offer,type:0
 msgid "Rewrite"
-msgstr ""
+msgstr "Kirjoita uudelleen"
 
 #. module: dm
 #: model:ir.actions.wizard,name:dm.wizard_document_report
 msgid "Document Report"
-msgstr ""
+msgstr "Dokumettiraportti"
 
 #. module: dm
 #: view:dm.offer.step:0
 #: field:dm.offer.step,manufacturing_constraint_ids:0
 msgid "Mailing Manufacturing Products"
-msgstr ""
+msgstr "Postitusvalmistetut tuotteet"
 
 #. module: dm
 #: field:dm.campaign,manufacturing_product:0
 msgid "Manufacturing Product"
-msgstr ""
+msgstr "Tuotteen valmistus"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 msgid "Keep Prices at Duplication"
-msgstr ""
+msgstr "Pidä hinnat kahdennuksessa"
 
 #. module: dm
 #: field:dm.campaign.proposition.item,price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "Myyntihinta"
 
 #. module: dm
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Order Date :"
-msgstr ""
+msgstr "Tilauspäivämäärä :"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_dm_customers_list_type
 #: model:ir.ui.menu,name:dm.menu_action_dm_customers_list_type
 msgid "All Customers List Type"
-msgstr ""
+msgstr "Kaikki asiakaslista tyypit"
 
 #. module: dm
 #: view:dm.customer.segmentation:0
 msgid "Compute Sql Query"
-msgstr ""
+msgstr "Laske SQL -kysely"
 
 #. module: dm
 #: view:dm.campaign:0
 msgid "Items Procurement Tasks"
-msgstr ""
+msgstr "Tavaroiden hankintatehtävät"
 
 #. module: dm
 #: view:dm.campaign:0
@@ -4095,12 +4145,12 @@ msgstr ""
 #: view:dm.offer.step:0
 #: selection:dm.offer.step,state:0
 msgid "Close"
-msgstr ""
+msgstr "Sulje"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_offer_step_transition
 msgid "dm.offer.step.transition"
-msgstr ""
+msgstr "dm.offer.step.transition"
 
 #. module: dm
 #: field:dm.offer,quotation:0
@@ -4108,7 +4158,7 @@ msgstr ""
 #: rml:offer.model.report:0
 #: rml:offer.report:0
 msgid "Quotation"
-msgstr ""
+msgstr "Tarjous"
 
 #. module: dm
 #: help:dm.campaign.proposition,quantity_planned:0
@@ -4118,56 +4168,60 @@ msgid ""
 "you  will get after delivery, deduplication and cleaning\n"
 "This is usually the quantity used to order the manufacturing of the mailings"
 msgstr ""
+"Suunniteltu määrä on arvio kelvollisien osoitteiden määrästä jonka saat "
+"toimituksien, kahdennuksenpoiston ja puhdistamisen jälkeen\n"
+"Tätä määrää käytetään yleensä kun tilataan postituksia"
 
 #. module: dm
 #: view:dm.campaign:0
 #: view:dm.campaign.purchase_line:0
 msgid "Purchase Line Product"
-msgstr ""
+msgstr "Ostorivin tuote"
 
 #. module: dm
 #: selection:dm.campaign.purchase_line,state:0
 msgid "Delivered"
-msgstr ""
+msgstr "Toimitettu"
 
 #. module: dm
 #: view:dm.trademark:0
 msgid "Layout"
-msgstr ""
+msgstr "Asettelu"
 
 #. module: dm
 #: field:res.country,main_currency:0
 msgid "Main Currency"
-msgstr ""
+msgstr "Päävaluutta"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_proposition_segment_form
 #: model:ir.ui.menu,name:dm.menu_action_campaign_proposition_segment_form
 msgid "All Segments"
-msgstr ""
+msgstr "Kaikki segmentit"
 
 #. module: dm
 #: model:product.template,name:dm.product_product_defaultcustomerslist0_product_template
 msgid "Default Customers List"
-msgstr ""
+msgstr "Oletusasiakaslista"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_doc_categ_form
 #: model:ir.ui.menu,name:dm.menu_action_offer_doc_categ_form
 msgid "Edit DTP Documents Categories"
-msgstr ""
+msgstr "Muokkaa DTP -dokumenttien kategorioita"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 #: field:dm.campaign.proposition,item_ids:0
 msgid "Catalogue"
-msgstr ""
+msgstr "Luettelo"
 
 #. module: dm
 #: help:dm.campaign.proposition,sale_rate:0
 msgid ""
 "This is the planned sale rate (in percent) for this commercial proposition"
 msgstr ""
+"Tämä on suunniteltu myyntiaste (prosenteissa) tälle mainosehdotukselle"
 
 #. module: dm
 #: rml:dm.campaign.report:0
@@ -4175,59 +4229,59 @@ msgstr ""
 #: rml:offer.report:0
 #: rml:preoffer.report:0
 msgid "Name :"
-msgstr ""
+msgstr "Nimi :"
 
 #. module: dm
 #: selection:dm.offer,preoffer_type:0
 #: selection:dm.offer,type:0
 msgid "New"
-msgstr ""
+msgstr "Uusi"
 
 #. module: dm
 #: view:dm.order:0
 msgid "Scanned Data"
-msgstr ""
+msgstr "Skannattu tieto (data)"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 #: view:dm.campaign.proposition.segment:0
 msgid "- Deduplication"
-msgstr ""
+msgstr "- Kahdennuksenpoisto"
 
 #. module: dm
 #: model:product.template,name:dm.product_product_defaultpapermailing0_product_template
 msgid "Default Paper Mailing"
-msgstr ""
+msgstr "Oletus paperipostitus"
 
 #. module: dm
 #: model:dm.offer.step.type,name:dm.dm_offer_step_type_accompanyingletteroftheintermediatemailing0
 msgid "Accompanying Letter of the Intermediate Mailing"
-msgstr ""
+msgstr "Välityspostituksen mukana tuleva kirje"
 
 #. module: dm
 #: field:dm.customer.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Tilausrivit"
 
 #. module: dm
 #: view:dm.customer.order:0
 msgid "Customer Order"
-msgstr ""
+msgstr "Asiakastilaus"
 
 #. module: dm
 #: field:res.partner,decoy_for_campaign:0
 msgid "Used for Campaigns"
-msgstr ""
+msgstr "Käytetään kampanjoihin"
 
 #. module: dm
 #: rml:dm.campaign.report:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Aloituspäivämäärä"
 
 #. module: dm
 #: field:dm.order,customer_code:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Asiakaskoodi"
 
 #. module: dm
 #: field:dm.campaign.manufacturing_cost,name:0
@@ -4252,76 +4306,76 @@ msgstr ""
 #: field:dm.offer.step.type,description:0
 #: field:dm.plugin.argument,note:0
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 #. module: dm
 #: view:dm.customers_file:0
 msgid "Customer File"
-msgstr ""
+msgstr "Asiakaskortisto"
 
 #. module: dm
 #: view:dm.campaign.proposition:0
 #: view:dm.campaign.proposition.segment:0
 msgid "Quantities"
-msgstr ""
+msgstr "Määrät"
 
 #. module: dm
 #: field:res.partner,decoy_external_ref:0
 msgid "External Reference"
-msgstr ""
+msgstr "Ulkoinen viite"
 
 #. module: dm
 #: field:dm.campaign,mail_service_ids:0
 msgid "Mailing Service"
-msgstr ""
+msgstr "Postituspalvelu"
 
 #. module: dm
 #: field:dm.campaign.proposition,customer_pricelist_id:0
 msgid "Items Pricelist"
-msgstr ""
+msgstr "Tavaroiden hinnasto"
 
 #. module: dm
 #: field:dm.offer.step,dtp_category_ids:0
 msgid "DTP Categories"
-msgstr ""
+msgstr "DTP -kategoriat"
 
 #. module: dm
 #: model:dm.offer.step.type,code:dm.dm_offer_step_type_accompanyingletterofthestartingmailing0
 msgid "ALSM"
-msgstr ""
+msgstr "APMTK (aloituspostituksen mukana tuleva kirje)"
 
 #. module: dm
 #: field:dm.campaign.proposition,sale_rate:0
 msgid "Sale Rate (%)"
-msgstr ""
+msgstr "Myyntiaste (%)"
 
 #. module: dm
 #: field:dm.offer,preoffer_original_id:0
 msgid "Original Offer Idea"
-msgstr ""
+msgstr "Alkuperäinen tarjousidea"
 
 #. module: dm
 #: view:dm.campaign:0
 #: selection:dm.campaign.purchase_line,type:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Valmistava"
 
 #. module: dm
 #: view:dm.customer.segmentation:0
 msgid "Customer Date Criteria"
-msgstr ""
+msgstr "Asiakaspäivämäärän kriteria"
 
 #. module: dm
 #: view:dm.media:0
 #: model:ir.actions.act_window,name:dm.action_dm_media_form
 #: model:ir.ui.menu,name:dm.menu_action_dm_media_form
 msgid "All Offer Medias"
-msgstr ""
+msgstr "Kaikki tarjousmediat"
 
 #. module: dm
 #: model:ir.model,name:dm.model_dm_customers_list_recruit_origin
 msgid "The origin of the adresses of a list"
-msgstr ""
+msgstr "Listan osoitteiden alkuperä"
 
 #. module: dm
 #: field:dm.customer.order,customer_id:0
@@ -4329,24 +4383,24 @@ msgstr ""
 #: selection:dm.ddf.plugin,type:0
 #: view:res.partner:0
 msgid "Customer"
-msgstr ""
+msgstr "Asiakas"
 
 #. module: dm
 #: selection:dm.mail_service,unit_interval:0
 #: selection:dm.offer.step.transition,delay_type:0
 msgid "Months"
-msgstr ""
+msgstr "Kuukaudet"
 
 #. module: dm
 #: selection:dm.customer.numeric_criteria,operator:0
 #: selection:dm.customer.order.numeric_criteria,operator:0
 msgid "smaller then"
-msgstr ""
+msgstr "pienempi kuin"
 
 #. module: dm
 #: field:dm.mail_service,action_interval:0
 msgid "Action Interval"
-msgstr ""
+msgstr "Toiminnon intervalli"
 
 #. module: dm
 #: field:dm.campaign,country_id:0
@@ -4354,62 +4408,62 @@ msgstr ""
 #: field:dm.order,country:0
 #: field:dm.overlay,country_ids:0
 msgid "Country"
-msgstr ""
+msgstr "Valtio"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_offer_form_my3
 #: model:ir.ui.menu,name:dm.menu_action_offer_form_my3
 msgid "My Closed Offers"
-msgstr ""
+msgstr "Omat suljetut tarjoukset"
 
 #. module: dm
 #: view:dm.customers_list:0
 msgid "Customer List"
-msgstr ""
+msgstr "Asiakaslista"
 
 #. module: dm
 #: field:dm.customer.segmentation,order_boolean_criteria_ids:0
 msgid "Customers Order Boolean Criteria"
-msgstr ""
+msgstr "Asiakastilauksien totuuskriteria"
 
 #. module: dm
 #: view:res.partner:0
 msgid "Decoy address for Media"
-msgstr ""
+msgstr "Median houkutinosoite"
 
 #. module: dm
 #: field:dm.customer.segmentation,customer_date_criteria_ids:0
 msgid "Customers Date Criteria"
-msgstr ""
+msgstr "Asiakkaiden päivämääräkriteria"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Production Advices"
-msgstr ""
+msgstr "Tuotanto-ohjeet"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_form_all2
 #: model:ir.ui.menu,name:dm.menu_action_campaign_form_all2
 msgid "Draft Campaigns"
-msgstr ""
+msgstr "Luonnostele kampanjat"
 
 #. module: dm
 #: field:dm.offer.document,document_template_plugin_ids:0
 msgid "Dynamic Plugins"
-msgstr ""
+msgstr "Dynaamiset liitännäiset"
 
 #. module: dm
 #: field:dm.customer.segmentation,order_date_criteria_ids:0
 msgid "Customers Order Date Criteria"
-msgstr ""
+msgstr "Asiakastilauksien päivämääräkriteria"
 
 #. module: dm
 #: model:ir.actions.act_window,name:dm.action_campaign_duplicator_form
 #: model:ir.ui.menu,name:dm.menu_action_campaign_duplicator_form
 msgid "All Deduplicator"
-msgstr ""
+msgstr "Kaikki kahdennuksenpoistajat"
 
 #. module: dm
 #: view:dm.offer.step:0
 msgid "Offer Step Description"
-msgstr ""
+msgstr "Tarjousvaiheen kuvaus"
diff --git a/addons/bin/addons/base/i18n/sk.po b/addons/bin/addons/base/i18n/sk.po
index 33592b8d566..e80a3ff3cfd 100644
--- a/addons/bin/addons/base/i18n/sk.po
+++ b/addons/bin/addons/base/i18n/sk.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: 2009-11-23 21:23+0000\n"
+"PO-Revision-Date: 2009-11-24 08:31+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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: 2009-11-24 04:39+0000\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -321,7 +321,7 @@ msgstr ""
 #: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
 #, python-format
 msgid "No payment mode or payment type code invalid."
-msgstr ""
+msgstr "Nplatný režim platby alebo kód platby."
 
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
@@ -336,42 +336,43 @@ msgstr ""
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
-msgstr ""
+msgstr "Dátum aktualizácie"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
-msgstr ""
+msgstr "Zdroj objektu"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: view:ir.actions.todo:0
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 msgid "Config Wizard Steps"
-msgstr ""
+msgstr "Nastavenie krokov sprievodcu"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
 msgid "ir.ui.view_sc"
-msgstr ""
+msgstr "ir.ui.view_sc"
 
 #. module: base
 #: field:ir.model.access,group_id:0
 #: field:ir.rule,rule_group:0
 msgid "Group"
-msgstr ""
+msgstr "Skupina"
 
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "To browse official translations, you can visit this link: "
 msgstr ""
+"Ak si chcete prezrieť oficiálne preklady, môžete navštíviť tento odkaz: "
 
 #. module: base
 #: field:ir.exports.line,name:0
 #: field:ir.translation,name:0
 #: field:res.partner.bank.type.field,name:0
 msgid "Field Name"
-msgstr ""
+msgstr "Názov poľa"
 
 #. module: base
 #: code:addons/addons/purchase/purchase.py:0
@@ -394,7 +395,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.open_module_tree_uninstall
 #: model:ir.ui.menu,name:base.menu_module_tree_uninstall
 msgid "Uninstalled modules"
-msgstr ""
+msgstr "Nenainštalované moduly"
 
 #. module: base
 #: code:addons/addons/product/pricelist.py:0
@@ -409,7 +410,7 @@ msgstr ""
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
-msgstr ""
+msgstr "Vyberte typ akcie"
 
 #. module: base
 #: code:addons/addons/mrp_operations/mrp_operations.py:0
@@ -420,41 +421,41 @@ msgstr ""
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Configure"
-msgstr ""
+msgstr "Nastaviť"
 
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. module: base
 #: selection:ir.model,state:0
 #: selection:ir.model.grid,state:0
 msgid "Custom Object"
-msgstr ""
+msgstr "Vlastný objekt"
 
 #. module: base
 #: code:addons/addons/hr_timesheet/report/user_timesheet.py:0
 #: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
 #, python-format
 msgid "June"
-msgstr ""
+msgstr "Jún"
 
 #. module: base
 #: field:res.lang,date_format:0
 msgid "Date Format"
-msgstr ""
+msgstr "Formát dátumu"
 
 #. module: base
 #: 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
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Holandské Antily"
 
 #. module: base
 #: code:addons/addons/mrp/report/price.py:0
@@ -484,7 +485,7 @@ msgstr ""
 #: code:addons/addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Feed back About Workflow of Module"
-msgstr ""
+msgstr "Spätná väzba o Workflow modulu"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
@@ -497,33 +498,33 @@ msgstr ""
 #: code:addons/osv/orm.py:0
 #, python-format
 msgid "The read method is not implemented on this object !"
-msgstr ""
+msgstr "Metóda nie je implementovaná na tento objekt!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_MEDIA_REWIND"
-msgstr ""
+msgstr "STOCK_MEDIA_REWIND"
 
 #. module: base
 #: field:ir.actions.todo,note:0
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #. module: base
 #: code:addons/addons/mrp/report/price.py:0
 #, python-format
 msgid "Product Quantity"
-msgstr ""
+msgstr "Množstvo produktu"
 
 #. module: base
 #: field:res.country,name:0
 msgid "Country Name"
-msgstr ""
+msgstr "Názov krajiny"
 
 #. module: base
 #: model:res.country,name:base.co
 msgid "Colombia"
-msgstr ""
+msgstr "Kolumbia"
 
 #. module: base
 #: view:ir.module.module:0
@@ -548,7 +549,7 @@ msgstr ""
 #: code:addons/osv/orm.py:0
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr ""
+msgstr "Kľúč / hodnota '%s' nebola nájdená vo výbere poľa '%s'"
 
 #. module: base
 #: code:addons/addons/crm_configuration/wizard/wizard_opportunity_set.py:0
@@ -564,16 +565,18 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
+"ISO kód krajiny v dvoch znakoch.\n"
+"Môžete použiť toto pole pre rýchle vyhľadávanie."
 
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. module: base
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Predaj a nákup"
 
 #. module: base
 #: code:addons/addons/l10n_be/wizard/partner_vat_listing.py:0
@@ -585,30 +588,30 @@ msgstr ""
 #: view:ir.actions.wizard:0
 #: field:wizard.ir.model.menu.create.line,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Sprievodca"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CUT"
-msgstr ""
+msgstr "STOCK_CUT"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_wizard
 #: view:ir.actions.wizard:0
 #: model:ir.ui.menu,name:base.menu_ir_action_wizard
 msgid "Wizards"
-msgstr ""
+msgstr "Sprievodcovia"
 
 #. module: base
 #: selection:res.config.view,view:0
 msgid "Extended Interface"
-msgstr ""
+msgstr "Interfejs rozšírenia"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr ""
+msgstr "Vlastné pole musí mať názov, ktoré začína 'x_'!"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -629,13 +632,13 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Model Description"
-msgstr ""
+msgstr "Popis modelu"
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
 #, python-format
 msgid "You need to choose a model"
-msgstr ""
+msgstr "Musíte zvoliť model"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -645,24 +648,24 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
-msgstr ""
+msgstr "Jordánsko"
 
 #. module: base
 #: code:addons/addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "Tag Name"
-msgstr ""
+msgstr "Názov tagu"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the model '%s' !"
-msgstr ""
+msgstr "Nemôžete odstrániť model '%s' !"
 
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #. module: base
 #: view:res.config.view:0
@@ -672,12 +675,12 @@ msgstr ""
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Bulgarian / български"
-msgstr ""
+msgstr "Bulgarian / български"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
 msgid "ir.actions.actions"
-msgstr ""
+msgstr "ir.actions.actions"
 
 #. module: base
 #: code:addons/addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -695,7 +698,7 @@ msgstr ""
 #: code:addons/addons/l10n_ch/wizard/bvr_import.py:0
 #, python-format
 msgid "Too much total record found!"
-msgstr ""
+msgstr "Nájdených príliš veľa záznamov!"
 
 #. module: base
 #: code:addons/addons/account_budget/crossovered_budget.py:0
@@ -706,45 +709,45 @@ msgstr ""
 #. module: base
 #: selection:ir.report.custom,type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "Stĺpcový graf"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIALOG_ERROR"
-msgstr ""
+msgstr "STOCK_DIALOG_ERROR"
 
 #. module: base
 #: code:addons/addons/stock/wizard/wizard_invoice_onshipping.py:0
 #, python-format
 msgid "Invoice is not created"
-msgstr ""
+msgstr "Faktúra nie je vytvorená"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_INDEX"
-msgstr ""
+msgstr "STOCK_INDEX"
 
 #. module: base
 #: code:addons/addons/base_module_quality/pylint_test/pylint_test.py:0
 #: code:addons/addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "Názov súboru"
 
 #. module: base
 #: model:res.country,name:base.rs
 msgid "Serbia"
-msgstr ""
+msgstr "Srbsko"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard View"
-msgstr ""
+msgstr "Zobrazenie sprievodcu"
 
 #. module: base
 #: model:res.country,name:base.kh
 msgid "Cambodia, Kingdom of"
-msgstr ""
+msgstr "Kambodža, kráľovstvo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -774,44 +777,44 @@ msgstr ""
 #: code:addons/addons/document_ics/document.py:0
 #, python-format
 msgid "You can not set negative Duration."
-msgstr ""
+msgstr "Nemôžete nastaviť negatívne trvanie."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DIALOG_QUESTION"
-msgstr ""
+msgstr "STOCK_DIALOG_QUESTION"
 
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Papua Nová Guinea"
 
 #. module: base
 #: code:addons/addons/odms/wizard/host_status.py:0
 #, python-format
 msgid "Created by the synchronization wizard"
-msgstr ""
+msgstr "Vytvorenie synchronizácie sprievodcom"
 
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
 msgid "SAJ"
-msgstr ""
+msgstr "SAJ"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "Základný partner"
 
 #. module: base
 #: rml:ir.module.reference:0
 msgid ","
-msgstr ""
+msgstr ","
 
 #. module: base
 #: model:res.country,name:base.es
 msgid "Spain"
-msgstr ""
+msgstr "Španielsko"
 
 #. module: base
 #: wizard_view:module.upgrade,end:0
@@ -828,92 +831,92 @@ msgstr ""
 #. module: base
 #: field:res.partner.address,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: base
 #: model:res.country,name:base.om
 msgid "Oman"
-msgstr ""
+msgstr "Omán"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_payterm_form
 #: model:ir.model,name:base.model_res_payterm
 msgid "Payment term"
-msgstr ""
+msgstr "Platobné obdobie"
 
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
-msgstr ""
+msgstr "Niue"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Work Days"
-msgstr ""
+msgstr "Pracovné dni"
 
 #. 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 "Toto pole sa nepoužíva, iba vám pomôže vybrať správne kroky."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
 #: view:wizard.ir.model.menu.create:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Vytvorenie menu"
 
 #. module: base
 #: model:res.country,name:base.in
 msgid "India"
-msgstr ""
+msgstr "India"
 
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract_module
 msgid "maintenance contract modules"
-msgstr ""
+msgstr "moduly servisnej zmluvy"
 
 #. module: base
 #: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "Nie je efektívne"
 
 #. module: base
 #: code:addons/addons/mrp/report/price.py:0
 #, python-format
 msgid "TOTAL"
-msgstr ""
+msgstr "SPOLU"
 
 #. module: base
 #: view:ir.values:0
 msgid "client_action_multi, client_action_relate"
-msgstr ""
+msgstr "client_action_multi, client_action_relate"
 
 #. module: base
 #: model:res.country,name:base.ad
 msgid "Andorra, Principality of"
-msgstr ""
+msgstr "Andorra, kniežatstvo"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Podkategórie"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
 msgid "TGZ Archive"
-msgstr ""
+msgstr "TGZ Archív"
 
 #. 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 - Plný názov mesiaca."
 
 #. module: base
 #: field:ir.actions.report.xml,report_type:0
@@ -923,34 +926,34 @@ msgstr ""
 #: field:ir.values,key:0
 #: view:res.partner:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: base
 #: code:addons/addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "A model having this name and code already exists !"
-msgstr ""
+msgstr "Model už má tento názov a kód už existuje!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_FILE"
-msgstr ""
+msgstr "STOCK_FILE"
 
 #. module: base
 #: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "Nedostatok dát"
 
 #. module: base
 #: field:ir.report.custom.fields,field_child2:0
 msgid "Field child2"
-msgstr ""
+msgstr "Odvodené pole2"
 
 #. 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
@@ -960,12 +963,12 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_GO_DOWN"
-msgstr ""
+msgstr "STOCK_GO_DOWN"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_OK"
-msgstr ""
+msgstr "STOCK_OK"
 
 #. module: base
 #: code:addons/addons/l10n_ch/wizard/bvr_import.py:0
@@ -978,7 +981,7 @@ msgstr ""
 #, python-format
 msgid ""
 "You have to define a Default Credit Account for your Financial Journals!\n"
-msgstr ""
+msgstr "Musíte definovať predvolený účet pre váš finančný denník!\n"
 
 #. module: base
 #: field:ir.actions.act_window.view,act_window_id:0
@@ -988,7 +991,7 @@ msgstr ""
 #: field:ir.values,action_id:0
 #: selection:ir.values,key:0
 msgid "Action"
-msgstr ""
+msgstr "Akcia"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -999,19 +1002,19 @@ msgstr ""
 #. module: base
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neplatný XML pre zobrazenie architektúry!"
 
 #. module: base
 #: code:addons/addons/account_analytic_analysis/account_analytic_analysis.py:0
 #: code:addons/osv/orm.py:0
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
-msgstr ""
+msgstr "Pokúsite sa obísť pravidlá prístupu (Document type: %s)."
 
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Kajmanské Ostrovy"
 
 #. module: base
 #: code:addons/report/custom.py:0
@@ -1053,7 +1056,7 @@ msgstr ""
 #: code:addons/addons/hr_timesheet/report/users_timesheet.py:0
 #, python-format
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -1063,12 +1066,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ug
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
-msgstr ""
+msgstr "Nigéria"
 
 #. module: base
 #: code:addons/addons/account/account_move_line.py:0
@@ -1081,17 +1084,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
-msgstr ""
+msgstr "Bosna a Hercegovina"
 
 #. module: base
 #: field:ir.report.custom.fields,alignment:0
 msgid "Alignment"
-msgstr ""
+msgstr "Zarovnanie"
 
 #. module: base
 #: selection:ir.rule,operator:0
 msgid ">="
-msgstr ""
+msgstr ">="
 
 #. module: base
 #: code:addons/addons/account_followup/wizard/wizard_followup_print.py:0
@@ -1125,12 +1128,12 @@ msgstr ""
 #: field:ir.module.module,website:0
 #: field:res.partner,website:0
 msgid "Website"
-msgstr ""
+msgstr "Webová stránka"
 
 #. module: base
 #: field:ir.rule.group,rules:0
 msgid "Tests"
-msgstr ""
+msgstr "Testy"
 
 #. module: base
 #: view:ir.module.repository:0
diff --git a/addons/debian/po/cs.po b/addons/debian/po/cs.po
new file mode 100644
index 00000000000..fc41cc6ce30
--- /dev/null
+++ b/addons/debian/po/cs.po
@@ -0,0 +1,41 @@
+# Czech translation of openerp-server debconf templates.
+# Copyright (C) 2009 Vítězslav Kotrla <vitezslav.kotrla@gmail.com>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 11:37+0000\n"
+"Last-Translator: Vitezslav Kotrla <Unknown>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Vyhrazený systémový účet, pod kterým bude běžet Open ERP server:"
+
+#. 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 ""
+"Pokud by byl Open ERP server spuštěn se superuživatelskými oprávněními, "
+"mohlo by dojít ke kompromitaci zabezpečení systému. Proto musí Open ERP "
+"server pro svoji činnost používat vyhrazený neprivilegovaný účet."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Zvolte prosím název totoho účtu."
diff --git a/addons/debian/po/de.po b/addons/debian/po/de.po
new file mode 100644
index 00000000000..dcd3c2212c8
--- /dev/null
+++ b/addons/debian/po/de.po
@@ -0,0 +1,42 @@
+# German translation of openerp-server debconf templates.
+# Copyright (C) 2009 Kai Wasserbäch <debian@carbon-project.org>
+# Copyright (C) 2009 Helge Kreutzmann <debian@helgefjell.de>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server 5.0.1-0-2\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 11:48+0000\n"
+"Last-Translator: Helge Kreutzmann <Unknown>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Eigenes Systemkonto für den Open ERP-Server:"
+
+#. 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 ""
+"Der Open ERP-Server muss ein eigenes Konto für den Betrieb verwenden, um die "
+"Sicherheit des Systems nicht durch das Betreiben mit Superuser-Rechten zu "
+"kompromittieren."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Bitte wählen Sie den Benutzernamen dieses Kontos."
diff --git a/addons/debian/po/es.po b/addons/debian/po/es.po
new file mode 100644
index 00000000000..a4aea848870
--- /dev/null
+++ b/addons/debian/po/es.po
@@ -0,0 +1,42 @@
+# Spanish translation of openerp-server debconf templates.
+# Copyright (C) 2009 Software in the Public Interest
+# 2009 Fernando González de Requena <fgrequena@gmail.com>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server 5.0.1-0-2\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:21+0000\n"
+"Last-Translator: Fernando González de Requena <Unknown>\n"
+"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Cuenta del sistema dedicada para el servidor 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 ""
+"El servidor de Open ERP debe utilizar una cuenta dedicada para su "
+"funcionamiento, de tal modo que la seguridad del sistema no se vea "
+"comprometida por su utilización con privilegios de administración."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Elija un nombre de usuario para esa cuenta."
diff --git a/addons/debian/po/fi.po b/addons/debian/po/fi.po
new file mode 100644
index 00000000000..75e9027ee24
--- /dev/null
+++ b/addons/debian/po/fi.po
@@ -0,0 +1,41 @@
+# Finnish translation of openerp-server debconf templates.
+# Copyright (C) 2009 Esko Arajärvi
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:22+0000\n"
+"Last-Translator: Esko Arajärvi <Unknown>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Dedikoitu järjestelmätunnus Open ERP-taustaohjelman ajamiseen:"
+
+#. 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-palvelimen tulee käyttää dedikoitua tunnusta toiminnoissaan, jotta "
+"järjestelmän turvallisuus ei vaarannu kuten käytettäessä "
+"pääkäyttäjäoikeuksia."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Valitse kyseisen tunnuksen nimi."
diff --git a/addons/debian/po/fr.po b/addons/debian/po/fr.po
new file mode 100644
index 00000000000..240c19b6bbe
--- /dev/null
+++ b/addons/debian/po/fr.po
@@ -0,0 +1,41 @@
+# French translation of openerp-server debconf templates.
+# Copyright (C) 2009 Steve Petruzzello <dlist@bluewin.ch>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 5.0.1-0-2\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:24+0000\n"
+"Last-Translator: Steve Petruzzello <Unknown>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Identifiant dédié pour le serveur 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 ""
+"Le serveur Open ERP doit être exécuté avec un identifiant spécifique, "
+"différent du superutilisateur, afin de ne pas compromettre la sécurité du "
+"système."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Veuillez choisir cet identifiant."
diff --git a/addons/debian/po/gl.po b/addons/debian/po/gl.po
new file mode 100644
index 00000000000..c70fb11d5f8
--- /dev/null
+++ b/addons/debian/po/gl.po
@@ -0,0 +1,41 @@
+# Galizian translation of openerp-server debconf templates.
+# Copyright (C) 2009 Marce Villarino <mvillarino@gmail.com>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:29+0000\n"
+"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
+"Language-Team: Galician <proxecto@trasno.ent>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Conta de usuario do sistema adicada ao servidor 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 ""
+"O servidor Open ERP debe empregar unha conta adicada a el para que a "
+"seguridade do sistema non se poña en perigo ao executalo con privilexios de "
+"administrador."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Escolla o nome de usuario desa conta."
diff --git a/addons/debian/po/it.po b/addons/debian/po/it.po
new file mode 100644
index 00000000000..89970946ea1
--- /dev/null
+++ b/addons/debian/po/it.po
@@ -0,0 +1,41 @@
+# Italian translation of openerp-server debconf templates.
+# Copyright (C) 2009 Vincenzo Campanella <vinz65@gmail.com>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server 5.0.1-0-2\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:39+0000\n"
+"Last-Translator: vinz65 <vinz65@gmail.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Account di sistema dedicato per il server di 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 ""
+"Il server Open ERP deve utilizzare un account dedicato per eseguire le "
+"proprie operazioni, in modo che la sicurezza del sistema non rischi di "
+"essere compromessa eseguendolo con privilegi di superutente."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Scegliere il nome utente di tale account."
diff --git a/addons/debian/po/ja.po b/addons/debian/po/ja.po
new file mode 100644
index 00000000000..55868308269
--- /dev/null
+++ b/addons/debian/po/ja.po
@@ -0,0 +1,39 @@
+# Japanese translation of openerp-server debconf templates.
+# Copyright (C) 2009 Hideki Yamane <henrich@debian.or.jp>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server 5.0.1-0-2\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:46+0000\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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/addons/debian/po/pt.po b/addons/debian/po/pt.po
new file mode 100644
index 00000000000..806788fbcb0
--- /dev/null
+++ b/addons/debian/po/pt.po
@@ -0,0 +1,41 @@
+# Portuguese translation of openerp-server debconf templates.
+# Copyright (C) 2009 Américo Monteiro <a_monteiro@netcabo.pt>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server 5.0.1-0-2\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:56+0000\n"
+"Last-Translator: Américo Monteiro <Unknown>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 "Conta dedicada do sistema para o servidor 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 ""
+"O servidor Open ERP tem que usar uma conta dedicada para as suas operações, "
+"isto para que a segurança do sistema não seja comprometida ao corrê-lo com "
+"privilégios de superutilizador."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Por favor escolha o nome dessa conta."
diff --git a/addons/debian/po/ru.po b/addons/debian/po/ru.po
new file mode 100644
index 00000000000..044e054f00b
--- /dev/null
+++ b/addons/debian/po/ru.po
@@ -0,0 +1,42 @@
+# German translation of openerp-server debconf templates.
+# Copyright (C) 2009 Sergey Alyoshin <alyoshin.s@gmail.com>
+# Copyright (C) 2009 Yuri Kozlov <yuray@komyakino.ru>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server 5.0.1-0-2\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 13:01+0000\n"
+"Last-Translator: Yuri Kozlov <Unknown>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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/addons/debian/po/sk.po b/addons/debian/po/sk.po
new file mode 100644
index 00000000000..87e4b9bf830
--- /dev/null
+++ b/addons/debian/po/sk.po
@@ -0,0 +1,39 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 12:00+0000\n"
+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"Language-Team: Slovak <sk@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: 2009-11-25 04:48+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 "Dedikovaný systém, účet pre server 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 ""
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr ""
diff --git a/addons/debian/po/sv.po b/addons/debian/po/sv.po
new file mode 100644
index 00000000000..fe0cd0e6bf0
--- /dev/null
+++ b/addons/debian/po/sv.po
@@ -0,0 +1,41 @@
+# Swedish translation of openerp-server debconf templates.
+# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server\n"
+"Report-Msgid-Bugs-To: openerp-serverpackages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 13:03+0000\n"
+"Last-Translator: brother <martin@bagge.nu>\n"
+"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Language: Swedish\n"
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Dedicated system account for the Open ERP server:"
+msgstr "Dedikerat systemkonto för Open ERP server:"
+
+#. 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 servern måste ha ett dedikerat konto för att fungera på ett säkert "
+"sätt, att använda privilegier från en superanvändare är inte säkert."
+
+#. Type: string
+#. Description
+#: ../openerp-server.templates:1001
+msgid "Please choose that account's username."
+msgstr "Ange kontots användarnamn."
diff --git a/addons/debian/po/zh_CN.po b/addons/debian/po/zh_CN.po
new file mode 100644
index 00000000000..97799570ac0
--- /dev/null
+++ b/addons/debian/po/zh_CN.po
@@ -0,0 +1,38 @@
+# Simplified Chinese translation of openerp-server debconf templates.
+# Copyright (C) 2009 Deng Xiyue <manphiz-guest@users.alioth.debian.org>
+# This file is distributed under the same license as the openerp-server package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-server\n"
+"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
+"POT-Creation-Date: 2009-08-24 22:41+0300\n"
+"PO-Revision-Date: 2009-11-24 13:10+0000\n"
+"Last-Translator: Deng Xiyue <Unknown>\n"
+"Language-Team: Debian Chinese GB <debian-chinese-gb@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index c3f4bc57c6b..ed81d7c6167 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.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-11-17 07:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-24 11:51+0000\n"
+"Last-Translator: Miran Gombač <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: 2009-11-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -41,7 +41,7 @@ msgstr "Cilj"
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
 msgid "Delivery by Poste"
-msgstr ""
+msgstr "Dostava po pošti"
 
 #. module: delivery
 #: constraint:ir.ui.view:0
@@ -51,7 +51,7 @@ msgstr "Neveljaven XML za arhitekturo pogleda."
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Napaka! Ni mogoče rekurzivno kreirati pridruženih članov"
 
 #. module: delivery
 #: field:delivery.grid,state_ids:0
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
new file mode 100644
index 00000000000..6bc7f6e5cf0
--- /dev/null
+++ b/addons/event/i18n/fi.po
@@ -0,0 +1,645 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+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: 2009-11-24 09:58+0000\n"
+"Last-Translator: NightSpirit <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:report.event.registration,date_end:0
+msgid "Ending date"
+msgstr "Lopetuspäivämäärä"
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr "Pienin rekisteröintimäärä"
+
+#. module: event
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "Rekisteröinti sähköposti"
+
+#. module: event
+#: model:crm.case.section,name:event.event_0_crm_case_section
+msgid "Concert of Bon Jovi"
+msgstr "Bon Jovin konsertti"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "Vahvistus sähköposti"
+
+#. module: event
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive sections."
+msgstr "Virhe ! Et voi luoda päällekkäisiä osioita."
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration
+msgid "Event Registration"
+msgstr "Tapahtuman rekisteröinti"
+
+#. module: event
+#: model:ir.actions.wizard,name:event.event_reg_invoice
+msgid "Make Invoice"
+msgstr "Luo lasku"
+
+#. module: event
+#: field:report.event.type.registration,draft_state:0
+msgid "Draft Registrations"
+msgstr "Luonnostele rekisteröinnit"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr "Rekisteröinnin tapahtuma"
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,end:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr "Postita automaattinen vahvistus"
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr "Pääsylippu Oopperaan"
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rejected:0
+msgid "Invoice Rejected"
+msgstr "Hylätty lasku"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirm Event"
+msgstr "Vahvista tapahtuma"
+
+#. module: event
+#: model:crm.case.section,name:event.event_1_crm_case_section
+msgid "Opera of Verdi"
+msgstr "Verdin ooppera"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid "Draft Registration"
+msgstr "Luonnestele rekisteröinti"
+
+#. module: event
+#: wizard_view:event.reg_make_invoice,init:0
+msgid "Create Invoices"
+msgstr "Luo laskuja"
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+"    This module allow you\n"
+"        * to manage your events and their registrations\n"
+"        * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+"        * ...\n"
+"\n"
+"    Note that:\n"
+"    - You can define new types of events in\n"
+"                Events / Configuration / Types of Events\n"
+"    - You can access predefined reports about number of registration per "
+"event or per event category in :\n"
+"                Events / Reporting\n"
+msgstr ""
+"Tapahtumien organisaatio ja hallinta.\n"
+"\n"
+"    Tämä moduuli sallii sinun\n"
+"        * hallinnoimaan tapahtumia ja niiden rekisteröintejä\n"
+"        * käyttämään sähköpostia automaattisiin vahvistuksiin ja lähettämään "
+"vastauksia kaikkiin tapahtuman rekisteröinteihin\n"
+"        * ...\n"
+"\n"
+"    Huomaa että:\n"
+"    - Voit määrittää uusia tapahtumatyyppejä seuraavissa paikoissa\n"
+"                Tapahtumat / Asetukset / Tapahtumien tyypit\n"
+"    - Pääset katsomaan esimääritettyjä raportteja rekisteröinneistä per "
+"tapahtuma tai per tapahtumakategoria :\n"
+"                Tapahtumat / Raportointi\n"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "Lisätiedot"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration"
+msgstr "Rekisteröinti"
+
+#. module: event
+#: field:event.type,name:0
+#: model:ir.model,name:event.model_event_type
+msgid "Event type"
+msgstr "Tapahtumatyyppi"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:report.event.registration,name:0
+msgid "Event"
+msgstr "Tapahtuma"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "Registration Confirmation"
+msgstr "Rekisteröinnin vahvistus"
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Päivämäärät"
+
+#. module: event
+#: field:event.event,register_current:0
+#: model:ir.actions.act_window,name:event.action_registration_confirm
+#: model:ir.ui.menu,name:event.menu_action_registration_confirm
+msgid "Confirmed Registrations"
+msgstr "Vahvistetut rekisteröinnit"
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr "Postita automaattinen rekisteröinti"
+
+#. module: event
+#: view:event.registration:0
+msgid "Badge"
+msgstr "Kulkukortti"
+
+#. module: event
+#: field:event.event,section_id:0
+msgid "Case section"
+msgstr "Tapahtumaosio"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr "Valmis laskutettavaksi"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_event
+msgid "All Events"
+msgstr "Kaikki tapahtumat"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_report_event
+msgid "Reporting"
+msgstr "Raportointi"
+
+#. module: event
+#: view:event.registration:0
+msgid "Cancel Registration"
+msgstr "Peruuta rekisteröinti"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_event_categories
+msgid "Events by Categories"
+msgstr "Tapahtumat kategorioittain"
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "The event limit is reached. What do you want to do?"
+msgstr "Tapahtuman raja on saavutettu. Mitä haluat tehdä?"
+
+#. module: event
+#: field:report.event.type.registration,confirm_state:0
+msgid "Confirm Registrations"
+msgstr "Vahvista rekisteröinnit"
+
+#. module: event
+#: view:event.registration:0
+msgid "References"
+msgstr "Viitteet"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type_registration
+#: model:ir.ui.menu,name:event.menu_report_event_type_registration
+#: view:report.event.type.registration:0
+msgid "Registration By Event Types"
+msgstr "Rekisteröinnit tapahtumatyyppien mukaan"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_config
+msgid "Configuration"
+msgstr "Konfiguraatio"
+
+#. module: event
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Virheellinen XML näkymäarkkitehtuurille!"
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,confirm:0
+msgid "Confirm Anyway"
+msgstr "Vahvista jokatapauksessa"
+
+#. module: event
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Virhe: Myyntiyksikkö täytyy olla eri kategoriassa kuin mittayksikkö"
+
+#. module: event
+#: view:event.event:0
+msgid "Parent Category"
+msgstr "Yläkategoria"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration Invoiced"
+msgstr "Laskutettu rekisteröinti"
+
+#. module: event
+#: field:report.event.type.registration,nbevent:0
+msgid "Number Of Events"
+msgstr "Tapahtumien lukumäärä"
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr "Peruuta tapahtuma"
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
+msgid "Error Messages"
+msgstr "Virheilmoitukset"
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr "Postitus"
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr "Pääsylippu konserttiin"
+
+#. module: event
+#: field:event.event,register_prospect:0
+#: model:ir.actions.act_window,name:event.action_registration_draft
+#: model:ir.ui.menu,name:event.menu_action_registration_draft
+msgid "Unconfirmed Registrations"
+msgstr "Vahvistamattomat rekisteröinnit"
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr "Kumppani laskutettu"
+
+#. module: event
+#: view:event.registration:0
+msgid "Communication history"
+msgstr "Kommunikointihistoria"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr "Tapahtuma valmis"
+
+#. module: event
+#: field:event.registration,badge_name:0
+msgid "Badge Name"
+msgstr "Kulkuluvan nimi"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+msgid "Events On Registrations"
+msgstr "Rekisteröinnin tapahtumat"
+
+#. module: event
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Virhe: Oletusmittayksikkö ja ostojen mittayksikkö on oltava samassa "
+"kategoriassa."
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_created:0
+msgid "Invoice Created"
+msgstr "Lasku luotu"
+
+#. module: event
+#: view:event.event:0
+msgid "Statistics"
+msgstr "Tilastotiedot"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: event
+#: view:event.event:0
+msgid "Event description"
+msgstr "Tapahtuman kuvaus"
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_type_registration
+msgid "Event type on registration"
+msgstr "Tapahtumatyyppi rekisteröinnissä"
+
+#. module: event
+#: constraint:ir.model:0
+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: event
+#: field:event.registration,event_id:0
+msgid "Event Related"
+msgstr "Liittyvä tapahtuma"
+
+#. module: event
+#: model:crm.case.section,name:event.case_section_event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+msgid "Events"
+msgstr "Tapahtumat"
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr "Rekisteröintien määrä"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+msgid "Status"
+msgstr "Tila"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_categories
+msgid "Events by section"
+msgstr "Tapahtumat osioittain"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_registration
+msgid "All Registrations"
+msgstr "Kaikki rekisteröinnit"
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+"Merkitse tämä laatikko jos haluat käyttää automaattista postitusta uuteen "
+"rekisteröintiin"
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr "Aseta luonnokseksi"
+
+#. module: event
+#: view:event.registration:0
+#: model:ir.actions.wizard,name:event.event_confirm_registration
+#: field:report.event.registration,confirm_state:0
+msgid "Confirm Registration"
+msgstr "Vahvista rekisteröinti"
+
+#. module: event
+#: view:event.registration:0
+msgid "History"
+msgstr "Historia"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Types of Events"
+msgstr "Tapahtumien tyypit"
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr "Kumppanin Yhteystiedot"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr "Automaattisen vahvistuksen sähköpostitus"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "General"
+msgstr "Yleinen"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send Reminder"
+msgstr "Lähetä muistutus"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: event
+#: field:event.event,date_begin:0
+#: field:report.event.registration,date_begin:0
+msgid "Beginning date"
+msgstr "Aloituspäivämäärä"
+
+#. module: event
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_registration
+msgid "Events on registrations"
+msgstr "Rekisteröintien tapahtumat"
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,end:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,open:0
+msgid "Open"
+msgstr "Avaa"
+
+#. module: event
+#: field:event.registration,badge_title:0
+msgid "Badge Title"
+msgstr "Kulkuluvan otsikko"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_new_event_form
+#: model:ir.ui.menu,name:event.menu_event_new_event
+msgid "New event"
+msgstr "Uusi tapahtuma"
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "Yksikköhinta"
+
+#. module: event
+#: model:crm.case.section,name:event.event_2_crm_case_section
+msgid "Conference on ERP Buisness"
+msgstr "ERP -liiketoiminnan konferenssi"
+
+#. module: event
+#: field:event.registration,badge_partner:0
+msgid "Badge Partner"
+msgstr "Kulkulupa kumppani"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_confirm
+#: model:ir.ui.menu,name:event.menu_event_event_confirm
+msgid "Confirmed Events"
+msgstr "Vahvistetut tapahtumat"
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr "Suurin rekisteröintien määrä"
+
+#. module: event
+#: field:event.event,type:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr "Tämä sähköposti lähetetään kun joku ilmoittautuu tapahtumaan."
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr "Pääsylippu konferenssiin"
+
+#. module: event
+#: field:event.registration,case_id:0
+msgid "Case"
+msgstr "Tapaus"
+
+#. module: event
+#: view:event.event:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+"Valitse tämä ruutu jos haluat käyttää automaattista vahvistusta "
+"sähköpostille tai muistuttajalle"
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+"Tämä sähköposti lähetetään kun tapahtuma vahvistetaan tai jos joku "
+"ilmoittautuu vahvistettuun tapahtumaan. Tätä samaa sähköpostia käytetään "
+"myös muistuttamaan jotakin tapahtumasta."
+
+#. module: event
+#: field:event.event,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: event
+#: field:event.registration,invoice_label:0
+msgid "Label Invoice"
+msgstr "Merkkilasku"
+
+#. module: event
+#: view:event.registration:0
+msgid "Payments"
+msgstr "Maksut"
+
+#. module: event
+#: view:event.type:0
+#: field:report.event.type.registration,name:0
+msgid "Event Type"
+msgstr "Tapahtuman tyyppi"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.actions.wizard,name:event.wizard_event_registration
+msgid "Registrations"
+msgstr "Rekisteröinnit"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_draft
+#: model:ir.ui.menu,name:event.menu_event_event_draft
+msgid "Draft Events"
+msgstr "Luonnostele tapahtumat"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_main
+msgid "Events Organisation"
+msgstr "Tapahtuman organisaatio"
+
+#. module: event
+#: view:event.registration:0
+msgid "Actions"
+msgstr "Toiminnot"
+
+#. module: event
+#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
+msgid "List Register Partners"
+msgstr "Listaa rekisteröidyt kumppanit"
+
+#. module: event
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Virhe: Virheellinen EAN-koodi"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr "Automaattinen rekisteröintisähköposti"
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
new file mode 100644
index 00000000000..ec6e415f198
--- /dev/null
+++ b/addons/membership/i18n/sk.po
@@ -0,0 +1,524 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+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: 2009-11-24 12:04+0000\n"
+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"Language-Team: Slovak <sk@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: 2009-11-25 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetoassociate0
+msgid "invoice to associate"
+msgstr ""
+
+#. module: membership
+#: model:process.process,name:membership.process_process_membershipprocess0
+msgid "Membership Process"
+msgstr "Proces členstva"
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Paid Member"
+msgstr "Platba členského"
+
+#. module: membership
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neplatný názov modelu v akcii definície."
+
+#. module: membership
+#: field:report.partner_member.year,currency:0
+#: field:report.partner_member.year_new,currency:0
+msgid "Currency"
+msgstr "Mena"
+
+#. module: membership
+#: model:process.node,note:membership.process_node_setassociation0
+msgid "Set an associate member of partner."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetopaid0
+msgid "Invoice is be paid."
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_membershipproduct0
+msgid "Define membership product."
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_to:0
+msgid "Date to"
+msgstr "Dátum do"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_waitingtoinvoice0
+msgid "Waiting to invoice"
+msgstr "Čakanie na faktúru"
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_producttomember0
+msgid "Product to member"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,associate_member:0
+msgid "Associate member"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_associatedmember0
+msgid "Member is associated."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_associationpartner0
+msgid "Associated partner."
+msgstr ""
+
+#. module: membership
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: membership
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr ""
+
+#. module: membership
+#: field:product.product,membership_date_from:0
+msgid "Date from"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,partner:0
+msgid "Partner"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_free
+#: model:ir.ui.menu,name:membership.menu_members_free
+msgid "Free members"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_invoicetopaid0
+msgid "Invoice to paid"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Partners"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: membership
+#: constraint:membership.membership_line:0
+msgid "Error, this membership product is out of date"
+msgstr ""
+
+#. module: membership
+#: wizard_button:wizard_invoice_membership,init,ok:0
+msgid "Confirm"
+msgstr ""
+
+#. module: membership
+#: model:process.transition.action,name:membership.process_transition_action_create0
+msgid "Create"
+msgstr ""
+
+#. module: membership
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_membership_membership_line
+msgid "Member line"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,state:0
+msgid "State"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_start:0
+msgid "Start membership date"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_paidmember0
+msgid "Paid member"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_partner_member_year
+#: model:ir.ui.menu,name:membership.menu_report_partner_member_year
+#: view:report.partner_member.year:0
+msgid "Membership by Years"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: membership
+#: view:res.partner:0
+msgid "Members"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Non Member"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_invoicedmember0
+msgid "Open invoice."
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_conf
+msgid "Configuration"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_producttomember0
+msgid "Define product for membership."
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_invoicetoassociate0
+msgid "Invoiced member may be Associated member."
+msgstr ""
+
+#. module: membership
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_membership_products
+#: view:product.product:0
+msgid "Membership products"
+msgstr ""
+
+#. module: membership
+#: model:ir.ui.menu,name:membership.menu_members_waiting
+msgid "Future members (invoice not confirmed)"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_setassociation0
+msgid "Set association"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.member_product_1_product_template
+msgid "Membership Product - 2"
+msgstr ""
+
+#. module: membership
+#: model:product.template,name:membership.member_product_0_product_template
+msgid "Membership Product - 1"
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,canceled_amount:0
+#: field:report.partner_member.year,canceled_number:0
+#: field:report.partner_member.year_new,canceled_amount:0
+#: field:report.partner_member.year_new,canceled_number:0
+msgid "Canceled"
+msgstr ""
+
+#. module: membership
+#: model:product.pricelist,name:membership.list1m
+msgid "Member Sale Pricelist"
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,invoiced_amount:0
+#: field:report.partner_member.year,invoiced_number:0
+#: field:report.partner_member.year_new,invoiced_amount:0
+#: field:report.partner_member.year_new,invoiced_number:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Free Member"
+msgstr ""
+
+#. module: membership
+#: model:product.pricelist.version,name:membership.ver1m
+msgid "Member Sale Pricelist Version"
+msgstr ""
+
+#. module: membership
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: membership
+#: help:res.partner,membership_amount:0
+msgid "The price negociated by the partner"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_associatedmember0
+msgid "Associated member"
+msgstr ""
+
+#. module: membership
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_cancel:0
+msgid "Cancel membership date"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_products
+msgid "Membership Products"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_paidmember0
+msgid "Membership invoice paid."
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,paid_amount:0
+#: field:report.partner_member.year,paid_number:0
+#: field:report.partner_member.year_new,paid_amount:0
+#: field:report.partner_member.year_new,paid_number:0
+msgid "Paid"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Invoiced Member"
+msgstr ""
+
+#. module: membership
+#: model:ir.module.module,shortdesc:membership.module_meta_information
+#: model:ir.ui.menu,name:membership.menu_membership
+#: view:product.product:0
+#: field:product.product,membership:0
+#: view:res.partner:0
+#: field:res.partner,member_lines:0
+msgid "Membership"
+msgstr ""
+
+#. module: membership
+#: help:product.product,membership:0
+msgid "Specify if this product is a membership product"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Waiting Member"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,name:membership.process_transition_associationpartner0
+msgid "Association Partner"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_invoiced
+#: model:ir.ui.menu,name:membership.menu_members_invoiced
+msgid "Invoiced members"
+msgstr ""
+
+#. module: membership
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_old
+#: model:ir.ui.menu,name:membership.menu_members_old
+msgid "Old members"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_amount:0
+msgid "Membership amount"
+msgstr ""
+
+#. module: membership
+#: wizard_view:wizard_invoice_membership,init:0
+msgid "Choose invoice details"
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Old Member"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_to:0
+msgid "To"
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,waiting_amount:0
+#: field:report.partner_member.year,waiting_number:0
+#: field:report.partner_member.year_new,waiting_amount:0
+#: field:report.partner_member.year_new,waiting_number:0
+msgid "Waiting"
+msgstr ""
+
+#. module: membership
+#: model:process.transition,note:membership.process_transition_waitingtoinvoice0
+msgid "Draft invoice is now open."
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_waiting
+msgid "Future members"
+msgstr ""
+
+#. module: membership
+#: wizard_button:wizard_invoice_membership,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_associated
+#: model:ir.ui.menu,name:membership.menu_members_associated
+msgid "Associated members"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members_paid
+#: model:ir.ui.menu,name:membership.menu_members_paid
+msgid "Paid members"
+msgstr ""
+
+#. module: membership
+#: view:product.product:0
+msgid "Information"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,account_invoice_line:0
+msgid "Account Invoice line"
+msgstr ""
+
+#. module: membership
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: membership
+#: model:process.node,note:membership.process_node_waitingmember0
+msgid "Draft invoice for membership."
+msgstr ""
+
+#. module: membership
+#: selection:membership.membership_line,state:0
+#: selection:res.partner,membership_state:0
+msgid "Canceled Member"
+msgstr ""
+
+#. module: membership
+#: model:product.price.type,name:membership.product_price_type_memberprice
+#: field:product.template,member_price:0
+msgid "Member Price"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,free_member:0
+msgid "Free member"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_stop:0
+msgid "Stop membership date"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.act_window,name:membership.action_membership_members
+#: model:ir.ui.menu,name:membership.menu_members
+msgid "Current members"
+msgstr ""
+
+#. module: membership
+#: model:ir.model,name:membership.model_report_partner_member_year_new
+#: model:ir.ui.menu,name:membership.menu_report_partner_member_year_new
+#: view:report.partner_member.year_new:0
+msgid "New Membership by Years"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_invoicedmember0
+msgid "Invoiced member"
+msgstr ""
+
+#. module: membership
+#: field:membership.membership_line,date_cancel:0
+msgid "Cancel date"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_waitingmember0
+msgid "Waiting member"
+msgstr ""
+
+#. module: membership
+#: model:ir.actions.wizard,name:membership.wizard_invoice_membership
+msgid "Invoice Membership"
+msgstr ""
+
+#. module: membership
+#: model:process.node,name:membership.process_node_membershipproduct0
+#: wizard_field:wizard_invoice_membership,init,product:0
+msgid "Membership product"
+msgstr ""
+
+#. module: membership
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: membership
+#: field:report.partner_member.year,year:0
+#: field:report.partner_member.year_new,year:0
+msgid "Year"
+msgstr ""
+
+#. module: membership
+#: field:res.partner,membership_state:0
+msgid "Current membership state"
+msgstr ""
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index bbad84c4345..392d0b0a246 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -7,24 +7,24 @@ 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-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2009-11-24 07:22+0000\n"
+"Last-Translator: nafterburner <nafterburner@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: 2009-11-17 04:49+0000\n"
+"X-Launchpad-Export-Date: 2009-11-25 04:48+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 ""
+msgstr "Dodijeljene zadatke"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Zadaci Procesa"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
@@ -34,27 +34,27 @@ msgstr ""
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr ""
+msgstr "Promijeni Preostalo Sate"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
 msgid "Close Task"
-msgstr ""
+msgstr "Zatvori Zadatak"
 
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Zadaci Projekta"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Otvori Gotov Zadatak"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "Progres"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -77,12 +77,12 @@ msgstr ""
 #. module: project
 #: field:project.project,child_id:0
 msgid "Subproject"
-msgstr ""
+msgstr "Podprojekt"
 
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Članovi Projekta"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -93,7 +93,7 @@ msgstr ""
 #: 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 ""
+msgstr "Moji Tekući Projekti"
 
 #. module: project
 #: field:project.task,child_ids:0
@@ -110,12 +110,12 @@ msgstr ""
 #. module: project
 #: field:project.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "Važnost"
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Ažuriranje"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
@@ -125,12 +125,12 @@ msgstr ""
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
 msgid "All Attachments"
-msgstr ""
+msgstr "Svi Privici"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "Postavite u tijeku"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -141,12 +141,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types
 msgid "Task Types"
-msgstr ""
+msgstr "Vrste Zadataka"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Novi Projekt na Temelju Predloška"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -156,12 +156,12 @@ msgstr ""
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Vrlo hitno"
 
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -175,23 +175,23 @@ msgstr ""
 #: 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 ""
+msgstr "Moji Zadaci u Tijeku"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Postavi kao Predložak"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Skica zadatka"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
 #: field:project.task.work,task_id:0
 msgid "Task"
-msgstr ""
+msgstr "Zadatak"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours_me:0
@@ -206,17 +206,17 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Dani"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
 msgid "Analysis"
-msgstr ""
+msgstr "Analiza"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -224,12 +224,12 @@ msgstr ""
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Započni Zadatak"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
@@ -247,7 +247,7 @@ msgstr ""
 #: selection:project.project,state:0
 #: selection:project.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Poništeno"
 
 #. module: project
 #: view:project.project:0
@@ -258,12 +258,12 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Završen zadatak"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Zadatak je Završen"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -290,7 +290,7 @@ msgstr ""
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički Račun"
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -302,34 +302,34 @@ msgstr ""
 #: 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 "Svi Zadaci"
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planiranje"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: project
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planirani Sati"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "Zadatak: %(name)s"
 
 #. module: project
 #: view:project.project:0
@@ -339,24 +339,26 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr ""
+msgstr "Delegacija"
 
 #. module: project
 #: help:project.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
+"Član projekta. Ne koristi se u niti jednom računanja, samo za informacijske "
+"svrhe."
 
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr ""
+msgstr "Moji projekti"
 
 #. 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 ""
+msgstr "Svi projekti"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -366,7 +368,7 @@ msgstr ""
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "Delegirani Zadaci"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -376,17 +378,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Novi Opis Zadatka"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Unutarnji opis projekta."
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Matični Projekt"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -397,36 +399,36 @@ msgstr ""
 #: field:project.task,type:0
 #: field:project.task.type,name:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Tjedni"
 
 #. 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 ""
+msgstr "Moj Trenutni Zadaci"
 
 #. 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 ""
+msgstr "Novi Projekt"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Srednji"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Preostali Sati"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
@@ -436,7 +438,7 @@ msgstr ""
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Planirano Vrijeme"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -448,26 +450,26 @@ msgstr ""
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Sati"
 
 #. 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 ""
+msgstr "Moji Zadaci na Čekanju"
 
 #. 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 ""
+msgstr "Zadaci u Tijeku"
 
 #. 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 ""
+msgstr "Nedodijeljeni Zadaci"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
@@ -478,7 +480,7 @@ msgstr ""
 #: 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 ""
+msgstr "Moji Projekti"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
@@ -488,40 +490,40 @@ msgstr ""
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Predložak"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: project
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni Datum"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr ""
+msgstr "Projekti"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Detalji Zadatka"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Aktiviraj Račun"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -531,7 +533,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Korisnik: %(user_id)s"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -541,48 +543,48 @@ msgstr ""
 #. module: project
 #: field:project.project,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegat"
 
 #. module: project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. 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 ""
+msgstr "Upravljanje Projektima"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Vrijeme Provedeno"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
 #: view:project.task:0
 msgid "Tasks"
-msgstr ""
+msgstr "Zadaci"
 
 #. module: project
 #: view:project.task.type:0
 msgid "Task type"
-msgstr ""
+msgstr "Tip Zadatka"
 
 #. 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 ""
+msgstr "Novi Zadatak"
 
 #. module: project
 #: help:project.project,timesheet_id:0
@@ -592,7 +594,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Project's members"
-msgstr ""
+msgstr "Član Projekta"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
@@ -608,22 +610,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr ""
+msgstr "Moji Zadatci"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Status: %(state)s"
 
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planirano"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
+msgstr "Zbroj ukupnog vremena svih poslova vezanih uz ovaj projekt."
 
 #. module: project
 #: view:project.task:0
@@ -633,22 +635,22 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Pregled"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Administracija"
 
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
 msgid "E-Mails"
-msgstr ""
+msgstr "E-Mails"
 
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
@@ -660,12 +662,12 @@ msgstr ""
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Skica"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Nisko"
 
 #. module: project
 #: field:project.project,manager:0
@@ -679,12 +681,12 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr ""
+msgstr "U toku"
 
 #. module: project
 #: field:project.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: help:project.task.delegate,init,state:0
@@ -696,38 +698,38 @@ msgstr ""
 #. module: project
 #: field:res.company,project_time_mode:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Vremenska Jedinica Projekta"
 
 #. module: project
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Ime Projekta"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
 msgid "Send Message"
-msgstr ""
+msgstr "Pošalji Poruku"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Ukupno vrijeme"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivno"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Bug"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Citat"
 
 #. module: project
 #: view:project.task:0
@@ -744,17 +746,17 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Otvorite zadatak"
 
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Radno Vrijeme"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Mjeseci"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -764,7 +766,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -777,17 +779,17 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "Projekti Korisnika"
 
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr ""
+msgstr "Ponovno Aktivirajte Projekt"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Hitno"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
@@ -797,7 +799,7 @@ msgstr ""
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Delegirano Za"
 
 #. module: project
 #: field:project.task,date_close:0
@@ -807,7 +809,7 @@ msgstr ""
 #. module: project
 #: field:project.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Dodijeljeno"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -831,12 +833,12 @@ msgstr ""
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
-msgstr ""
+msgstr "Ukupno planiranih sati sve zadatke vezane za ovaj projekt."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
 msgid "Month works"
-msgstr ""
+msgstr "Mjesečni radovi"
 
 #. module: project
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
@@ -847,12 +849,12 @@ msgstr ""
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Upozori Partnera"
 
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: project
 #: field:project.task,name:0
@@ -862,7 +864,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "Početni Datum: %(date_start)s"
 
 #. module: project
 #: help:project.project,category_id:0
@@ -879,7 +881,7 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
-msgstr ""
+msgstr "Učinjeno"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -890,90 +892,92 @@ msgstr ""
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Stvaranje zadatka"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "ID: %(task_id)s"
 
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "U Tijeku"
 
 #. module: project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi sa x_ i ne smije sadržavati nikakve specijalne "
+"znakove !"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Ponovno Aktiviraj"
 
 #. module: project
 #: field:project.task,parent_id:0
 msgid "Parent Task"
-msgstr ""
+msgstr "Matični Zadatak"
 
 #. module: project
 #: view:project.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Odgoda"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Vrlo Nisko"
 
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr ""
+msgstr "Pošaljite mail kupcu"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Upravitelj Upozorenja"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
 msgid "config.compute.remaining"
-msgstr ""
+msgstr "config.compute.remaining"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
 msgid "Quiet close"
-msgstr ""
+msgstr "Tiho zatvaranje"
 
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr ""
+msgstr "Novi naslov za svoj zadatak da biste provjerili valjanost posla."
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progres (%)"
 
 #. 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 ""
+msgstr "Opis"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
@@ -984,22 +988,22 @@ msgstr ""
 #: 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 ""
+msgstr "Struktura Projekta"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Validation Task"
-msgstr ""
+msgstr "Potvrdni Zadatak"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Rad"
 
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "Tekući"
 
 #. module: project
 #: help:project.project,parent_id:0
@@ -1016,7 +1020,7 @@ msgstr ""
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "Projektni zadaci"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -1028,7 +1032,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Nea Mogućnost"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1038,34 +1042,34 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Naslov Vašeg Zadatka"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Zadatak Projekta"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Potrošeno Sati"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Ukupno Sati"
 
 #. 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 ""
+msgstr "Predložak Projekata"
 
 #. module: project
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1077,12 +1081,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Partner Info"
-msgstr ""
+msgstr "Informacije o Partneru"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
 msgid "Compute Remaining Hours"
-msgstr ""
+msgstr "Izračunaj Preostale Sate"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
@@ -1097,12 +1101,12 @@ msgstr ""
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Krajnji Rok"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Dodijeli"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1134,4 +1138,4 @@ msgstr ""
 #: 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 ""
+msgstr "Tekući projekti"

From 2df0088b8320334cea85d6cf532ccf07283e4dd3 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 11:14:23 +0530
Subject: [PATCH 29/59] [FIX] Multi_company :  set active to be False

bzr revid: jvo@tinyerp.com-20091125054423-cgu8wdl1h292s705
---
 addons/multi_company/__terp__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__terp__.py
index dac7349e7c4..c2728db3a61 100644
--- a/addons/multi_company/__terp__.py
+++ b/addons/multi_company/__terp__.py
@@ -26,13 +26,12 @@
     'category': 'Custom',
     'description': " ",
     'author': 'Tiny',
-    'depends': ['base'],
+    'depends': ['base','sale','project'],
     'update_xml': [
         'multi_company_view.xml',
     ],
     'demo_xml': ['multi_company_demo.xml'],
     'installable': True,
-    'active': True,
-    'certificate': '',
+    'active': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 4f5cd404eb6d10fe8b95ff840680c33cee898262 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 11:35:02 +0530
Subject: [PATCH 30/59] [FIX] Multi_company : Improved demo data

bzr revid: jvo@tinyerp.com-20091125060502-uf09eyf22q2yxqla
---
 addons/multi_company/multi_company_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 7db9d77270a..c7d08e9b1fb 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -346,7 +346,7 @@
         <record id="base.res_partner_8" model="res.partner">
            	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="res_partner_9" model="res.partner">
+        <record id="base.res_partner_9" model="res.partner">
           	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_10" model="res.partner">

From e17bd860982cd9f086a33fb5943159993bd5a7ee Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 11:48:57 +0530
Subject: [PATCH 31/59] [IMP]  Added Company_id to res.partner

bzr revid: jvo@tinyerp.com-20091125061857-xgmqjbruxisnnckw
---
 bin/addons/base/res/partner/partner.py       | 1 +
 bin/addons/base/res/partner/partner_view.xml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index b469c11e061..8de366cbef4 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -151,6 +151,7 @@ class res_partner(osv.osv):
         'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
         'city':fields.related('address','city',type='char', string='City'),
         'country':fields.related('address','country_id',type='many2one', relation='res.country', string='Country'),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
 
     def _default_category(self, cr, uid, context={}):
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index d96e168c554..b19626f7d21 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -248,6 +248,9 @@
                             <field name="supplier" select="2"/>
                         </group>
                     </group>
+                    <group colspan="2" col="1">
+                       <field name="company_id"/>
+					</group>
                     <notebook colspan="4">
                         <page string="General">
                             <field colspan="4" mode="form,tree" name="address" nolabel="1" select="1">

From 589969fd922df3fce2efd5d98b2ec6d24753e4b6 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 11:50:31 +0530
Subject: [PATCH 32/59] [REF] Multi_company : improved indentation

bzr revid: jvo@tinyerp.com-20091125062031-4yklptj6nf5x1rmy
---
 addons/multi_company/multi_company.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/multi_company/multi_company.py b/addons/multi_company/multi_company.py
index e735bf91b30..1b086b1337c 100644
--- a/addons/multi_company/multi_company.py
+++ b/addons/multi_company/multi_company.py
@@ -44,17 +44,16 @@ class multi_company_default(osv.osv):
 multi_company_default()
 
 class res_company(osv.osv):
- _inherit = 'res.company'
+    _inherit = 'res.company'
  
- def _company_default_get(self, cr, uid, object=False, context={}):
-
-     proxy = self.pool.get('multi_company.default')
-     ids = proxy.search(cr, uid, [('object_id.name', '=', object)])
-     for rule in proxy.browse(cr, uid, ids, context):
-         user = self.pool.get('res.user').browse(cr, uid, uid)
-         if eval(rule.expression, {'context': context, 'user': user}):
-             return rule.company_dest_id.id
-     return super(res_company, self)._company_default_get(cr, uid, object, context)
+    def _company_default_get(self, cr, uid, object=False, context={}):
+        proxy = self.pool.get('multi_company.default')
+        ids = proxy.search(cr, uid, [('object_id.name', '=', object)])
+        for rule in proxy.browse(cr, uid, ids, context):
+            user = self.pool.get('res.user').browse(cr, uid, uid)
+            if eval(rule.expression, {'context': context, 'user': user}):
+                return rule.company_dest_id.id
+        return super(res_company, self)._company_default_get(cr, uid, object, context)
  
 res_company()
 

From e98db0ffcdde175ab609f888e916ab95caf8f2b2 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Wed, 25 Nov 2009 11:55:20 +0530
Subject: [PATCH 33/59] [IMP] scan languages function on misc, now it will
 consider all languages instead of checking base module languages for loading
 translation file

bzr revid: mra@tinyerp.com-20091125062520-oy1tkzex6oo3j56m
---
 bin/tools/misc.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index d73422a6f34..d1e4f9a3914 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -836,10 +836,12 @@ def get_languages():
     return languages
 
 def scan_languages():
-    import glob
-    file_list = [os.path.splitext(os.path.basename(f))[0] for f in glob.glob(os.path.join(config['root_path'],'addons', 'base', 'i18n', '*.po'))]
+#    import glob
+#    file_list = [os.path.splitext(os.path.basename(f))[0] for f in glob.glob(os.path.join(config['root_path'],'addons', 'base', 'i18n', '*.po'))]
+#    ret = [(lang, lang_dict.get(lang, lang)) for lang in file_list]
+    # Now it will take all languages from get languages function without filter it with base module languages
     lang_dict = get_languages()
-    ret = [(lang, lang_dict.get(lang, lang)) for lang in file_list]
+    ret = [(lang, lang_dict.get(lang, lang)) for lang in list(lang_dict)]
     ret.sort(key=lambda k:k[1])
     return ret
 

From 7b51ce675ba13024e8423ea19e98d96eb48f11de Mon Sep 17 00:00:00 2001
From: "GPA(OpenERP)" <>
Date: Wed, 25 Nov 2009 12:13:04 +0530
Subject: [PATCH 34/59] [IMP] Modules : Module name improvements in __terp__.py

bzr revid: jvo@tinyerp.com-20091125064304-k2w1j0imujf5tgab
---
 addons/account_invoice_layout/__terp__.py        | 2 +-
 addons/analytic_journal_billing_rate/__terp__.py | 2 +-
 addons/auction/__terp__.py                       | 2 +-
 addons/base_iban/__terp__.py                     | 2 +-
 addons/base_module_merge/__terp__.py             | 2 +-
 addons/base_module_publish/__terp__.py           | 2 +-
 addons/base_module_quality/__terp__.py           | 2 +-
 addons/base_vat/__terp__.py                      | 2 +-
 addons/crm_profiling/__terp__.py                 | 2 +-
 addons/event_project/__terp__.py                 | 4 ++--
 addons/mrp_repair/__terp__.py                    | 2 +-
 addons/mrp_subproduct/__terp__.py                | 2 +-
 addons/report_project/__terp__.py                | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account_invoice_layout/__terp__.py b/addons/account_invoice_layout/__terp__.py
index 4f2c0b2af63..5b44f2edde6 100644
--- a/addons/account_invoice_layout/__terp__.py
+++ b/addons/account_invoice_layout/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'account_invoice_layout',
+    'name': 'Invoices Layout Improvement',
     'version': '1.0',
     'category': 'Generic Modules/Projects & Services',
     'description': """
diff --git a/addons/analytic_journal_billing_rate/__terp__.py b/addons/analytic_journal_billing_rate/__terp__.py
index 634b4cc0562..d2936caf9b0 100644
--- a/addons/analytic_journal_billing_rate/__terp__.py
+++ b/addons/analytic_journal_billing_rate/__terp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 {
-    'name': 'Analytic Journal Billing Rate',
+    'name': 'Analytic Journal Billing Rate, Define the default invoicing rate for a specific journal',
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """
diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 7570ba30d90..c41aad9159f 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Auction module',
+    'name': 'Auction Management',
     'version': '1.0',
     'category': 'Generic Modules/Auction',
     'description': """This module provides functionality to 
diff --git a/addons/base_iban/__terp__.py b/addons/base_iban/__terp__.py
index 14d1fdc20eb..14c63765f6f 100644
--- a/addons/base_iban/__terp__.py
+++ b/addons/base_iban/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'IBAN',
+    'name': 'Create IBAN bank accounts',
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
diff --git a/addons/base_module_merge/__terp__.py b/addons/base_module_merge/__terp__.py
index 406e816553d..4d59a5968ef 100644
--- a/addons/base_module_merge/__terp__.py
+++ b/addons/base_module_merge/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Module Merger',
+    'name': 'Module Merger - Merge all files of  modules with same name',
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
diff --git a/addons/base_module_publish/__terp__.py b/addons/base_module_publish/__terp__.py
index 1f65c8ccad4..6436e253884 100644
--- a/addons/base_module_publish/__terp__.py
+++ b/addons/base_module_publish/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Module publisher',
+    'name': 'Module publisher - To automatically publish modules new version',
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
diff --git a/addons/base_module_quality/__terp__.py b/addons/base_module_quality/__terp__.py
index b09df81254a..04375987672 100644
--- a/addons/base_module_quality/__terp__.py
+++ b/addons/base_module_quality/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Base module quality',
+    'name': 'Base module quality - To check the quality of other modules' ,
     'version': '1.0',
     'category': 'Tiny Specific Modules/Base module quality',
     'description': """
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__terp__.py
index 13695d6adb3..4e624a85b5e 100644
--- a/addons/base_vat/__terp__.py
+++ b/addons/base_vat/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'VAT',
+    'name': 'Base VAT - To check VAT number validity',
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """Enable the VAT Number for the partner. Check the validity of that VAT Number.""",
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__terp__.py
index 7809d1d0948..7cac68cd4dd 100644
--- a/addons/crm_profiling/__terp__.py
+++ b/addons/crm_profiling/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'crm_profiling management',
+    'name': 'Crm Profiling management - To Perform Segmentation within Partners',
     'version': '1.3',
     'category': 'Generic Modules/CRM & SRM',
     'description': """
diff --git a/addons/event_project/__terp__.py b/addons/event_project/__terp__.py
index 746a14f1160..8d73d8716b2 100644
--- a/addons/event_project/__terp__.py
+++ b/addons/event_project/__terp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    'name': 'Event - Project',
+    'name': 'Event Project - Create Retro-Planning to manage your Events',
     'version': '0.1',
     'category': 'Generic Modules/Association',
     'description': """Organization and management of events.
 
-    This module allow you to create retro planning for managing your events.
+    This module allows you to create retro planning for managing your events.
 """,
     'author': 'Tiny',
     'depends': ['project_retro_planning', 'event'],
diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 3b79090958b..595ff9c9a63 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Products Repairs Module',
+    'name': 'Products Repairs Module - Manage All products Repairs',
     'version': '1.0',
     'category': 'Custom',
     'description': """
diff --git a/addons/mrp_subproduct/__terp__.py b/addons/mrp_subproduct/__terp__.py
index 2f212ad6415..807000c3023 100644
--- a/addons/mrp_subproduct/__terp__.py
+++ b/addons/mrp_subproduct/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'MRP Sub Product',
+    'name': 'MRP Sub Product - To produce several products from one production order',
     'version': '1.0',
     'category': 'Generic Modules/Production',
     'description': """
diff --git a/addons/report_project/__terp__.py b/addons/report_project/__terp__.py
index 1d3c20fa709..fe4b138c59a 100644
--- a/addons/report_project/__terp__.py
+++ b/addons/report_project/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Sales Management - Reporting',
+    'name': 'Project Management - Reporting',
     'version': '1.0',
     'category': 'Generic Modules/Sales & Purchases',
     'description': """A module that adds some reports on projects.

From 7eb4020a69374f93959e8569b14d23a12cca0bd5 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 25 Nov 2009 08:54:27 +0100
Subject: [PATCH 35/59] [IMP] board: board.note menu is now only accessible to
 admin

bzr revid: olt@tinyerp.com-20091125075427-f52lal4ho7pa91n7
---
 addons/board/board_view.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 5904607223a..3893d3f628b 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="terp-graph" id="dashboard_menu" name="Dashboards"/>
-        
+
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
             <field name="model">board.note</field>
@@ -33,12 +33,14 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        
-        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="board.dashboard_menu" sequence="100"/>
-        
+
+        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="board.dashboard_menu"
+                  sequence="100"
+                  groups="base.group_system" />
+
         <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu"/>
-        
-        
+
+
         <record id="view_board_tree" model="ir.ui.view">
             <field name="name">board.board.tree</field>
             <field name="model">board.board</field>
@@ -94,6 +96,6 @@
             id="menu_view_board_form"
             parent="next_id_50"/>
         <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
-        
+
     </data>
 </openerp>

From ebe7abde2607dfccb233550e11da32ff77194458 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 25 Nov 2009 09:06:39 +0100
Subject: [PATCH 36/59] [IMP] product: menu reorganisation

bzr revid: olt@tinyerp.com-20091125080639-c340axc8wj0j0zqr
---
 addons/product/pricelist_view.xml            | 24 ++++++++++----------
 addons/product/product_view.xml              |  6 ++---
 addons/product/security/product_security.xml |  4 ++++
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index c42521357fa..71520ee0e72 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_main_product" sequence="2"/>
-        
+
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_config_product" sequence="2"/>
+
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
             <field name="model">product.pricelist.version</field>
@@ -32,7 +32,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_pricelist_action" model="ir.actions.act_window">
             <field name="name">Pricelist Versions</field>
             <field name="type">ir.actions.act_window</field>
@@ -41,7 +41,7 @@
             <field name="view_id" ref="product_pricelist_version_tree_view"/>
         </record>
         <menuitem action="product_pricelist_action" id="menu_product_pricelist_action" parent="product.menu_product_pricelist_main" sequence="2"/>
-        
+
         <record id="product_pricelist_item_tree_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.tree</field>
             <field name="model">product.pricelist.item</field>
@@ -57,7 +57,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="product_pricelist_item_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.form</field>
             <field name="model">product.pricelist.item</field>
@@ -73,7 +73,7 @@
                     <field name="min_quantity"/>
                     <field name="sequence"/>
                     <separator colspan="4" string="Price Computation"/>
-                    
+
                     <field name="base"/>
                     <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
                     <group col="6" colspan="5">
@@ -88,11 +88,11 @@
                         <field name="price_min_margin" string="Min. Margin"/>
                         <field name="price_max_margin" string="Max. Margin"/>
                     </group>
-                    
+
                 </form>
             </field>
         </record>
-        
+
         <record id="product_pricelist_view_tree" model="ir.ui.view">
             <field name="name">product.pricelist.tree</field>
             <field name="model">product.pricelist</field>
@@ -141,7 +141,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="product_pricelist_action2" id="menu_product_pricelist_action2" parent="product.menu_product_pricelist_main" sequence="1"/>
-        
+
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>
             <field name="model">product.price.type</field>
@@ -164,7 +164,7 @@
         </record>
         <menuitem name="Prices Computations" id="menu_price" parent="product.menu_config_product"/>
         <menuitem action="product_price_type_action" groups="base.group_extended" id="menu_product_price_type_action" parent="menu_price"/>
-        
+
         <record id="product_pricelist_type_view" model="ir.ui.view">
             <field name="name">product.pricelist.type.form</field>
             <field name="model">product.pricelist.type</field>
@@ -184,6 +184,6 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="menu_price"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2018f982caf..6d79a5c9952 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -2,7 +2,6 @@
 <openerp>
     <data>
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
-        <menuitem id="menu_products_products" name="Products" parent="product.menu_main_product" sequence="18" />
         <menuitem
             id="menu_config_product"
             name="Configuration"
@@ -195,7 +194,7 @@
             <field name="search_view_id" ref="product_search_form_view"/>
         </record>
 
-        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_products_products" sequence="1"/>
+        <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>
 
         <record id="product_category_form_view" model="ir.ui.view">
             <field name="name">product.category.form</field>
@@ -593,7 +592,8 @@
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
 
-        <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
+        <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_main_product" sequence="2"
+                  groups="product.group_product_variant" />
 
         <record id="company_wise_cost_price_form_view" model="ir.ui.view">
             <field name="name">company.wise.cost.price.form</field>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 89530976a32..7347c61d1bc 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -9,5 +9,9 @@
         <field name="name">Product / Manager</field>
     </record>
 
+    <record id="group_product_variant" model="res.groups">
+        <field name="name">Product / Variant</field>
+    </record>
+
 </data>
 </openerp>

From cc1d6a3c6c9918801d21857ee2ffab02a38bfb13 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 25 Nov 2009 09:07:08 +0100
Subject: [PATCH 37/59] [IMP] mrp: menu reorganisation

bzr revid: olt@tinyerp.com-20091125080708-vwi5nxksm8cbk370
---
 addons/mrp/mrp_view.xml               | 24 +++++++++++++-----------
 addons/mrp/mrp_wizard.xml             | 14 +++++++-------
 addons/mrp_repair/mrp_repair_view.xml | 16 ++++++++--------
 addons/report_mrp/report_mrp_view.xml |  3 ++-
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d44f43a0ab6..74be287ea82 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -7,8 +7,8 @@
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 
         <!--
-    Property / Property Group
-    -->
+        Property / Property Group
+        -->
 
         <record id="mrp_property_group_form_view" model="ir.ui.view">
             <field name="name">mrp.property.group.form</field>
@@ -33,7 +33,8 @@
             id="menu_mrp_configuration"
             name="Configuration"
             parent="menu_mrp_root"
-            groups="group_mrp_manager"/>
+            groups="group_mrp_manager"
+            sequence="-50" />
         <menuitem
             id="menu_mrp_property_group_action_prop"
             name="Properties"
@@ -84,8 +85,8 @@
             parent="menu_mrp_property_group_action_prop"/>
 
         <!--
-    Workcenters
-    -->
+        Workcenters
+        -->
 
         <record id="mrp_workcenter_tree_view" model="ir.ui.view">
             <field name="name">mrp.workcenter.tree</field>
@@ -144,11 +145,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_workcenter_tree_view"/>
         </record>
-        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration"/>
+        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration" groups="base.group_extended" />
 
         <!--
-    Routings
-    -->
+        Routings
+        -->
 
         <record id="mrp_routing_workcenter_tree_view" model="ir.ui.view">
             <field name="name">mrp.routing.workcenter.tree</field>
@@ -218,7 +219,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
         </record>
-        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration"/>
+        <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration" groups="base.group_extended"/>
 
         <!--
           Bill of Materials
@@ -549,7 +550,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
-        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/>
+        <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root" sequence="-30"/>
 
         <record id="mrp_production_action2_gantt" model="ir.actions.act_window">
             <field name="name">Production Orders Planning</field>
@@ -775,7 +776,8 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
-        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
+        <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"
+                  sequence="-40" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
             <field name="name">Unscheduled procurements</field>
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index d88ea321ac9..d4db5c2de61 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data>
         <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/>
-        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="100"/>
-        
+        <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="-49"/>
+
         <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Procurements Only" name="mrp.procurement.compute"/>
         <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
-        
+
         <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
         <menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
-        
+
         <wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Workcenter load"/>
-        
+
         <wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>
         <record id="ir_project_cost_structure" model="ir.values">
             <field eval="'client_print_multi'" name="key2"/>
@@ -27,13 +27,13 @@
         name="product.product.procurement"
         keyword="client_action_multi"
         id="product_procurement_wizard"/>
-    
+
     <wizard
         id="stock.track_line"
         model="stock.move"
         multi="True"
         name="mrp.stock.move.track"
-        string="Track line"/>    
+        string="Track line"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index cd73b312fd9..9988d106824 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -86,7 +86,7 @@
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
                                 <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
-								<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
+                                <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                                 <button name="cancel" states="draft" string="Cancel Repair"/>
                                 <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
@@ -102,15 +102,15 @@
                                     <notebook>
                                         <page string="Fees Line">
                                             <field name='name'/>
-		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
-		                                    <field name="product_uom_qty" string="Qty"/>
-		                                    <field name="product_uom" string="UoM" />
-		                                    <field name="price_unit"/>
-		                                    <field name="price_subtotal"/>
+                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
+                                            <field name="product_uom_qty" string="Qty"/>
+                                            <field name="product_uom" string="UoM" />
+                                            <field name="price_unit"/>
+                                            <field name="price_subtotal"/>
                                             <newline/>
                                             <group colspan="2">
                                                 <field name="to_invoice"/>
-    		                                    <field name="invoiced"/>
+                                                <field name="invoiced"/>
                                             </group>
                                             <newline/>
                                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&gt;&gt;','purchase')]"/>
@@ -220,7 +220,7 @@
             <field name="domain">[('state','=','2binvoiced')]</field>
         </record>
 
-        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs"/>
+        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs" sequence="50"/>
 
         <menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
 
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index 6ef87a2ca1c..d908de060d0 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -50,7 +50,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root"/><menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
+        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="100"/>
+        <menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
         
         <!-- stock.move compared to internal location src/dest -->
         

From 7ce717433fe1251bc836e09b99c27e21f0d80f01 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Wed, 25 Nov 2009 14:12:28 +0530
Subject: [PATCH 38/59] [IMP] modify fr translation file for one sentence in
 french for testing auto translation with LP

bzr revid: mra@tinyerp.com-20091125084228-4a3ojbgpc11txobe
---
 bin/addons/base/i18n/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 5686b4888d1..a2055edcef9 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.po
@@ -483,7 +483,7 @@ msgstr "Si vous cochez ceci, la seconde fois que l'utilisateur imprime avec la m
 #: code:addons/osv/orm.py:0
 #, python-format
 msgid "The read method is not implemented on this object !"
-msgstr ""
+msgstr "La méthode read n'est pas implémentée pour cet objet"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0

From 4642734b3f1ea432e22977280baff3b3e815b98f Mon Sep 17 00:00:00 2001
From: "lp:~uco-openerp" <>
Date: Wed, 25 Nov 2009 14:23:46 +0530
Subject: [PATCH 39/59] [IMP] * On the search view of a partner, add the
 'Contact' field (address). * Same for the address object, we must be able to
 filter on the 'Contact Name'

bzr revid: hmo@tinyerp.com-20091125085346-5xtdwyb2f8f778nw
---
 bin/addons/base/res/partner/partner_view.xml | 12 +++++-------
 bin/addons/base/res/res_security.xml         |  4 ----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index b19626f7d21..5e27beb97cc 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -53,6 +53,7 @@
 		    <field name="type">search</field>
 		    <field name="arch" type="xml">
 		        <search string="Search Contact">
+		        	<field name="name" select='1'/>
 	           		<field name="partner_id" select='1'/>
 	           		<field name="country_id" select='1'/>
 		       </search>
@@ -320,6 +321,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select='1'/>
                         <field name="country" select='1'/>
+                        <field name="address" select="1"/>
                    </group>
                </search>
             </field>
@@ -358,7 +360,7 @@
             <field name="domain">[('customer','=',1)]</field>
             <field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_partner_customer_form" id="menu_partner_customer_form" parent="menu_partner_form"/>
+        
         <record id="action_partner_supplier_form" model="ir.actions.act_window">
             <field name="name">Suppliers Partners</field>
             <field name="type">ir.actions.act_window</field>
@@ -368,7 +370,7 @@
             <field name="context">{'default_customer':0}</field>
             <field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_partner_supplier_form" id="menu_partner_supplier_form" parent="menu_partner_form"/>
+        
         <record id="action_partner_other_form" model="ir.actions.act_window">
             <field name="name">Others Partners</field>
             <field name="type">ir.actions.act_window</field>
@@ -377,7 +379,7 @@
             <field name="domain">[('supplier','&lt;&gt;',1),('customer','&lt;&gt;',1)]</field>
             <field name="filter" eval="True"/>
         </record>
-        <menuitem action="action_partner_other_form" id="menu_partner_other_form" parent="menu_partner_form"/>
+        
         <record id="action_partner_customer_form_new" model="ir.actions.act_window">
             <field name="name">New Partner</field>
             <field name="type">ir.actions.act_window</field>
@@ -386,10 +388,6 @@
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="view_partner_form"/>            
         </record>
-        <menuitem
-            action="action_partner_customer_form_new"
-            sequence="50"
-            id="menu_partner_customer_form_new" parent="menu_partner_form"/>
 
         <record id="view_payterm_form" model="ir.ui.view">
             <field name="name">res.payterm</field>
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index 5db58070619..8aae3a40ae7 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -10,9 +10,5 @@
 		<field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
 	</record>
 
-	<record model="ir.ui.menu" id="menu_partner_customer_form_new">
-		<field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
-	</record>
-
 </data>
 </openerp>

From 64bf7c1161631c56ac0e604f5f33bff9d771a247 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 14:53:19 +0530
Subject: [PATCH 40/59] [IMP]: General Improvements>State Fields : Formatting
 of Help on state field in stock

bzr revid: rpa@tinyerp.com-20091125092319-9tb2s8rqhpnxkcn7
---
 addons/stock/stock.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7585ebc6466..97a2461318b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -454,8 +454,10 @@ class stock_picking(osv.osv):
             ('done', 'Done'),
             ('cancel', 'Cancelled'),
             ], 'State', readonly=True, select=True,
-            help=' The \'Draft\' state is used when a user is encoding a new and unconfirmed picking. The \'Confirmed\' state is used for stock movement to do with unavailable products. The \'Available\' state is set automatically when the \
-            products are ready to be moved. The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'),
+            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed picking. \
+            \n* The \'Confirmed\' state is used for stock movement to do with unavailable products. \
+            \n* The \'Available\' state is set automatically when the products are ready to be moved.\
+            \n* The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"),
         'date': fields.datetime('Date Order', help="Date of Order"),

From 0aa6a883c5ee1fe13bf5157b9b51426f2cc80f13 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 14:55:13 +0530
Subject: [PATCH 41/59] [FIX]: Fixed problem of Extended group name

bzr revid: rpa@tinyerp.com-20091125092513-vsf420ss5wih74ay
---
 addons/sale/sale_view.xml   | 4 ++--
 addons/scrum/scrum_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8f48dfb9e13..5b7c07001d3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -260,7 +260,7 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
+        <menuitem action="action_order_tree" id="menu_action_order_tree" parent="sale.menu_sale_order" groups="base.group_extended"/>
 
         <record id="action_order_tree_all" model="ir.actions.act_window">
             <field name="name">All Sales Order</field>
@@ -270,7 +270,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
-        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_useability_extended"/>
+        <menuitem action="action_order_tree_all" id="menu_action_order_tree_all" parent="sale.menu_sale_order" groups="base.group_extended"/>
 
         <record id="action_order_tree_new" model="ir.actions.act_window">
             <field name="name">New Quotation</field>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 6e8b4e0377c..23f73dca58a 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -436,7 +436,7 @@
             <field name="domain">[('user_id', '=', uid),('scrum','=',1)]</field>
             <field name="filter" eval="True"/>            
         </record>
-        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_useability_extended"/>
+        <menuitem action="action_view_task4" id="menu_action_view_task4" parent="scrum.next_id_67" groups="base.group_extended"/>
         
         <record id="action_view_task5" model="ir.actions.act_window">
             <field name="name">My opened tasks</field>

From c216cb323c0f4dff7ac21cd741cc11b2679c0373 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 14:56:32 +0530
Subject: [PATCH 42/59] [IMP,FIX]: hr_expense: Improvements in Menus and fixed
 problem of id in csv data file

bzr revid: rpa@tinyerp.com-20091125092632-h1ybauokn8dz198f
---
 addons/hr_expense/hr.expense.expense.csv |   6 +-
 addons/hr_expense/hr_expense_view.xml    | 103 +++++------------------
 2 files changed, 23 insertions(+), 86 deletions(-)

diff --git a/addons/hr_expense/hr.expense.expense.csv b/addons/hr_expense/hr.expense.expense.csv
index 9cf0cf7d2aa..6147af8d754 100644
--- a/addons/hr_expense/hr.expense.expense.csv
+++ b/addons/hr_expense/hr.expense.expense.csv
@@ -1,3 +1,3 @@
-name,ref,employee_id,line_ids/date_value,line_ids/name,line_ids/analytic_account,line_ids/unit_quantity,line_ids/ref,line_ids/unit_amount
-September Expenses,09/06,Fabien Pinckaers,2006-09-05,Travel by Car - Customer Seagate 2 - Double,Thymbra,130.0,,0.22
-,,,2006-09-05,Basic PC - Server for Seagate,Seagate P2,1.0,S1234435,300.0
+"id","name","ref","employee_id","line_ids/date_value","line_ids/name","line_ids/analytic_account","line_ids/unit_quantity","line_ids/ref","line_ids/unit_amount"
+1,"September Expenses",09/06/09,"Fabien Pinckaers",05/09/06,"Travel by Car - Customer Seagate 2 - Double","Thymbra",130,,0.22
+,,,,05/09/06,"Basic PC - Server for Seagate","Seagate P2",1,"S1234435",300
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 7af1c0c92ca..c4317c6fd8f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
         <!-- Expenses -->
+        
         <record id="view_expenses_line_tree" model="ir.ui.view">
             <field name="name">hr.expense.line.tree</field>
             <field name="type">tree</field>
@@ -34,6 +36,8 @@
                 </tree>
             </field>
         </record>
+        
+        
         <record id="view_expenses_form" model="ir.ui.view">
             <field name="name">hr.expense.form</field>
             <field name="type">form</field>
@@ -93,6 +97,7 @@
             </field>
         </record>
         
+        
         <record id="view_hr_expense_filter" model="ir.ui.view">
             <field name="name">hr.expense.expense.filter</field>
             <field name="model">hr.expense.expense</field>
@@ -120,59 +125,18 @@
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem
-            id="next_id_49"
-            name="Expenses"
-            parent="hr.menu_hr_root"/>
-        <menuitem
-            action="expense_all"
-            id="menu_expense_all"
-            parent="next_id_49"
-            groups="hr.group_hr_manager"/>
-        <record id="expense_all_draft" model="ir.actions.act_window">
-            <field name="name">Draft expenses</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
-        </record>
-        <menuitem action="expense_all_draft" id="menu_expense_all_draft" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
-        <record id="expense_all_confirm" model="ir.actions.act_window">
-            <field name="name">Expenses waiting validation</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','confirm')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
-        </record>
-        <menuitem action="expense_all_confirm" id="menu_expense_all_confirm" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
-        <record id="expense_all_valid" model="ir.actions.act_window">
-            <field name="name">Expenses waiting invoice</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','accepted')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
-        </record>
-        <menuitem action="expense_all_valid" id="menu_expense_all_valid" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
-        <record id="expense_all_invoiced" model="ir.actions.act_window">
-            <field name="name">Expenses waiting payment</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','invoiced')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
-        </record>
-        <menuitem action="expense_all_invoiced" id="menu_expense_all_invoiced" parent="hr_expense.menu_expense_all" groups="base.group_extended"/>
         
+        <menuitem id="next_id_49" name="Expenses"
+        	parent="hr.menu_hr_root"/>
+        	
+        <menuitem action="expense_all" id="menu_expense_all"
+        	parent="next_id_49" groups="hr.group_hr_manager"/>
+        	
         <!--
-		My expenses menu
-		-->
+        	My expenses menu
+        -->
+        
+        
         <record id="expense_my" model="ir.actions.act_window">
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense.expense</field>
@@ -182,38 +146,11 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
-        <menuitem action="expense_my" id="menu_expense_my" parent="hr_expense.next_id_49" groups="base.group_extended"/>
-
-        <record id="expense_my_new" model="ir.actions.act_window">
-            <field name="name">New Expenses Sheet</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        <menuitem action="expense_my_new" id="menu_expense_my_new" parent="hr_expense.next_id_49"/>
-
-
-        <record id="expense_my_draft" model="ir.actions.act_window">
-            <field name="name">My Draft expenses</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','draft')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
-        </record>
-        <menuitem action="expense_my_draft" id="menu_expense_my_draft" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
-        <record id="expense_my_confirm" model="ir.actions.act_window">
-            <field name="name">My expenses waiting validation</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','confirm')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
-        </record>
-        <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my" groups="base.group_extended"/>
+        
+        <menuitem action="expense_my" id="menu_expense_my"
+        	parent="hr_expense.next_id_49" groups="base.group_extended"
+        />
+        
         
         <record id="view_product_hr_expense_form" model="ir.ui.view">
 			<field name="name">product.product.expense.form</field>

From 99b22867b623fffe954e1cdffb61f3730cbdc473 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 14:57:52 +0530
Subject: [PATCH 43/59] [IMP]: * account: improved state name to proforma2 in
 filter * Removed extra menu in account_analytic_analysis

bzr revid: rpa@tinyerp.com-20091125092752-orrdoqdh7q8sriyr
---
 addons/account/account_invoice_view.xml                  | 2 +-
 .../account_analytic_analysis_menu.xml                   | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 08fa76ce4f6..3633e05f8a6 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -327,7 +327,7 @@
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
                    		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Invoices"/>
+                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
                         <filter icon="terp-account" string="Unpaid" domain="[('state','in',('open','cancel'))]" help="Unpaid Invoices"/>
 						<separator orientation="vertical"/>
 						<field name="number" select='1'/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index d84f411a9d4..3a68fa513d0 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -54,15 +54,6 @@
             <field name="filter" eval="True"/>            
         </record>
 
-        <record id="action_account_analytic_new" model="ir.actions.act_window">
-            <field name="name">New Analytic Account</field>
-            <field name="res_model">account.analytic.account</field>
-
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree,graph</field>
-        </record>
-        <menuitem action="action_account_analytic_new" id="menu_action_account_analytic_new" sequence="50" parent="account_analytic_analysis.menu_account"/>
-
         <record id="action_account_analytic_all" model="ir.actions.act_window">
             <field name="name">All Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>

From 0ea7f73f70cc70c0594faa55c8ff01a4f5055eea Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 15:18:14 +0530
Subject: [PATCH 44/59] [IMP]: Remaining changes in merge

bzr revid: rpa@tinyerp.com-20091125094814-grz0uqpz9dp5qq0a
---
 addons/account/account.py | 1 +
 addons/project/project.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index 7954e678574..7c9405c2d70 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -593,6 +593,7 @@ class account_period(osv.osv):
         '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,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
+        'company_id': fields.many2one('res.company', 'Company', required=True)
     }
     _defaults = {
         'state': lambda *a: 'draft',
diff --git a/addons/project/project.py b/addons/project/project.py
index def0bf75b92..b0eb8a67a02 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -118,6 +118,7 @@ class project(osv.osv):
         'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True,
                                   help='The project can be in either if the states \'Template\' and \'Running\'. If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
                                   If it is to be reviewed then the state is \'Pending\'. When the project is completed the state is set to \'Done\'.'),
+        'company_id': fields.many2one('res.company', 'Company'),
      }
 
     _defaults = {

From b095e64e847746ca2030e94b1dd96f4bc4e7881b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 15:28:41 +0530
Subject: [PATCH 45/59] [FIX]: Fixed problem of action reference of menu in
 point of sale

bzr revid: rpa@tinyerp.com-20091125095841-1j98q0mi41typ8bf
---
 addons/point_of_sale/pos_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 8390d25186e..22cd23cffff 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -141,7 +141,7 @@
             </field>
         </record>
         <menuitem name="Point of Sale" id="menu_point_root" />
-        <menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_order_tree2"/>
+
         <wizard 
             string="Wizard default journals"
             model="pos.config.journal"
@@ -179,6 +179,7 @@
             <field name="filter" eval="True"/>
             <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-%d')),('date_order','&lt;=',time.strftime('%Y-%m-%d'))]</field>
         </record>
+        <menuitem name="Point of Sale" parent="menu_point_root" id="menu_point_ofsale" action="action_pos_order_tree2"/>
 
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
             <field name="name">All orders</field>

From 9a47388fd63e2f1194316991627e5cb70c295253 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Wed, 25 Nov 2009 15:33:47 +0530
Subject: [PATCH 46/59] [REF]: Improved state field tooltips

bzr revid: uco@tinyerp.co.in-20091125100347-xt927v8iyl0bu2ua
---
 addons/account/account_bank_statement.py | 3 ++-
 addons/account/account_move_line.py      | 2 +-
 addons/account/project/project.py        | 6 ++++--
 addons/account_payment/payment.py        | 2 +-
 addons/auction/auction.py                | 2 +-
 addons/crm/crm.py                        | 4 ++--
 addons/event/event.py                    | 4 ++--
 addons/hr_expense/hr_expense.py          | 4 ++--
 addons/hr_holidays/hr.py                 | 2 +-
 addons/idea/idea.py                      | 4 ++--
 addons/mrp/mrp.py                        | 8 ++++----
 addons/project/project.py                | 8 ++++----
 addons/stock/stock.py                    | 4 ++--
 13 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index a0af45ad069..0b9b8868ca2 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -127,7 +127,8 @@ class account_bank_statement(osv.osv):
         'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
             'State', required=True,
             states={'confirm': [('readonly', True)]}, readonly="1",
-            help='When new statement is created the state will be \'Draft\'. And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
+            help='When new statement is created the state will be \'Draft\'. \
+            \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
         'currency': fields.function(_currency, method=True, string='Currency',
             type='many2one', relation='res.currency'),
     }
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 130bb51692b..02882fad1e7 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -378,7 +378,7 @@ class account_move_line(osv.osv):
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
         'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
         'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True,
-                                  help='When new move line is created the state will be \'Draft\'. When all the payments are done it will be in \'Valid\' state.'),
+                                  help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
                     this field will contain the basic amount(without tax)."),
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index fcdfd94b4e0..f446b6fdf29 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -190,8 +190,10 @@ class account_analytic_account(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
         'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True,
-                                  help='When an account is created its in \'Draft\' state. If any associated partner is there, it can be in \'Open\' state.\
-                                  If any pending balance is there it can be in \'Pending\'. And finally when all the transactions are over, it can be in \'Close\' state.'),
+                                  help='* When an account is created its in \'Draft\' state.\
+                                  \n* If any associated partner is there, it can be in \'Open\' state.\
+                                  \n* If any pending balance is there it can be in \'Pending\'. \
+                                  \n* And finally when all the transactions are over, it can be in \'Close\' state.'),
     }
 
     def _default_company(self, cr, uid, context={}):
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 27a42de5a31..8d46db771f4 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -101,7 +101,7 @@ class payment_order(osv.osv):
             ('open','Confirmed'),
             ('cancel','Cancelled'),
             ('done','Done')], 'State', select=True, 
-            help='When an order is placed the state is \'Draft\'. Once the bank is confirmed the state is set to \'Confirmed\'. Then the order is paid the state is \'Done\'.'),
+            help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line','order_id','Payment lines',states={'done':[('readonly',True)]}),
         'total': fields.function(_total, string="Total", method=True,
             type='float'),
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index b09b1e9288f..29ce8b30421 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -76,7 +76,7 @@ class auction_dates(osv.osv):
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
         '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\'. At the end of auction, the state becomes \'Closed\'.'),
+                                  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),
 
     }
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 8db567ea985..e893e601d66 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -512,8 +512,8 @@ class crm_case(osv.osv):
         'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1),
         'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
-                                  help='The state is set to \'Draft\', when a case is created. If the case is in progress the state is set to \'Open\'.\
-                                  When the case is over, the state is set to \'Done\'. If the case needs to be reviewed then the state is set to \'Pending\'.'),
+                                  help='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\'.'),
         'ref' : fields.reference('Reference', selection=_links_get, size=128),
         'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),
 
diff --git a/addons/event/event.py b/addons/event/event.py
index e2e19212393..d330a0cbec4 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -131,8 +131,8 @@ class event(osv.osv):
         'date_begin': fields.datetime('Beginning date', required=True),
         'date_end': fields.datetime('Ending date', required=True),
         'state': fields.selection([('draft','Draft'),('confirm','Confirmed'),('done','Done'),('cancel','Cancelled')], 'State', readonly=True, required=True,
-                                  help='If event is created, the state is \'Draft\'. If event is confirmed for the particular dates the state is set to \'Confirmed\'.\
-                                  If the event is over, the state is set to \'Done\'. If event is cancelled the state is set to \'Cancelled\'.'),
+                                  help='If event is created, the state is \'Draft\'.\n If event is confirmed for the particular dates the state is set to \'Confirmed\'.\
+                                  \nIf the event is over, the state is set to \'Done\'.\n If event is cancelled the state is set to \'Cancelled\'.'),
         'mail_auto_registr':fields.boolean('Mail Auto Register',help='Check this box if you want to use the automatic mailing for new registration'),
         'mail_auto_confirm':fields.boolean('Mail Auto Confirm',help='Check this box if you want ot use the automatic confirmation emailing or the reminder'),
         'mail_registr':fields.text('Registration Email',help='This email will be sent when someone subscribes to the event.'),
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index a9f4c5fbd70..0658300bf14 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -77,8 +77,8 @@ class hr_expense_expense(osv.osv):
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
             ('cancelled', 'Cancelled')],
-            'State', readonly=True, help='When the expense request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
-            If the admin accepts it, the state is \'Accepted\'. If an invoice is made for the expense request, the state is \'Invoiced\'. If the expense is paid to user, the state is \'Reimbursed\'.'),
+            'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
+            \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
     _defaults = {
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 68fc6b7ccbb..7abc9f5ffb6 100644
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -96,7 +96,7 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'. It is confirmed by the user and request is sent to admin, the state is \'Waiting Validation\'.\
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validate', 'Validated'), ('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 Validation\'.\
             If the admin accepts it, the state is \'Validated\'. If it is refused, the state is \'Refused\'.'),
         'date_from' : fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
         'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 45275aa78c3..2462ee615ff 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -120,8 +120,8 @@ class idea_idea(osv.osv):
         'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True ),
         'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True, 
-                                  help='When the Idea is created the state is \'Draft\'. It is opened by the user, the state is \'Opened\'.\
-                                    If the idea is accepted, the state is \'Accepted\'.'),
+                                  help='When the Idea is created the state is \'Draft\'.\n It is opened by the user, the state is \'Opened\'.\
+                                    \nIf the idea is accepted, the state is \'Accepted\'.'),
         'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
     }
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 65eed59ec10..c3c70ccd61e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -436,8 +436,8 @@ class mrp_production(osv.osv):
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
 
         'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
-                                    help='When the production order is created the state is set to \'Draft\'. If the order is confirmed the state is set to \'Waiting Goods\'. If any exceptions are there, the state is set to \'Packing Exception\'.\
-                                    If the stock is available then the state is set to \'Ready to Produce\'. When the production get started then the state is set to \'In Production\'. When the production is over, the state is set to \'Done\'.'),
+                                    help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\
+                                    \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
         'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),    
         'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
 
@@ -823,8 +823,8 @@ class mrp_procurement(osv.osv):
             ('ready','Ready'),
             ('done','Done'),
             ('waiting','Waiting')], 'State', required=True,
-            help='When a procurement is created the state is set to \'Draft\'. If the procurement is confirmed, the state is set to \'Confirmed\'.\
-            After confirming the state is set to \'Running\'. If any exception arises in the order then the state is set to \'Exception\'. Once the exception is removed the state becomes \'Ready\'. It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
+            help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
+            \nAfter 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.'),
         'note' : fields.text('Note'),
     }
     _defaults = {
diff --git a/addons/project/project.py b/addons/project/project.py
index b0eb8a67a02..edd03ee68e3 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -116,8 +116,8 @@ class project(osv.osv):
         'notes': fields.text('Notes', help="Internal description of the project."),
         'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
         'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True,
-                                  help='The project can be in either if the states \'Template\' and \'Running\'. If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
-                                  If it is to be reviewed then the state is \'Pending\'. When the project is completed the state is set to \'Done\'.'),
+                                  help='The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
+                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
      }
 
@@ -283,8 +283,8 @@ class task(osv.osv):
         'sequence': fields.integer('Sequence'),
         'type': fields.many2one('project.task.type', 'Type'),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
-                                  help='If the task is created the state \'Draft\'. If the task is started, the state becomes \'In Progress\'. If review is needed the task is in \'Pending\' state.\
-                                  If the task is over, the states is set to \'Done\'.'),
+                                  help='If the task is created the state \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
+                                  \n If the task is over, the states is set to \'Done\'.'),
         'date_start': fields.datetime('Starting Date'),
         'date_deadline': fields.datetime('Deadline'),
         'date_close': fields.datetime('Date Closed', readonly=True),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 97a2461318b..b76ae30fd70 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -984,8 +984,8 @@ class stock_move(osv.osv):
         '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. After that it is set to \'Confirmed\' state. If stock is available state is set to \'Avaiable\'. When the packing it done the state is \'Done\'.\
-                                  The state is \'Waiting\' if the move is waiting for another one.'),
+                                  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 packing it done the state is \'Done\'.\
+                                  \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }

From d4ada3ba3dd8baa28132f6043796d89b378481e6 Mon Sep 17 00:00:00 2001
From: Sharoon Thomas <>
Date: Wed, 25 Nov 2009 16:35:06 +0530
Subject: [PATCH 47/59] [IMP] Ir_act_window has now groups on form view

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

bzr revid: jvo@tinyerp.com-20091125110506-5zjfc0tomtz7796q
---
 bin/addons/base/ir/ir.xml | 54 ++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index c252cc4ab64..c6c96a91aae 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -334,29 +334,37 @@
                     <field name="src_model" select="2"/>
                     <field name="usage"/>
                     <field name="view_type"/>
-                    <field colspan="4" name="view_ids">
-                        <form string="Views">
-                            <field colspan="4" name="sequence"/>
-                            <field name="view_mode"/>
-                            <field domain="[('type', '=', view_mode)]" name="view_id"/>
-                        </form>
-                        <tree string="Views">
-                            <field name="sequence"/>
-                            <field name="view_mode"/>
-                            <field name="view_id"/>
-                        </tree>
-                    </field>
-                    <field colspan="4" name="default_user_ids"/>
-                    <field colspan="4" name="menus"/>
-                    <field colspan="4" name="domain"/>
-                    <field colspan="4" name="context"/>
-                    <field name="limit"/>
-                    <field name="auto_refresh"/>
-                    <newline/>
-                    <field name="view_mode"/>
-                    <field name="filter"/>                    
-                    <field name="view_id"/>
-                    <field name="search_view_id"/>                    
+                    <notebook colspan="4">
+                    	<page string="General Settings">
+		                    <field colspan="4" name="view_ids">
+		                        <form string="Views">
+		                            <field colspan="4" name="sequence"/>
+		                            <field name="view_mode"/>
+		                            <field domain="[('type', '=', view_mode)]" name="view_id"/>
+		                        </form>
+		                        <tree string="Views">
+		                            <field name="sequence"/>
+		                            <field name="view_mode"/>
+		                            <field name="view_id"/>
+		                        </tree>
+		                    </field>
+		                    <field colspan="4" name="default_user_ids"/>
+		                    <field colspan="4" name="menus"/>
+		                    <field colspan="4" name="domain"/>
+		                    <field colspan="4" name="context"/>
+		                    <field name="limit"/>
+		                    <field name="auto_refresh"/>
+		                    <newline/>
+		                    <field name="view_mode"/>
+		                    <field name="filter"/>                    
+		                    <field name="view_id"/>
+		                    <field name="search_view_id"/>
+		                </page>
+		                <page string="Security">
+		                	<separator colspan="4" string="Select Groups" />
+		                	<field name="groups_id" nolabel="1" colspan="4" />
+		                </page>
+	                </notebook>                   
                 </form>
             </field>
         </record>

From 1941f33e65f6948039392d6f11ed8d2d3a91811e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 17:10:55 +0530
Subject: [PATCH 48/59] [IMP]: Minor improvement in crm state help and
 timesheet search view

bzr revid: rpa@tinyerp.com-20091125114055-csoknmoc6yyit9ak
---
 addons/crm/crm.py                                     | 6 ++++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index e893e601d66..4b246a0665b 100755
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -512,8 +512,10 @@ class crm_case(osv.osv):
         'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1),
         'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
-                                  help='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\'.'),
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \nWhen the case is over, the state is set to \'Done\'.\
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'ref' : fields.reference('Reference', selection=_links_get, size=128),
         'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 2ea871eaab0..512fce48765 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -175,15 +175,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
-                   <group col='6' colspan='4'>
+                   <group col='8' colspan='4'>
+	                   <filter icon="terp-partner" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheet"/>
+	                   <filter icon="terp-crm" string="My departments timesheets"  domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
+						<separator orientation="vertical"/>
                        <field name="state">
                            <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
                            <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                        </field>
                        <field name="name" select='1'/>
                        <field name="user_id" select="1" widget="selection">
-                           <filter icon="gtk-execute" domain="[('user_id','=',uid)]" help="My Timesheet"/>
-                           <filter icon="gtk-execute" domain="[('user_id', 'child_of', [uid])]" help="My Departments Timesheet"/>
                        </field>                       
                    </group>
                </search>

From 864a09a03188b90f88567a8e2f0ee1b32eecd0d5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 18:37:25 +0530
Subject: [PATCH 49/59] [IMP]: hr_holidays: Improvements in holidays & Removed
 extra menus

bzr revid: rpa@tinyerp.com-20091125130725-x7q27au4d664z5yu
---
 addons/hr_holidays/hr_view.xml | 180 +++++++++------------------------
 1 file changed, 46 insertions(+), 134 deletions(-)

diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index c28664b146e..9aa266a1c5b 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -2,7 +2,8 @@
 <openerp>
     <data>
 
-        <!-- Holidays -->
+        <!-- Holidays: Leave Request -->
+
         <record model="ir.ui.view" id="edit_holiday_new">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
@@ -20,7 +21,6 @@
                             <field name="number_of_days_temp"/>
                             <field name="manager_id"/>
                             <field name="notes" colspan="4"/>
-
                             <newline/>
                             <field name="state" select="1" colspan="2"/>
                             <group colspan="2">
@@ -36,7 +36,8 @@
             </field>
         </record>
 
-        <!-- Holidays -->
+        <!-- Holidays: Allocation Request -->
+        
         <record model="ir.ui.view" id="allocation_leave_new">
             <field name="name">Allocation Request</field>
             <field name="model">hr.holidays</field>
@@ -49,7 +50,6 @@
                     <field name="number_of_days_temp"/>
                     <notebook colspan="4">
                         <page string="General">
-
                             <field name="manager_id"/>
                             <field name="notes" colspan="4"/>
                             <newline/>
@@ -67,7 +67,8 @@
             </field>
         </record>
 
-        <!-- Holidays -->
+        <!-- Holidays: Company Allocation -->
+        
         <record model="ir.ui.view" id="allocation_company_new">
             <field name="name">Company Allocation</field>
             <field name="model">hr.holidays</field>
@@ -81,7 +82,6 @@
                     <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                     <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                     <field name="number_of_days_temp"/>
-
                     <notebook colspan="4">
                         <page string="General">
                             <field name="manager_id"/>
@@ -106,7 +106,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Employee Leaves">
+                <tree string="Leaves">
                     <field name="name"/>
                     <field name="employee_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
@@ -121,52 +121,68 @@
 
 
         <menuitem
-            name="Holidays Management"
+          name="Holidays Management"
             parent="hr.menu_hr_root"
             id="menu_open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
+        	<field name="name">Leave Request(s)</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="domain">[('type','=','remove')]</field>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-
-        <menuitem
-            name="New Holidays Request"
+		
+ 	<record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_holiday"/>
+        <field name="act_window_id" ref="open_ask_holidays"/>
+    </record>    
+    
+    <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="edit_holiday_new"/>
+        <field name="act_window_id" ref="open_ask_holidays"/>
+    </record>   
+    
+     <menuitem
+          name="Holidays Requests"
             parent="menu_open_ask_holidays"
             id="menu_open_ask_holidays_new"
             action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="open_allocation_holidays">
+        	<field name="name">Allocation Request(s)</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="context">{'type':'add'}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new" />
         </record>
-
-        <menuitem
-            name="New Allocation Request"
+		
+	<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_holiday"/>
+        <field name="act_window_id" ref="open_allocation_holidays"/>
+    </record>    
+    
+    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="allocation_company_new"/>
+        <field name="act_window_id" ref="open_allocation_holidays"/>
+    </record>   
+    
+     <menuitem
+          name="Allocation Requests"
             parent="menu_open_ask_holidays"
             id="menu_open_allocation_holidays"
             action="open_allocation_holidays"/>
 
-        <record model="ir.actions.act_window" id="open_company_allocation">
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="view_id" ref="allocation_company_new" />
-            <field name="context">{'allocation_type':'company'}</field>
-        </record>
-
-        <menuitem
-            name="Leaves Management"
-            parent="menu_open_ask_holidays"
-            id="menu_open_company_allocation"
-            action="open_company_allocation"
-            groups="hr.group_hr_manager"/>
-
         <!-- holidays status -->
         <record model="ir.ui.view" id="edit_holiday_status_form">
             <field name="name">hr.holidays.status.form</field>
@@ -201,6 +217,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+        
         <menuitem
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
@@ -230,111 +247,6 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_all_holiday">
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-        <menuitem name="All Leave Requests"
-            parent="menu_open_ask_holidays"
-            id="menu_action_all_holiday"
-            action="action_all_holiday"
-            groups="hr.group_hr_manager"/>
-
-        <record model="ir.actions.act_window" id="action_my_holiday">
-            <field name="name">My Leave Requests</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" groups="base.group_extended" />
-
-        <record model="ir.actions.act_window" id="action_my_holiday_draft">
-            <field name="name">My Draft Leave Request</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_my_holiday_waiting">
-            <field name="name">My Awaiting Confirmation Leave Requests</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_my_holiday_validate">
-            <field name="name">My Validated Leave Requests</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_my_holiday_refuse">
-            <field name="name">My Refused Leave Requests</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_departments_my_holiday">
-            <field name="name">My Department's Leave Requests</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id', 'child_of', [uid])]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-        <menuitem parent="menu_open_ask_holidays" id="menu_action_my_departments_holiday" action="action_departments_my_holiday" groups="base.group_extended"/>
-
-
-        <record model="ir.actions.act_window" id="action_my_departments_holiday_waiting">
-            <field name="name">Leave Requests to Validate</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id', 'child_of', [uid]), ('state','=','confirm')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-
-
-        <record model="ir.actions.act_window" id="action_holiday_waiting">
-            <field name="name">Requests Awaiting for Validation</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','confirm')]</field>
-            <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_hr_holidays_filter"/>
-        </record>
-
 
     <!--  Shortcuts -->
         <act_window name="My Holiday Requests"

From 458e0979cbd05d225d5c8b16dd2afd8ece04f89c Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 19:25:15 +0530
Subject: [PATCH 50/59] [IMP] Base : Partner address layout improved

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

bzr revid: jvo@tinyerp.com-20091125135515-bfehe4h2f0tloeuz
---
 bin/addons/base/res/partner/partner_view.xml | 60 +++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 5e27beb97cc..16c30e267c0 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -94,21 +94,23 @@
                     <field name="name" select="1"/>
                     <field domain="[('domain', '=', 'contact')]" name="title"/>
                     <field name="function"/>
-                    <field name="type" select="2"/>
-                    <field name="street" select="2"/>
-                    <field name="street2"/>
                     <newline/>
-                    <field name="zip" select="2"/>
-                    <field name="city" select="2"/>
-                    <newline/>
-                    <field completion="1" name="country_id" select="1"/>
-                    <field name="state_id" select="2"/>
-                    <newline/>
-                    <field name="phone" select="2"/>
-                    <field name="fax"/>
-                    <newline/>
-                    <field name="mobile" select="2"/>
-                    <field name="email" select="2" widget="email"/>
+                      <group string="Postal Address" colspan="2" col="2">
+                        <field name="type" select="2" />
+                        <field name="street" select="2"/>
+                        <field name="street2"/>
+                        <field name="zip" select="2"/>
+                        <field name="city" select="2"/>
+                        <field name="country_id" select="2" completion="1"/>
+                        <field name="state_id" select="2"/>
+                      </group>
+                      <group string="Communication" colspan="2" col="2">
+                        <field name="phone"/>
+                        <field name="fax"/>
+                        <field name="mobile" select="2"/>
+                        <field name="email"  select="2" widget="email"/>
+                     </group>
+                    
                 </form>
             </field>
         </record>
@@ -259,21 +261,23 @@
                                     <field name="name" select="2"/>
                                     <field domain="[('domain', '=', 'contact')]" name="title" string="Type"/>
                                     <field name="function"/>
-                                    <field name="type" select="2"/>
-                                    <field name="street" select="2"/>
-                                    <field name="street2"/>
                                     <newline/>
-                                    <field name="zip" select="2"/>
-                                    <field name="city" select="2"/>
-                                    <newline/>
-                                    <field completion="1" name="country_id" select="2"/>
-                                    <field name="state_id" select="2"/>
-                                    <newline/>
-                                    <field name="phone"/>
-                                    <field name="fax"/>
-                                    <newline/>
-                                    <field name="mobile"/>
-                                    <field name="email" select="2" widget="email"/>
+                                      <group string="Postal Address" colspan="2" col="4">
+                                        <field name="type" select="2" colspan="4"/>
+                                        <field name="street" select="2" colspan="4"/>
+                                        <field name="street2" colspan="4"/>
+                                        <field name="zip" select="2"/>
+                                        <field name="city" select="2"/>
+                                        <field name="country_id" select="2" completion="1"/>
+                                        <field name="state_id" select="2"/>
+                                     </group>
+                                     <group string="Communication" colspan="2" col="2">
+                                        <field name="phone"/>
+                                        <field name="mobile"/>
+                                        <field name="fax"/>
+                                        <field name="email" select="2" widget="email"/>
+                                     </group>
+                                    
                                 </form>
                                 <tree string="Partner Contacts">
                                     <field name="name"/>

From 7c769cf4bdceb51ff278e2c2c2fd8779b035e356 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 19:28:00 +0530
Subject: [PATCH 51/59] [IMP] Base_contact: Layout improvements

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

bzr revid: jvo@tinyerp.com-20091125135800-5v61d3411zypz51p
---
 addons/base_contact/base_contact_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 9fb957258be..3667024a39f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -325,7 +325,8 @@
         <field name="inherit_id" ref="base.view_partner_address_form1"/>
         <field name='type'>form</field>
         <field name='arch' type='xml'>
-            <field name="email" position="replace">
+            <group string="Communication" colspan="2" col="2" position="after">
+			<newline/>
                 <field name="job_ids" mode="tree,form" colspan="4">
                     <tree string="Contacts" editable="top">
                         <field name="contact_id"/>
@@ -344,7 +345,7 @@
                         <field name="email" widget="email"/>
                     </form>
                 </field>
-            </field>
+            </group>
         </field>
     </record>
 	

From 29b9fd5f25f53e5ea03994de483fff8c7b75b50d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Wed, 25 Nov 2009 15:30:58 +0100
Subject: [PATCH 52/59] [IMP] _defaults: allow to pass directly the value
 instead of a lambda

bzr revid: chs@tinyerp.com-20091125143058-upa8zaz6gwo27685
---
 bin/osv/orm.py | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index e417d6371c7..04d493ce95e 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1596,7 +1596,11 @@ class orm_memory(orm_template):
         # get the default values for the inherited fields
         for f in fields_list:
             if f in self._defaults:
-                value[f] = self._defaults[f](self, cr, uid, context)
+                if callable(self._defaults[f]):
+                    value[f] = self._defaults[f](self, cr, uid, context)
+                else:
+                    value[f] = self._defaults[f]
+
             fld_def = ((f in self._columns) and self._columns[f]) \
                     or ((f in self._inherit_fields) and self._inherit_fields[f][2]) \
                     or False
@@ -1897,7 +1901,11 @@ class orm(orm_template):
 
                             # initialize it
                             if not create and k in self._defaults:
-                                default = self._defaults[k](self, cr, 1, {})
+                                if callable(self._defaults[k]):
+                                    default = self._defaults[k](self, cr, 1, context)
+                                else:
+                                    default = self._defaults[k]
+
                                 ss = self._columns[k]._symbol_set
                                 query = 'UPDATE "%s" SET "%s"=%s' % (self._table, k, ss[0])
                                 cr.execute(query, (ss[1](default),))
@@ -1983,7 +1991,11 @@ class orm(orm_template):
                             if f.required and f_pg_notnull == 0:
                                 # set the field to the default value if any
                                 if k in self._defaults:
-                                    default = self._defaults[k](self, cr, 1, {})
+                                    if callable(self._defaults[k]):
+                                        default = self._defaults[k](self, cr, 1, context)
+                                    else:
+                                        default = self._defaults[k]
+
                                     if (default is not None):
                                         ss = self._columns[k]._symbol_set
                                         query = 'UPDATE "%s" SET "%s"=%s WHERE "%s" is NULL' % (self._table, k, ss[0], k)
@@ -2164,7 +2176,11 @@ class orm(orm_template):
         # get the default values defined in the object
         for f in fields_list:
             if f in self._defaults:
-                value[f] = self._defaults[f](self, cr, uid, context)
+                if callable(self._defaults[f]):
+                    value[f] = self._defaults[f](self, cr, uid, context)
+                else:
+                    value[f] = self._defaults[f]
+
             fld_def = ((f in self._columns) and self._columns[f]) \
                     or ((f in self._inherit_fields) and self._inherit_fields[f][2]) \
                     or False
@@ -3130,7 +3146,11 @@ class orm(orm_template):
             default = {}
         if 'state' not in default:
             if 'state' in self._defaults:
-                default['state'] = self._defaults['state'](self, cr, uid, context)
+                if callable(self._defaults['state']):
+                    default['state'] = self._defaults['state'](self, cr, uid, context)
+                else:
+                    default['state'] = self._defaults['state']
+
         data = self.read(cr, uid, [id], context=context)[0]
         fields = self.fields_get(cr, uid, context=context)
         trans_data=[]

From f2c19896da9cff4a039a15f9bd1c6c095c6f78b3 Mon Sep 17 00:00:00 2001
From: fabian <fabian@fabian-openerp>
Date: Wed, 25 Nov 2009 17:37:18 +0100
Subject: [PATCH 53/59] [FIX] Bugfix domain_force [IMP] Added customer_id field
 in view

bzr revid: fabian@fabian-openerp-20091125163718-5q7064l71c8hv101
---
 bin/addons/base/ir/ir_rule.py                | 9 +++++----
 bin/addons/base/res/partner/partner_view.xml | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 5d93287dfff..20ceb737601 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -106,14 +106,15 @@ 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}
-            if rule.operand.startswith('user.') and rule.operand.count('.') > 1:
-                #Need to check user.field.field1.field2(if field  is False,it will break the chain)
-                op = rule.operand[5:]
-                rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False'
             
             if rule.domain_force:
                 res[rule.id] = eval(rule.domain_force, eval_user_data)
             else:
+                if rule.operand.startswith('user.') and rule.operand.count('.') > 1:
+                    #Need to check user.field.field1.field2(if field  is False,it will break the chain)
+                    op = rule.operand[5:]
+                    rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False'
+
                 if rule.operator in ('in', 'child_of'):
                     dom = eval("[('%s', '%s', [%s])]" % (rule.field_id.name, rule.operator,
                         eval(rule.operand,eval_user_data)), eval_user_data)
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 16c30e267c0..c03bd94128f 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -298,6 +298,7 @@
                             <field name="website" widget="url"/>
                             <field name="date" select="2"/>
                             <field name="parent_id"/>
+                            <field name="company_id" groups="base.group_extended" widget="selection"/>
                             <newline/>
                         </page>
                         <page string="History">

From 67797b4a46b92daebae590f6dde4f8bd47ce70e4 Mon Sep 17 00:00:00 2001
From: fabian <fabian@fabian-openerp>
Date: Wed, 25 Nov 2009 17:39:58 +0100
Subject: [PATCH 54/59] [IMP] Added multi company rules

bzr revid: fabian@fabian-openerp-20091125163958-m6bokw0m6wbvp3s4
---
 addons/product/security/product_security.xml | 13 +++++++++++
 addons/project/security/project_security.xml |  8 ++-----
 addons/sale/sale_view.xml                    |  1 +
 addons/sale/security/sale_security.xml       | 24 +++++++++++++++-----
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 7347c61d1bc..1d255aff2c8 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -7,6 +7,19 @@
     </record>
     <record id="group_product_manager" model="res.groups">
         <field name="name">Product / Manager</field>
+
+    </record>
+</data>
+<data noupdate="0">
+
+     <record model="ir.rule.group" id="product_comp_rule_group">
+        <field name="name" >Product multi-company</field>
+        <field name="model_id" search="[('model','=','product.product')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record id="product_comp_rule" model="ir.rule">
+        <field name="rule_group" ref="product_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="group_product_variant" model="res.groups">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f9b8af20541..cb5bad3db9c 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -25,10 +25,8 @@
 		<field name="global" eval="True"/>
 	</record>
 	<record model="ir.rule" id="project_comp_rule">
-		<field name="field_id" search="[('model','=','project.project'),('name','=','company_id')]" model="ir.model.fields"/>
-		<field name="operator">child_of</field>
-		<field name="operand">user.company_id.id</field>
 		<field name="rule_group" ref="project_comp_rule_group"/>
+        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
 	</record>
 
 	<record model="ir.rule.group" id="task_comp_rule_group">
@@ -37,9 +35,7 @@
 		<field name="global" eval="True"/>
 	</record>
 	<record model="ir.rule" id="task_comp_rule">
-		<field name="field_id" search="[('model','=','project.task'),('name','=','company_id')]" model="ir.model.fields"/>
-		<field name="operator">child_of</field>
-		<field name="operand">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>
 		<field name="rule_group" ref="task_comp_rule_group"/>
 	</record>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 7be63508be2..c8af35d8f52 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,6 +206,7 @@
                             <field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
                             <field name="payment_term" widget="selection"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                            <field name="company_id" groups="base.group_extended" widget="selection"/>
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 9778e607ecf..932dd9ff747 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -2,18 +2,30 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_sale_manager" model="res.groups">
-        <field name="name">Sale / Manager</field>
-    </record>
-    <record id="group_sale_user" model="res.groups">
-        <field name="name">Sale / Salesman</field>
-    </record>
+    	<record id="group_sale_manager" model="res.groups">
+        	<field name="name">Sale / Manager</field>
+    	</record>
+    	<record id="group_sale_user" model="res.groups">
+        	<field name="name">Sale / Salesman</field>
+     	</record>
 
 
 	<record model='ir.ui.menu' id='menu_shop_configuration'>
 		<field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
 	</record>
 
+	<record model="ir.rule.group" id="sale_order_comp_rule_group">
+		<field name="name">Sale Order multi-company</field>
+		<field name="model_id" search="[('model','=','sale.order')]" model="ir.model"/>
+		<field name="global" eval="True"/>
+	</record>
+	<record model="ir.rule" id="sale_order_comp_rule">
+		<field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
+		<field name="rule_group" ref="sale_order_comp_rule_group"/>
+        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+	</record>
+
+	
 
 </data>
 </openerp>

From c2cdc7a56a0327ad1ef00e253079ffe1184d9178 Mon Sep 17 00:00:00 2001
From: fabian <fabian@fabian-openerp>
Date: Wed, 25 Nov 2009 18:17:35 +0100
Subject: [PATCH 55/59] [IMP] Added group to multicompany users

bzr revid: fabian@fabian-openerp-20091125171735-scluytlq387s4va7
---
 addons/multi_company/multi_company_demo.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index c7d08e9b1fb..2ceb2fe00e9 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -58,30 +58,35 @@
 			<field name="name">OpenERP Editor</field>
 			<field name="login">editor_demo</field>
 			<field name="company_id" ref="res_company_oerp_editor"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
 		</record>
 		<record id="res_users_sales_demo_us" model="res.users">
 			<field name="password">sales_demo_us</field>
 			<field name="name">OpenERP Salesman US</field>
 			<field name="login">sales_demo_us</field>
 			<field name="company_id" ref="res_company_oerp_us"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
 		</record>
 		<record id="res_users_sales_demo_be" model="res.users">
 			<field name="password">sales_demo_be</field>
 			<field name="name">OpenERP Salesman BE</field>
 			<field name="login">sales_demo_be</field>
 			<field name="company_id" ref="res_company_oerp_be"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
 		</record>
 		<record id="res_users_sales_demo_in" model="res.users">
 			<field name="password">sales_demo_in</field>
 			<field name="name">OpenERP Salesman IN</field>
 			<field name="login">sales_demo_in</field>
 			<field name="company_id" ref="res_company_oerp_in"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
 		</record>
 		<record id="res_users_odoo_demo" model="res.users">
 			<field name="password">odoo_demo</field>
 			<field name="name">Odoo</field>
 			<field name="login">odoo_demo</field>
 			<field name="company_id" ref="res_company_odoo"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
 		</record>
 
 

From 54e1058afd0a70fd48e94319d581836cc7efcade Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 25 Nov 2009 18:50:23 +0100
Subject: [PATCH 56/59] [imp] multi-company groups

bzr revid: fp@tinyerp.com-20091125175023-hmi1msewn9ehb3f2
---
 addons/account/account_invoice_view.xml       |   4 +-
 addons/account/account_view.xml               |  76 +--
 addons/account/company_view.xml               |  64 +--
 addons/account/partner_view.xml               |   4 +-
 addons/account/security/account_security.xml  |  67 +--
 .../account_analytic_default_view.xml         |   4 +-
 .../crossovered_budget_view.xml               | 444 +++++++--------
 .../security/account_budget_security.xml      |   4 +-
 addons/account_followup/followup_demo.xml     |   6 +-
 addons/account_followup/followup_view.xml     |   5 +-
 addons/account_voucher/voucher_view.xml       | 520 +++++++++---------
 .../document/security/document_security.xml   |   8 +-
 addons/hr/hr_department_view.xml              |  48 +-
 addons/hr/hr_view.xml                         |   2 +-
 .../hr_timesheet_sheet_view.xml               |   2 +-
 addons/membership/demo_data.xml               | 324 +++++------
 addons/membership/membership_demo.xml         | 324 +++++------
 addons/multi_company/multi_company_demo.xml   | 324 +++++------
 addons/multi_company/multi_company_view.xml   |   4 +-
 addons/product/product_view.xml               |  22 +-
 addons/product/security/product_security.xml  |   2 +-
 addons/project/security/project_security.xml  |  48 +-
 addons/sale/security/sale_security.xml        |  40 +-
 addons/stock/security/stock_security.xml      |  12 +-
 24 files changed, 1178 insertions(+), 1180 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d979262cb4a..84fb0684e3c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -117,7 +117,7 @@
                     <field name="name"/>
                     <field name="type"/>
                     <field name="number"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="partner_id" groups="base.group_user"/>
                     <field name="amount_untaxed" sum="Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
@@ -197,7 +197,7 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line)" widget="selection" groups="base.group_multi_company"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <newline/>
                             <field name="payment_term" widget="selection"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index cafaa769163..d034b508f46 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -16,7 +16,7 @@
                     <field name="code" select="1"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="end_journal_period_id"/>
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
@@ -75,7 +75,7 @@
                     <field name="code" select="1"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="fiscalyear_id"/>
                     <field name="special"/>
                     <separator colspan="4" string="States"/>
@@ -122,7 +122,7 @@
                     <field name="name" select="1" colspan="4"/>
                     <field name="code" select="1"/>
                     <field name="parent_id"/>
-                    <field name="company_id" select="2" widget="selection"/>
+                    <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
                     <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
@@ -168,7 +168,7 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="company_id" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_currency_id"/>
                     <field name="type" invisible="1"/>
                 </tree>
@@ -242,7 +242,7 @@
                 <tree string="Account Journal">
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -270,7 +270,7 @@
                             <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="user_id" groups="base.group_extended"/>
-                            <field name="company_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
                             <newline/>
                             <field name="centralisation"/>
                             <field name="group_invoice_lines"/>
@@ -460,7 +460,7 @@
                     <field name="code" select="1"/>
                     <field name="sequence"/>
                     <field name="sign"/>
-		    
+            
                     <field name="close_method"/>
                     <field name="partner_account"/>
                 </form>
@@ -540,7 +540,7 @@
                 <form string="Account Tax Code">
                     <field name="name" select="1"/>
                     <field name="code" select="1"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection"  groups="base.group_multi_company"/>
                     <field name="notprintable"/>
                     <field name="parent_id" select="1"/>
                     <field name="sign"/>
@@ -587,7 +587,7 @@
                 <form string="Account Tax">
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
-                        <field name="company_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="description" select="1"/>
                         <field name="active" select="2"/>
                         <field name="tax_group" select="1"/>
@@ -714,8 +714,8 @@
 
                             <field name="debit" select="2"/>
                             <field name="credit" select="2"/>
-							<field name="company_id" required="1"/>
-							
+                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -795,22 +795,22 @@
                 </form>
             </field>
         </record>
-		
-		<record id="view_account_move_line_filter" model="ir.ui.view">
+        
+        <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">account.move.line.select</field>
             <field name="model">account.move.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move Lines">
-                	<group col='10' colspan='4'>
-                		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                    <group col='10' colspan='4'>
+                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
                         <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
-						<separator orientation="vertical"/>
-						<field name="date" select='1'/>
-						<field name="account_id" select='1'/>
-						<field name="partner_id" select='1'/>
-						<field name="balance" string="Debit/Credit" select='1'/>
-                	</group>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="account_id" select='1'/>
+                        <field name="partner_id" select='1'/>
+                        <field name="balance" string="Debit/Credit" select='1'/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -869,7 +869,7 @@
                     <field name="name" select="1" readonly="True"/>
                     <field name="period_id" select="2"/>
                     <field name="journal_id" select="1"/>
-                    <field name="company_id" required="1"/>
+                    <field name="company_id" required="1" groups="base.group_multi_company"/>
                     <field name="date" select="1"/>
                     <field name="ref" select="1"/>
                     <field name="to_check" select="2"/>
@@ -887,8 +887,8 @@
 
                             <field name="debit" select="1"/>
                             <field name="credit" select="1"/>
-							<field name="date" select="1"/>
-							
+                            <field name="date" select="1"/>
+                            
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -933,21 +933,21 @@
             </field>
         </record>
 
-		<record id="view_account_move_filter" model="ir.ui.view">
+        <record id="view_account_move_filter" model="ir.ui.view">
             <field name="name">account.move.select</field>
             <field name="model">account.move</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move">
-                	<group col='8' colspan='4'>
-                		<filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
                         <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
-						<separator orientation="vertical"/>
-						<field name="date" select='1'/>
-						<field name="name" select='1'/>
-						<field name="journal_id" select='1'/>
-						<field name="partner_id" select='1'/>
-                	</group>
+                        <separator orientation="vertical"/>
+                        <field name="date" select='1'/>
+                        <field name="name" select='1'/>
+                        <field name="journal_id" select='1'/>
+                        <field name="partner_id" select='1'/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -1107,7 +1107,7 @@
                     <field name="period_id"/>
                     <field name="journal_id"/>
                     <field name="state"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -1719,7 +1719,7 @@
                 <form string="Generate Chart of Accounts from a Chart Template">
                     <separator col="4" colspan="4" string="Generate Chart of Accounts from a Chart Template"/>
                     <label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
-                    <field name="company_id"  widget="selection"/>
+                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
                     <field name ="code_digits" />
                     <field name="chart_template_id"/>
                     <field name ="seq_journal" />
@@ -1764,11 +1764,11 @@
                     <field name="balance" operator="+"/>
                 </graph>
             </field>
-     	</record>
+         </record>
 
-     	<!-- Fiscal Position Templates -->
+         <!-- Fiscal Position Templates -->
 
-		<record id="view_account_position_template_form" model="ir.ui.view">
+        <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>
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 29eedc72b0c..1d4571e0d4f 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record model="ir.ui.view" id="view_company_inherit_form">
-			<field name="name">res.company.form.inherit</field>
-			<field name="inherit_id" ref="base.view_company_form"/>
-			<field name="model">res.company</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-			 <notebook>
+    <data>
+        <record model="ir.ui.view" id="view_company_inherit_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <notebook>
                 <page string="Overdue Payments" position="inside">
-                	<separator string="Overdue Payments Message" colspan="4"/>
-                	<field name="overdue_msg" nolabel="1" colspan ="4"/>
+                    <separator string="Overdue Payments Message" colspan="4"/>
+                    <field name="overdue_msg" nolabel="1" colspan ="4"/>
                 </page>
              </notebook>
             </field>
-		</record>
-		
-		<!-- Wizard for Configuration of Overdue Payments -->
-		
-		<record model="ir.ui.view" id="wizard_company_setup_form">
-			<field name="name">wizard.company.setup.form</field>
-			<field name="model">wizard.company.setup</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Overdue Payment Report Message">
-					<field name="company_id" select="1" on_change="onchange_company_id(company_id)"/>
-					<field name="partner_id" select="1" readonly="1"/>
-					<separator string="Message" colspan="4"/>
-					<field name="overdue_msg" nolabel="1" colspan="4"/>
-					<group col="2" colspan="4">
-						<button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
-						<button icon="gtk-ok" name="action_create" string="Create" type="object"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        </record>
+        
+        <!-- Wizard for Configuration of Overdue Payments -->
+        
+        <record model="ir.ui.view" id="wizard_company_setup_form">
+            <field name="name">wizard.company.setup.form</field>
+            <field name="model">wizard.company.setup</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Overdue Payment Report Message">
+                    <field name="company_id" select="1" on_change="onchange_company_id(company_id)"  groups="base.group_multi_company"/>
+                    <field name="partner_id" select="1" readonly="1"/>
+                    <separator string="Message" colspan="4"/>
+                    <field name="overdue_msg" nolabel="1" colspan="4"/>
+                    <group col="2" colspan="4">
+                        <button icon="gtk-cancel" special="cancel" type="object" name="action_cancel" string="Cancel"/>
+                        <button icon="gtk-ok" name="action_create" string="Create" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
         <record id="action_wizard_company_setup_form" model="ir.actions.act_window">
             <field name="name">Overdue Payment Report Message</field>
@@ -52,5 +52,5 @@
             <field name="note">Specify The Message for the Overdue Payment Report.</field>
             <field name="action_id" ref="action_wizard_company_setup_form"/>
         </record>
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 0eed352095a..c8513b6ee36 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <field name="name" select="1"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="note" colspan="4"/>
                     <field name="tax_ids" colspan="4" widget="one2many_list">
@@ -42,7 +42,7 @@
             <field name="arch" type="xml">
                 <tree string="Fiscal Position">
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index bdd7e25bc99..529f287e602 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -12,35 +12,36 @@
         <field name="name">Finance / Manager</field>
     </record>
 
-	<record id="menu_finance_configuration" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_configuration" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_finance_reporting" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_reporting" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_manager')])]" 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_legal_statement" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_finance_invoice" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
-	</record>
+    <record id="menu_finance_invoice" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
+    </record>
 
-	<record id="menu_automatic_reconcile" model="ir.ui.menu">
-		<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-	</record>
+    <record id="menu_automatic_reconcile" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('group_account_user')])]" 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')])]" 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')])]" name="groups_id"/>
+    </record>
 
-	<record id="account_move_comp_rule_group" model="ir.rule.group">
+    <record id="account_move_comp_rule_group" model="ir.rule.group">
             <field name="name">Account Entry</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.move')]"/>
+            <field model="ir.model" ref="model_account_move"/>
             <field eval="True" name="global"/>
     </record>
+
     <record id="account_move_comp_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
@@ -48,21 +49,21 @@
         <field name="rule_group" ref="account_move_comp_rule_group"/>
     </record>
 
-	<record id="account_move_line_comp_rule_group" model="ir.rule.group">
+    <record id="account_move_line_comp_rule_group" model="ir.rule.group">
             <field name="name">Entry lines</field>
-            <field model="ir.model" name="model_id" search="[('model','=','account.move.line')]"/>
+            <field model="ir.model" ref="model_account_move_line"/>
             <field eval="True" name="global"/>
     </record>
+
     <record id="account_move_line_comp_rule" model="ir.rule">
         <field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
         <field name="operator">child_of</field>
         <field name="operand">user.company_id.id</field>
         <field name="rule_group" ref="account_move_line_comp_rule_group"/>
     </record>
-        
     <record id="journal_period_comp_rule_group" model="ir.rule.group">
         <field name="name">Journal Period</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.journal.period')]"/>
+        <field model="ir.model" ref="model_account_journal_period"/>
         <field eval="True" name="global"/>
     </record>
     <record id="journal_period_comp_rule" model="ir.rule">
@@ -74,7 +75,7 @@
     
     <record id="journal_comp_rule_group" model="ir.rule.group">
         <field name="name">Journal multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.journal')]"/>
+        <field model="ir.model" ref="model_account_journal"/>
         <field eval="True" name="global"/>
     </record>
     <record id="journal_comp_rule" model="ir.rule">
@@ -86,7 +87,7 @@
     
     <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
+        <field model="ir.model" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
     </record>
     <record id="analytic_journal_comp_rule" model="ir.rule">
@@ -97,7 +98,7 @@
     </record>
     <record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.analytic.journal')]"/>
+        <field model="ir.model" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
     </record>
     
@@ -110,7 +111,7 @@
     
     <record id="period_comp_rule_group" model="ir.rule.group">
         <field name="name">Period multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.period')]"/>
+        <field model="ir.model" ref="model_account_period"/>
         <field eval="True" name="global"/>
     </record>
     <record id="period_comp_rule" model="ir.rule">
@@ -123,7 +124,7 @@
     
     <record id="fiscal_year_comp_rule_group" model="ir.rule.group">
         <field name="name">Fiscal year multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.fiscalyear')]"/>
+        <field model="ir.model" ref="model_account_fiscalyear"/>
         <field eval="True" name="global"/>
     </record>
     <record id="fiscal_year_comp_rule" model="ir.rule">
@@ -135,7 +136,7 @@
     
     <record id="account_comp_rule_group" model="ir.rule.group">
         <field name="name">Account multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.account')]"/>
+        <field model="ir.model" ref="model_account_account"/>
         <field eval="True" name="global"/>
     </record>
     <record id="account_comp_rule" model="ir.rule">
@@ -147,7 +148,7 @@
     
     <record id="tax_comp_rule_group" model="ir.rule.group">
         <field name="name">Tax multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.tax')]"/>
+        <field model="ir.model" ref="model_account_tax"/>
         <field eval="True" name="global"/>
     </record>
     <record id="tax_comp_rule" model="ir.rule">
@@ -159,7 +160,7 @@
     
     <record id="tax_code_comp_rule_group" model="ir.rule.group">
         <field name="name">Tax code multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.tax.code')]"/>
+        <field model="ir.model" ref="model_account_tax_code"/>
         <field eval="True" name="global"/>
     </record>
     <record id="tax_code_comp_rule" model="ir.rule">
@@ -171,7 +172,7 @@
     
     <record id="invoice_comp_rule_group" model="ir.rule.group">
         <field name="name">Invoice multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.invoice')]"/>
+        <field model="ir.model" ref="model_account_invoice"/>
         <field eval="True" name="global"/>
     </record>
     <record id="invoice_comp_rule" model="ir.rule">
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 0c477984351..6f8cbadb878 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -12,7 +12,7 @@
                     <field name="product_id" select="2"/>
                     <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
-                    <field name="company_id" select="2"/>
+                    <field name="company_id" select="2" groups="base.group_multi_company"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                 </tree>
@@ -30,7 +30,7 @@
                     <field name="product_id" select="2"/>
                     <field name="partner_id" select="2"/>
                     <field name="user_id" select="2"/>
-                    <field name="company_id" select="2" widget="selection"/>
+                    <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                 </form>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 423ecfbdbc2..a8d03be8aa4 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	<!-- budget form and tree view from account module *********************************** -->
-		<record id="action_account_budget_post_tree" model="ir.actions.act_window">
+    <data>
+    <!-- budget form and tree view from account module *********************************** -->
+        <record id="action_account_budget_post_tree" model="ir.actions.act_window">
             <field name="name">Budgets</field>
             <field name="res_model">account.budget.post</field>
             <field name="view_type">tree</field>
@@ -19,10 +19,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Budgetary Position">
-                    <field name="sequence"/>                
+                    <field name="sequence"/>
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -61,240 +61,240 @@
         <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
 
 
-		<record model="ir.ui.view" id="view_budget_post_form">
-			<field name="name">account.budget.post.form.inherit</field>
-			<field name="model">account.budget.post</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Budgetary Position">
-					<field name="name" select="1"/>
-					<field name="code" select="1"/>
-					<field name="company_id"/>
-                    <field name="sequence" select="2"/>					
-					<notebook colspan="4">
-						<page string="Accounts">
-							<field name="account_ids" colspan="4" nolabel="1"/>
-						</page>
-						<page string="Dotations">
-							<button string="Spread" name="%(wizard_budget_spread)d" type="action" icon="gtk-fullscreen"/>
-							<field name="dotation_ids" colspan="4" nolabel="1"/>
-						</page>
+        <record model="ir.ui.view" id="view_budget_post_form">
+            <field name="name">account.budget.post.form.inherit</field>
+            <field name="model">account.budget.post</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Budgetary Position">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="company_id"  groups="base.group_multi_company"/>
+                    <field name="sequence" select="2"/>                    
+                    <notebook colspan="4">
+                        <page string="Accounts">
+                            <field name="account_ids" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Dotations">
+                            <button string="Spread" name="%(wizard_budget_spread)d" type="action" icon="gtk-fullscreen"/>
+                            <field name="dotation_ids" colspan="4" nolabel="1"/>
+                        </page>
 
-						<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" />
-									<!--<field name="general_budget_id" operator="+" />-->
-									<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"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-									<field name="practical_amount" select="1"/>
-									<field name="theoritical_amount"/>
-									<field name="percentage"/>
-								</tree>
-								<form string="Budget Lines">
-									<field name="crossovered_budget_id"/>
-									<field name="analytic_account_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-									<field name="practical_amount" select="1"/>
-									<field name="theoritical_amount"/>
-									<field name="percentage"/>
-								</form>
-							</field>
-						</page>
-					</notebook>
-				</form>
-			</field>
-		</record>
+                        <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" />
+                                    <!--<field name="general_budget_id" operator="+" />-->
+                                    <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"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                    <field name="practical_amount" select="1"/>
+                                    <field name="theoritical_amount"/>
+                                    <field name="percentage"/>
+                                </tree>
+                                <form string="Budget Lines">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="analytic_account_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                    <field name="practical_amount" select="1"/>
+                                    <field name="theoritical_amount"/>
+                                    <field name="percentage"/>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="crossovered_budget_view_form">
-			<field name="name">crossovered.budget.view.form</field>
-			<field name="model">crossovered.budget</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Budget">
-							<field name="name" colspan="1" select="1"/>
-							<field name="code" colspan="1" select="1" />
-							<field name="creating_user_id" />
-							<field name="validating_user_id" readonly="True"/>
-							<field name="date_from" select="2"/>
-							<field name="date_to" select="2"/>
-							<field name="crossovered_budget_line" colspan="4" nolabel="1">
-								<tree string="Budget Lines">
-									<field name="analytic_account_id"/>
-									<field name="general_budget_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-									<field name="practical_amount"/>
-									<field name="theoritical_amount"/>
-									<field name="percentage"/>
-								</tree>
-								<form string="Budget Lines">
-									<field name="analytic_account_id" select="1"/>
-									<field name="general_budget_id" select="1"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date" select="1"/>
-									<field name="planned_amount" select="1"/>
-								</form>
-							</field>
-							<field name="state" select="1"/>
-							<group col="4" colspan="2">
+        <record model="ir.ui.view" id="crossovered_budget_view_form">
+            <field name="name">crossovered.budget.view.form</field>
+            <field name="model">crossovered.budget</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Budget">
+                            <field name="name" colspan="1" select="1"/>
+                            <field name="code" colspan="1" select="1" />
+                            <field name="creating_user_id" />
+                            <field name="validating_user_id" readonly="True"/>
+                            <field name="date_from" select="2"/>
+                            <field name="date_to" select="2"/>
+                            <field name="crossovered_budget_line" colspan="4" nolabel="1">
+                                <tree string="Budget Lines">
+                                    <field name="analytic_account_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                    <field name="practical_amount"/>
+                                    <field name="theoritical_amount"/>
+                                    <field name="percentage"/>
+                                </tree>
+                                <form string="Budget Lines">
+                                    <field name="analytic_account_id" select="1"/>
+                                    <field name="general_budget_id" select="1"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date" select="1"/>
+                                    <field name="planned_amount" select="1"/>
+                                </form>
+                            </field>
+                            <field name="state" select="1"/>
+                            <group col="4" colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
                                 <button string="Validate" 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 string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
-							</group>
+                                <!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
+                            </group>
 
-				</form>
-			</field>
-		</record>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="crossovered_budget_view_tree">
-			<field name="name">crossovered.budget.view.tree</field>
-			<field name="model">crossovered.budget</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Budget">
-					<field name="name" colspan="1" select="1"/>
-					<field name="code" colspan="1" select="1" />
-					<field name="state"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-				</tree>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="crossovered_budget_view_tree">
+            <field name="name">crossovered.budget.view.tree</field>
+            <field name="model">crossovered.budget</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Budget">
+                    <field name="name" colspan="1" select="1"/>
+                    <field name="code" colspan="1" select="1" />
+                    <field name="state"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_crossovered_budget_view">
-			<field name="name">Budget</field>
-			<field name="res_model">crossovered.budget</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crossovered_budget_view_tree"/>
-		</record>
-		<menuitem parent="next_id_31"
-			id="menu_act_crossovered_budget_view"
-			action="act_crossovered_budget_view" />
+        <record model="ir.actions.act_window" id="act_crossovered_budget_view">
+            <field name="name">Budget</field>
+            <field name="res_model">crossovered.budget</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crossovered_budget_view_tree"/>
+        </record>
+        <menuitem parent="next_id_31"
+            id="menu_act_crossovered_budget_view"
+            action="act_crossovered_budget_view" />
 
-		<record model="ir.ui.view" id="view_crossovered_budget_line_tree">
-			<field name="name">crossovered.budget.line.tree</field>
-			<field name="model">crossovered.budget.lines</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Budget Lines">
-					<field name="analytic_account_id"/>
-					<field name="general_budget_id"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-					<field name="paid_date"/>
-					<field name="planned_amount"/>
-					<field name="practical_amount" select="1"/>
-					<field name="theoritical_amount"/>
-					<field name="percentage"/>
-				</tree>
-			</field>
-		</record>
-		<record model="ir.ui.view" id="view_crossovered_budget_line_form">
-			<field name="name">crossovered.budget.line.form</field>
-			<field name="model">crossovered.budget.lines</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Budget Lines">
-					<field name="crossovered_budget_id"/>
-					<field name="analytic_account_id" select="1"/>
-					<field name="general_budget_id" select="1"/>
-					<field name="date_from"/>
-					<field name="date_to"/>
-					<field name="paid_date" select="1"/>
-					<field name="planned_amount" select="1"/>
-					<field name="practical_amount" select="1"/>
-					<field name="theoritical_amount"/>
-					<field name="percentage"/>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_crossovered_budget_line_tree">
+            <field name="name">crossovered.budget.line.tree</field>
+            <field name="model">crossovered.budget.lines</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Budget Lines">
+                    <field name="analytic_account_id"/>
+                    <field name="general_budget_id"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="paid_date"/>
+                    <field name="planned_amount"/>
+                    <field name="practical_amount" select="1"/>
+                    <field name="theoritical_amount"/>
+                    <field name="percentage"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_crossovered_budget_line_form">
+            <field name="name">crossovered.budget.line.form</field>
+            <field name="model">crossovered.budget.lines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Budget Lines">
+                    <field name="crossovered_budget_id"/>
+                    <field name="analytic_account_id" select="1"/>
+                    <field name="general_budget_id" select="1"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <field name="paid_date" select="1"/>
+                    <field name="planned_amount" select="1"/>
+                    <field name="practical_amount" select="1"/>
+                    <field name="theoritical_amount"/>
+                    <field name="percentage"/>
+                </form>
+            </field>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_crossovered_budget_lines_view">
-			<field name="name">Budget Lines</field>
-			<field name="res_model">crossovered.budget.lines</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="view_crossovered_budget_line_tree"/>
-		</record>
+        <record model="ir.actions.act_window" id="act_crossovered_budget_lines_view">
+            <field name="name">Budget Lines</field>
+            <field name="res_model">crossovered.budget.lines</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_crossovered_budget_line_tree"/>
+        </record>
 
-		<menuitem parent="menu_action_account_budget_post_tree"
-			id="menu_act_crossovered_budget_lines_view"
-			action="act_crossovered_budget_lines_view" />
+        <menuitem parent="menu_action_account_budget_post_tree"
+            id="menu_act_crossovered_budget_lines_view"
+            action="act_crossovered_budget_lines_view" />
 
-		<!--  Shortcuts -->
-		<act_window name="Budget Lines"
-			domain="[('analytic_account_id', '=', active_id)]"
-			res_model="crossovered.budget.lines"
-			src_model="account.analytic.account"
-			id="act_account_analytic_account_cb_lines"/>
+        <!--  Shortcuts -->
+        <act_window name="Budget Lines"
+            domain="[('analytic_account_id', '=', active_id)]"
+            res_model="crossovered.budget.lines"
+            src_model="account.analytic.account"
+            id="act_account_analytic_account_cb_lines"/>
 
 
-		<record model="ir.ui.view" id="view_account_analytic_account_form_inherit_cci">
-			<field name="name">account.analytic.account.form.inherot.cci</field>
-			<field name="type">form</field>
-			<field name="model">account.analytic.account</field>
-			<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Budget Lines">
-							<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
-								<tree string="Budget Lines" editable="top">
-									<field name="crossovered_budget_id"/>
-									<field name="general_budget_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-								</tree>
-								<form string="Budget Lines">
-									<field name="crossovered_budget_id"/>
-									<field name="general_budget_id"/>
-									<field name="date_from"/>
-									<field name="date_to"/>
-									<field name="paid_date"/>
-									<field name="planned_amount"/>
-								</form>
-								<graph type="bar" string="Lines">
-									<field name="general_budget_id" />
-									<!--<field name="analytic_account_id" operator="+"/>-->
-									<field name="planned_amount" operator="+"/>
-									<field group="True" name="analytic_account_id"/>
-								</graph>
-							</field>
-					</page>
-				</notebook>
-			</field>
-		</record>
-		<!-- moved from account module -->
-		 <!--Budget -->
+        <record model="ir.ui.view" id="view_account_analytic_account_form_inherit_cci">
+            <field name="name">account.analytic.account.form.inherot.cci</field>
+            <field name="type">form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Budget Lines">
+                            <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
+                                <tree string="Budget Lines" editable="top">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                </tree>
+                                <form string="Budget Lines">
+                                    <field name="crossovered_budget_id"/>
+                                    <field name="general_budget_id"/>
+                                    <field name="date_from"/>
+                                    <field name="date_to"/>
+                                    <field name="paid_date"/>
+                                    <field name="planned_amount"/>
+                                </form>
+                                <graph type="bar" string="Lines">
+                                    <field name="general_budget_id" />
+                                    <!--<field name="analytic_account_id" operator="+"/>-->
+                                    <field name="planned_amount" operator="+"/>
+                                    <field group="True" name="analytic_account_id"/>
+                                </graph>
+                            </field>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        <!-- moved from account module -->
+         <!--Budget -->
         <!--<report
- 			id="account_analytic_budget_print"
-			string="Print Budget"
-			model="account.analytic.budget.post"
-			name="account.analytic.budget.print"
-			rml="account/project/report/account_analytic_budget_report.rml"
-			auto="False"
-			menu="False"/>-->
+             id="account_analytic_budget_print"
+            string="Print Budget"
+            model="account.analytic.budget.post"
+            name="account.analytic.budget.print"
+            rml="account/project/report/account_analytic_budget_report.rml"
+            auto="False"
+            menu="False"/>-->
 
-	</data>
+    </data>
 </openerp>
 
 
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index 2cc983619c3..69fc92eb16a 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
     <record id="budget_post_comp_rule_group" model="ir.rule.group">
         <field name="name">Budget post multi-company</field>
-        <field model="ir.model" name="model_id" search="[('model','=','account.budget.post')]"/>
+        <field name="model_id" model="model_account_budget_post"/>
         <field eval="True" name="global"/>
     </record>
     <record id="budget_post_comp_rule" model="ir.rule">
@@ -16,4 +16,4 @@
         <field name="operand">False</field>
         <field name="rule_group" ref="budget_post_comp_rule_group"/>
     </record>
-</data></openerp>
\ No newline at end of file
+</data></openerp>
diff --git a/addons/account_followup/followup_demo.xml b/addons/account_followup/followup_demo.xml
index c38084fac24..2bf627de9b7 100644
--- a/addons/account_followup/followup_demo.xml
+++ b/addons/account_followup/followup_demo.xml
@@ -22,7 +22,7 @@ Exception made if there was a mistake of ours, it seems that the following amoun
 Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).10.68.94.39.
 
 Best Regards,
-			</field>
+</field>
         </record>
 
         <record id="demo_followup_line2" model="account_followup.followup.line">
@@ -44,7 +44,7 @@ If there is a problem with paying invoice that we are not aware of, do not hesit
 Details of due payments is printed below.
 
 Best Regards,
-			</field>
+</field>
         </record>
 
         <record id="demo_followup_line3" model="account_followup.followup.line">
@@ -65,7 +65,7 @@ I trust that this action will prove unnecessary and details of due payments is p
 In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
 
 Best Regards,
-			</field>
+</field>
         </record>
 
     </data>
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index ecc73f34954..841ce2c9f18 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -45,7 +45,7 @@
             <field name="arch" type="xml">
                 <form string="Follow-Up">
                     <field name="name" select="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
+                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                     <separator colspan="4" string="Description"/>
                     <field colspan="4" name="description" nolabel="1" select="1"/>
                     <separator colspan="4" string="Lines"/>
@@ -61,8 +61,7 @@
             <field name="arch" type="xml">
                 <tree string="Follow-Up">
                     <field name="name"/>
-                    <field name="company_id"/>
-                    <field name="description"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 11858390e97..172aedd92ec 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -1,264 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-		<record model="ir.ui.view" id="view_voucher_tree">
-			<field name="name">account.voucher.tree</field>
-			<field name="model">account.voucher</field>
-			<field name="type">tree</field>
-			<field name="arch" type="xml">
-				<tree string="Vouchers">
-					<field name="name"/>
-					<field name="journal_id"/>
-					<field name="account_id" />
-					<field name="amount"/>
-					<field name="date"/>
-					<field name="period_id"/>
-				</tree>
-			</field>
-		</record>
-		
-		<record model="ir.ui.view" id="view_voucher_form">
-			<field name="name">account.voucher.form</field>
-			<field name="model">account.voucher</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Voucher">
-				    <group col="6" colspan="4">
-				        <field name="name" select="1" colspan="4"/>
-				        <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
-					    <field name="account_id" select="2" on_change="onchange_account(account_id)"/>
-					    <field name="type" select="2" on_change="onchange_journal(journal_id,type)"/>
-					    <field name="number"/>
-					    <!--field name="amount" select="1" invisible="1"/-->
-					    <!--field name="partner_id" select="2"/-->
-					</group>
-					<notebook colspan="4">
-						<page string="Entry Lines">
-							<field name="payment_ids" colspan="4" nolabel="1" height="275">
-								<tree string="Voucher Lines" editable="top">
-									<field name="account_analytic_id"/>
-									<field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type)"/>
-									<field name="account_id"/>
-									<field name="name"/>
-									<field name="type"/>
-									<field name="amount"/>
-									<field name="ref"/>
-								</tree>
-							</field>
-							<separator string="Narration" colspan="4"/>
-							<field name="narration" colspan="4" nolabel="1"/>
-							<group col="6" colspan="6">
-								<field name="state"/>
-								<button name="open_voucher" string="Pro-forma" states="draft" type="object" icon="gtk-open"/>
-								<button name="proforma_voucher" string="Create" states="proforma" type="object"  icon="gtk-go-forward"/>
-								<button name="cancel_voucher" string="Cancel" states="draft,proforma,posted" type="object" icon="gtk-cancel"/>
-								<button name="action_cancel_draft" states="cancel" type="object" string="Set to Draft" icon="gtk-convert"/>
-							</group>
-						</page>
-						<page string="Other Info">
-							<field name="company_id" select="1" widget="selection"/>
-							<field name="currency_id" select="1" />
-							<field name="period_id"/>
-							<field name="date" select="1"/>
-							<!--field name="reference_type" select="2" nolabel="1" size="0"/>
-							<field name="reference" select="1" nolabel="1"/-->
-							<separator string="General Entries" colspan="4"/>
-							<field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
-						</page>
-					</notebook>
-				</form>
-			</field>
-		</record>
-		
-		<record model="ir.actions.act_window" id="action_voucher_list">
-			<field name="name">Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries" 
-		id="menu_action_voucher_list" action="action_voucher_list"/>
-		
-		<!--  Receipt Vouchers -->
-		<record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-			<field name="name">Receipt Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','like','rec_voucher')]</field>
-			<field name="context">{'type':'rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers" 
-		id="menu_action_receipt_vou_voucher_list" action="action_receipt_vou_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
-			<field name="name">Cash Receipt</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','rec_voucher')]</field>
-			<field name="context">{'type':'rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts" 
-		id="menu_action_receipt_cashreceipt_voucher_list" action="action_receipt_cashreceipt_voucher_list"/>
-				
-		<record model="ir.actions.act_window" id="action_view_cash_rec_voucher_form">
-			<field name="name">Cash Receipt Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','rec_voucher')]</field>
-			<field name="context">{'type':'rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts/New Cash Receipt" id="menu_action_view_cash_rec_voucher_form" action="action_view_cash_rec_voucher_form"/>
-		
-		<record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
-			<field name="name">Bank Receipt</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','bank_rec_voucher')]</field>
-			<field name="context">{'type':'bank_rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts" 
-		id="menu_action_receipt_bakreceipt_voucher_list" action="action_receipt_bakreceipt_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_bank_rec_voucher_form">
-			<field name="name">Bank Receipt Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','bank_rec_voucher')]</field>
-			<field name="context">{'type':'bank_rec_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts/New Bank Receipt" id="menu_action_view_bank_rec_voucher_form" action="action_view_bank_rec_voucher_form"/>
-		
-		
-		<!--  End Receipt Vouchers -->
-		
-		
-		<!-- Payment Vouchers -->
-		<record model="ir.actions.act_window" id="action_payments_voucher_list">
-			<field name="name">Payment Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','like','pay_voucher')]</field>
-			<field name="context">{'type':'pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers" 
-		id="menu_action_payments_voucher_list" action="action_payments_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
-			<field name="name">Payment Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','pay_voucher')]</field>
-			<field name="context">{'type':'pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments" 
-		id="menu_action_payments_cashpay_voucher_list" action="action_payments_cashpay_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_cash_pay_voucher_form">
-			<field name="name">Cash Payment Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','pay_voucher')]</field>
-			<field name="context">{'type':'pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments/New Cash Payment" id="menu_action_view_cash_pay_voucher_form" action="action_view_cash_pay_voucher_form"/>
-	
-		<record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
-			<field name="name">Payment Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-			<field name="domain">[('type','=','bank_pay_voucher')]</field>
-			<field name="context">{'type':'bank_pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments" 
-		id="menu_action_payments_bankpay_voucher_list" action="action_payments_bankpay_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_bank_pay_voucher_form">
-			<field name="name">Bank Payment Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','bank_pay_voucher')]</field>
-			<field name="context">{'type':'bank_pay_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments/New Bank Payment" id="menu_action_view_bank_pay_voucher_form" action="action_view_bank_pay_voucher_form"/>
-		
-		<!-- End Payment Vouchers -->
-		
-		<!-- Other Voucher Enries -->
-		<record model="ir.actions.act_window" id="action_other_voucher_list">
-			<field name="name">Other Vouchers</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" eval="view_voucher_tree"/>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers" 
-		id="menu_action_other_voucher_list" action="action_other_voucher_list"/>
-		
-		<record model="ir.actions.act_window" id="action_view_cont_voucher_form">
-			<field name="name">Contra Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','cont_voucher')]</field>
-			<field name="context">{'type':'cont_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Contra Voucher" id="menu_action_view_cont_voucher_form" action="action_view_cont_voucher_form"/>
-		<record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
-			<field name="name">Journal Sale Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','journal_sale_vou')]</field>
-			<field name="context">{'type':'journal_sale_vou'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" action="action_view_jour_sale_voucher_form"/>
-		<record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
-			<field name="name">Journal Purchase Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','journal_pur_voucher')]</field>
-			<field name="context">{'type':'journal_pur_voucher'}</field>
-		</record>
-		<menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" action="action_view_jour_pur_voucher_form"/>
-		
-		<record model="ir.actions.act_window" id="action_view_jour_voucher_form">
-			<field name="name">Journal Voucher</field>
-			<field name="res_model">account.voucher</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form,tree</field>
-			<field name="view_id" eval="view_voucher_form"/>
-			<field name="domain">[('type','=','journal_voucher')]</field>
-			<field name="context">{'type':'journal_voucher'}</field>
-		</record>
-		<menuitem 
-			name="Financial Management/Voucher Entries/Other Vouchers/Journal Voucher" 
-			id="menu_action_view_jour_voucher_form" 
-			action="action_view_jour_voucher_form"/>
+    <data>
+        <record model="ir.ui.view" id="view_voucher_tree">
+            <field name="name">account.voucher.tree</field>
+            <field name="model">account.voucher</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Vouchers">
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="account_id" />
+                    <field name="amount"/>
+                    <field name="date"/>
+                    <field name="period_id"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_voucher_form">
+            <field name="name">account.voucher.form</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Voucher">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" colspan="4"/>
+                        <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="account_id" select="2" on_change="onchange_account(account_id)"/>
+                        <field name="type" select="2" on_change="onchange_journal(journal_id,type)"/>
+                        <field name="number"/>
+                        <!--field name="amount" select="1" invisible="1"/-->
+                        <!--field name="partner_id" select="2"/-->
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Entry Lines">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="275">
+                                <tree string="Voucher Lines" editable="top">
+                                    <field name="account_analytic_id"/>
+                                    <field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type)"/>
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="amount"/>
+                                    <field name="ref"/>
+                                </tree>
+                            </field>
+                            <separator string="Narration" colspan="4"/>
+                            <field name="narration" colspan="4" nolabel="1"/>
+                            <group col="6" colspan="6">
+                                <field name="state"/>
+                                <button name="open_voucher" string="Pro-forma" states="draft" type="object" icon="gtk-open"/>
+                                <button name="proforma_voucher" string="Create" states="proforma" type="object"  icon="gtk-go-forward"/>
+                                <button name="cancel_voucher" string="Cancel" states="draft,proforma,posted" type="object" icon="gtk-cancel"/>
+                                <button name="action_cancel_draft" states="cancel" type="object" string="Set to Draft" icon="gtk-convert"/>
+                            </group>
+                        </page>
+                        <page string="Other Info">
+                            <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                            <field name="currency_id" select="1" />
+                            <field name="period_id"/>
+                            <field name="date" select="1"/>
+                            <!--field name="reference_type" select="2" nolabel="1" size="0"/>
+                            <field name="reference" select="1" nolabel="1"/-->
+                            <separator string="General Entries" colspan="4"/>
+                            <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="action_voucher_list">
+            <field name="name">Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries" 
+        id="menu_action_voucher_list" action="action_voucher_list"/>
+        
+        <!--  Receipt Vouchers -->
+        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
+            <field name="name">Receipt Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','like','rec_voucher')]</field>
+            <field name="context">{'type':'rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers" 
+        id="menu_action_receipt_vou_voucher_list" action="action_receipt_vou_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
+            <field name="name">Cash Receipt</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','rec_voucher')]</field>
+            <field name="context">{'type':'rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts" 
+        id="menu_action_receipt_cashreceipt_voucher_list" action="action_receipt_cashreceipt_voucher_list"/>
+                
+        <record model="ir.actions.act_window" id="action_view_cash_rec_voucher_form">
+            <field name="name">Cash Receipt Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','rec_voucher')]</field>
+            <field name="context">{'type':'rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Cash Receipts/New Cash Receipt" id="menu_action_view_cash_rec_voucher_form" action="action_view_cash_rec_voucher_form"/>
+        
+        <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
+            <field name="name">Bank Receipt</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','bank_rec_voucher')]</field>
+            <field name="context">{'type':'bank_rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts" 
+        id="menu_action_receipt_bakreceipt_voucher_list" action="action_receipt_bakreceipt_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_bank_rec_voucher_form">
+            <field name="name">Bank Receipt Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','bank_rec_voucher')]</field>
+            <field name="context">{'type':'bank_rec_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Receipt Vouchers/Bank Receipts/New Bank Receipt" id="menu_action_view_bank_rec_voucher_form" action="action_view_bank_rec_voucher_form"/>
+        
+        
+        <!--  End Receipt Vouchers -->
+        
+        
+        <!-- Payment Vouchers -->
+        <record model="ir.actions.act_window" id="action_payments_voucher_list">
+            <field name="name">Payment Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','like','pay_voucher')]</field>
+            <field name="context">{'type':'pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers" 
+        id="menu_action_payments_voucher_list" action="action_payments_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
+            <field name="name">Payment Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','pay_voucher')]</field>
+            <field name="context">{'type':'pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments" 
+        id="menu_action_payments_cashpay_voucher_list" action="action_payments_cashpay_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_cash_pay_voucher_form">
+            <field name="name">Cash Payment Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','pay_voucher')]</field>
+            <field name="context">{'type':'pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Cash Payments/New Cash Payment" id="menu_action_view_cash_pay_voucher_form" action="action_view_cash_pay_voucher_form"/>
+    
+        <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
+            <field name="name">Payment Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+            <field name="domain">[('type','=','bank_pay_voucher')]</field>
+            <field name="context">{'type':'bank_pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments" 
+        id="menu_action_payments_bankpay_voucher_list" action="action_payments_bankpay_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_bank_pay_voucher_form">
+            <field name="name">Bank Payment Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','bank_pay_voucher')]</field>
+            <field name="context">{'type':'bank_pay_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Payment Vouchers/Bank Payments/New Bank Payment" id="menu_action_view_bank_pay_voucher_form" action="action_view_bank_pay_voucher_form"/>
+        
+        <!-- End Payment Vouchers -->
+        
+        <!-- Other Voucher Enries -->
+        <record model="ir.actions.act_window" id="action_other_voucher_list">
+            <field name="name">Other Vouchers</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_voucher_tree"/>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers" 
+        id="menu_action_other_voucher_list" action="action_other_voucher_list"/>
+        
+        <record model="ir.actions.act_window" id="action_view_cont_voucher_form">
+            <field name="name">Contra Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','cont_voucher')]</field>
+            <field name="context">{'type':'cont_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers/Contra Voucher" id="menu_action_view_cont_voucher_form" action="action_view_cont_voucher_form"/>
+        <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
+            <field name="name">Journal Sale Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','journal_sale_vou')]</field>
+            <field name="context">{'type':'journal_sale_vou'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form" action="action_view_jour_sale_voucher_form"/>
+        <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
+            <field name="name">Journal Purchase Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','journal_pur_voucher')]</field>
+            <field name="context">{'type':'journal_pur_voucher'}</field>
+        </record>
+        <menuitem name="Financial Management/Voucher Entries/Other Vouchers/Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form" action="action_view_jour_pur_voucher_form"/>
+        
+        <record model="ir.actions.act_window" id="action_view_jour_voucher_form">
+            <field name="name">Journal Voucher</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" eval="view_voucher_form"/>
+            <field name="domain">[('type','=','journal_voucher')]</field>
+            <field name="context">{'type':'journal_voucher'}</field>
+        </record>
+        <menuitem 
+            name="Financial Management/Voucher Entries/Other Vouchers/Journal Voucher" 
+            id="menu_action_view_jour_voucher_form" 
+            action="action_view_jour_voucher_form"/>
 
-		</data>
+        </data>
 </openerp>
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 4cef19d31ed..52b4e6de990 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,12 +3,12 @@
 <data noupdate="0">
 
     <record id="group_document_manager" model="res.groups">
-		<field name="name">Document / Manager</field>
+        <field name="name">Document / Manager</field>
     </record>
 
-	<record id="menu_document_configuration" model="ir.ui.menu">
-		<field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
-	</record>
+    <record id="menu_document_configuration" model="ir.ui.menu">
+        <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 7c6b2bccc9e..fe65d988237 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -3,20 +3,20 @@
     <data>
 
         <!--
-	======================
-	department
-	======================
-	-->
+    ======================
+    department
+    ======================
+    -->
         <record id="view_department_form" model="ir.ui.view">
             <field name="name">hr.department.form</field>
             <field name="model">hr.department</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department">
-					<field colspan="4" name="name" select="1"/>
-					<field name="company_id" select="1" widget="selection"/>
-					<field name="parent_id" select="2"/>
-					<field colspan="4" name="manager_id" select="1"/>
+                    <field colspan="4" name="name" select="1"/>
+                    <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                    <field name="parent_id" select="2"/>
+                    <field colspan="4" name="manager_id" select="1"/>
                     <notebook colspan="4" >
                         <page string="Members">
                             <field colspan="4" name="member_ids" nolabel="1"/>
@@ -36,7 +36,7 @@
             <field name="arch" type="xml">
                 <tree string="Companies">
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="manager_id"/>
                 </tree>
             </field>
@@ -59,21 +59,21 @@
 
         <!-- res.users inherit -->
         <record model="ir.ui.view" id="view_users_form_inherit">
-			<field name="name">res.users.form</field>
-			<field name="type">form</field>
-			<field name="model">res.users</field>
-			<field name="inherit_id" ref="base.view_users_form"/>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Departements Informations">
-						<separator string="Managers" colspan="4"/>
-						<field name="parent_id" nolabel="1" colspan="4"/>
-						<separator string="Subordinates" colspan="4"/>
-						<field name="child_ids" nolabel="1" colspan="4"/>
-					</page>
-				</notebook>
-			</field>
-		</record>
+            <field name="name">res.users.form</field>
+            <field name="type">form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Departements Informations">
+                        <separator string="Managers" colspan="4"/>
+                        <field name="parent_id" nolabel="1" colspan="4"/>
+                        <separator string="Subordinates" colspan="4"/>
+                        <field name="child_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </notebook>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 8771ccf1e0b..7b459b21c47 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,7 +27,7 @@
                     <group colspan="4" col="4">
                         <field name="name" select="1"/>
                         <field name="active" select="1"/>
-                        <field name="company_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="user_id"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 87abe7ce82e..ea3317e10e2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -87,7 +87,7 @@
                     <field name="user_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
diff --git a/addons/membership/demo_data.xml b/addons/membership/demo_data.xml
index 6689ced1eb4..c900bb4eacc 100644
--- a/addons/membership/demo_data.xml
+++ b/addons/membership/demo_data.xml
@@ -1,181 +1,181 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data noupdate="1">
-		<record id="account_tax_testingtax0" model="account.tax">
-			<field eval="1" name="sequence"/>
-			<field eval="1.0" name="base_sign"/>
-			<field eval="&quot;true&quot;" name="applicable_type"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field eval="&quot;# price_unit
+    <data noupdate="1">
+        <record id="account_tax_testingtax0" model="account.tax">
+            <field eval="1" name="sequence"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="&quot;true&quot;" name="applicable_type"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="&quot;# price_unit
 # address : res.partner.address object or False
 # product : product.product object or False
 
 result = price_unit * 0.10&quot;" name="python_compute_inv"/>
-			<field eval="1.0" name="ref_tax_sign"/>
-			<field eval="&quot;percent&quot;" name="type"/>
-			<field eval="1.0" name="ref_base_sign"/>
-			<field eval="&quot;vat&quot;" name="tax_group"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="&quot;testing tax&quot;" name="name"/>
-			<field eval="0.069" name="amount"/>
-			<field eval="&quot;# price_unit
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field eval="&quot;percent&quot;" name="type"/>
+            <field eval="1.0" name="ref_base_sign"/>
+            <field eval="&quot;vat&quot;" name="tax_group"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="&quot;testing tax&quot;" name="name"/>
+            <field eval="0.069" name="amount"/>
+            <field eval="&quot;# price_unit
 # address : res.partner.address object or False
 # product : product.product object or None
 # partner : res.partner object or None
 
 result = price_unit * 0.10&quot;" name="python_compute"/>
-			<field eval="1.0" name="tax_sign"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="base.EUR" model="res.currency"/>
-	</data>
-	<data>
-		<record id="product_template_0" model="product.template">
-			<field name="list_price" eval="150.0"/>
-			<field name="name" eval="&quot;Membership 2006&quot;"/>
-			<field name="categ_id" eval="7"/>
-			<field name="type" eval="&quot;service&quot;"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_product_0" model="product.product">
-			<field eval="&quot;2007-03-31&quot;" name="membership_date_to"/>
-			<field eval="&quot;1&quot;" name="membership"/>
-			<field eval="&quot;m2006&quot;" name="default_code"/>
-			<field eval="&quot;2006-01-01&quot;" name="membership_date_from"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="150.0" name="price_margin"/>
-			<field name="product_tmpl_id" ref="product_template_0"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_template_1" model="product.template">
-			<field name="list_price" eval="160.0"/>
-			<field name="name" eval="&quot;Membership 2007&quot;"/>
-			<field name="categ_id" eval="7"/>
-			<field name="type" eval="&quot;service&quot;"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_product_1" model="product.product">
-			<field eval="&quot;2008-03-31&quot;" name="membership_date_to"/>
-			<field eval="&quot;1&quot;" name="membership"/>
-			<field eval="&quot;m2007&quot;" name="default_code"/>
-			<field eval="&quot;2007-01-01&quot;" name="membership_date_from"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="160.0" name="price_margin"/>
-			<field name="product_tmpl_id" ref="product_template_1"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_template_2" model="product.template">
-			<field name="list_price" eval="165.0"/>
-			<field name="name" eval="&quot;Membership 2008&quot;"/>
-			<field name="categ_id" eval="7"/>
-			<field name="type" eval="&quot;service&quot;"/>
-		</record>
-	</data>
-	<data>
-		<record id="product_product_2" model="product.product">
-			<field eval="&quot;2009-03-31&quot;" name="membership_date_to"/>
-			<field eval="&quot;1&quot;" name="membership"/>
-			<field eval="&quot;m2008&quot;" name="default_code"/>
-			<field eval="&quot;2008-01-01&quot;" name="membership_date_from"/>
-			<field eval="&quot;1&quot;" name="active"/>
-			<field eval="165.0" name="price_margin"/>
-			<field name="product_tmpl_id" ref="product_template_2"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="account_invoice_0" model="account.invoice">
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="address_contact_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;none&quot;" name="reference_type"/>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;paid&quot;" name="state"/>
-			<field eval="&quot;out_invoice&quot;" name="type"/>
-			<field eval="&quot;2006-02-10&quot;" name="date_invoice"/>
-		</record>
-		<record id="account_invoice_line_membership0" model="account.invoice.line">
-			<field name="uos_id" ref="product.product_uom_unit"/>
-			<field eval="&quot;Membership 2006&quot;" name="name"/>
-			<field name="invoice_id" ref="account_invoice_0"/>
-			<field eval="150.0" name="price_unit"/>
-			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-			<field name="product_id" ref="product_product_0"/>
-			<field eval="1.0" name="quantity"/>
-			<field name="account_id" ref="account.a_sale"/>
-		</record>
-	</data>
+            <field eval="1.0" name="tax_sign"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="base.EUR" model="res.currency"/>
+    </data>
+    <data>
+        <record id="product_template_0" model="product.template">
+            <field name="list_price" eval="150.0"/>
+            <field name="name" eval="&quot;Membership 2006&quot;"/>
+            <field name="categ_id" eval="7"/>
+            <field name="type" eval="&quot;service&quot;"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_product_0" model="product.product">
+            <field eval="&quot;2007-03-31&quot;" name="membership_date_to"/>
+            <field eval="&quot;1&quot;" name="membership"/>
+            <field eval="&quot;m2006&quot;" name="default_code"/>
+            <field eval="&quot;2006-01-01&quot;" name="membership_date_from"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="150.0" name="price_margin"/>
+            <field name="product_tmpl_id" ref="product_template_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_template_1" model="product.template">
+            <field name="list_price" eval="160.0"/>
+            <field name="name" eval="&quot;Membership 2007&quot;"/>
+            <field name="categ_id" eval="7"/>
+            <field name="type" eval="&quot;service&quot;"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_product_1" model="product.product">
+            <field eval="&quot;2008-03-31&quot;" name="membership_date_to"/>
+            <field eval="&quot;1&quot;" name="membership"/>
+            <field eval="&quot;m2007&quot;" name="default_code"/>
+            <field eval="&quot;2007-01-01&quot;" name="membership_date_from"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="160.0" name="price_margin"/>
+            <field name="product_tmpl_id" ref="product_template_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_template_2" model="product.template">
+            <field name="list_price" eval="165.0"/>
+            <field name="name" eval="&quot;Membership 2008&quot;"/>
+            <field name="categ_id" eval="7"/>
+            <field name="type" eval="&quot;service&quot;"/>
+        </record>
+    </data>
+    <data>
+        <record id="product_product_2" model="product.product">
+            <field eval="&quot;2009-03-31&quot;" name="membership_date_to"/>
+            <field eval="&quot;1&quot;" name="membership"/>
+            <field eval="&quot;m2008&quot;" name="default_code"/>
+            <field eval="&quot;2008-01-01&quot;" name="membership_date_from"/>
+            <field eval="&quot;1&quot;" name="active"/>
+            <field eval="165.0" name="price_margin"/>
+            <field name="product_tmpl_id" ref="product_template_2"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="account_invoice_0" model="account.invoice">
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;none&quot;" name="reference_type"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;paid&quot;" name="state"/>
+            <field eval="&quot;out_invoice&quot;" name="type"/>
+            <field eval="&quot;2006-02-10&quot;" name="date_invoice"/>
+        </record>
+        <record id="account_invoice_line_membership0" model="account.invoice.line">
+            <field name="uos_id" ref="product.product_uom_unit"/>
+            <field eval="&quot;Membership 2006&quot;" name="name"/>
+            <field name="invoice_id" ref="account_invoice_0"/>
+            <field eval="150.0" name="price_unit"/>
+            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+            <field name="product_id" ref="product_product_0"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+    </data>
 
-	<data noupdate="1">
-		<record id="account_invoice_1" model="account.invoice">
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="address_contact_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;none&quot;" name="reference_type"/>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;paid&quot;" name="state"/>
-			<field eval="&quot;out_invoice&quot;" name="type"/>
-			<field eval="&quot;2007-01-30&quot;" name="date_invoice"/>
-		</record>
-		<record id="account_invoice_line_membership1" model="account.invoice.line">
-			<field name="uos_id" ref="product.product_uom_unit"/>
-			<field eval="&quot;Membership 2007&quot;" name="name"/>
-			<field name="invoice_id" ref="account_invoice_1"/>
-			<field eval="160.0" name="price_unit"/>
-			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-			<field name="product_id" ref="product_product_1"/>
-			<field eval="1.0" name="quantity"/>
-			<field name="account_id" ref="account.a_sale"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="account_invoice_1" model="account.invoice">
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;none&quot;" name="reference_type"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;paid&quot;" name="state"/>
+            <field eval="&quot;out_invoice&quot;" name="type"/>
+            <field eval="&quot;2007-01-30&quot;" name="date_invoice"/>
+        </record>
+        <record id="account_invoice_line_membership1" model="account.invoice.line">
+            <field name="uos_id" ref="product.product_uom_unit"/>
+            <field eval="&quot;Membership 2007&quot;" name="name"/>
+            <field name="invoice_id" ref="account_invoice_1"/>
+            <field eval="160.0" name="price_unit"/>
+            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+            <field name="product_id" ref="product_product_1"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+    </data>
 
-	<data noupdate="1">
-		<record id="account_invoice_2" model="account.invoice">
-			<field name="partner_id" ref="base.res_partner_agrolait"/>
-			<field name="account_id" ref="account.a_recv"/>
-			<field name="address_contact_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;none&quot;" name="reference_type"/>
-			<field name="journal_id" ref="account.sales_journal"/>
-			<field name="company_id" ref="base.main_company"/>
-			<field name="currency_id" ref="base.EUR"/>
-			<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-			<field eval="&quot;paid&quot;" name="state"/>
-			<field eval="&quot;out_invoice&quot;" name="type"/>
-			<field eval="&quot;2007-11-30&quot;" name="date_invoice"/>
-		</record>
-		<record id="account_invoice_line_membership1" model="account.invoice.line">
-			<field name="uos_id" ref="product.product_uom_unit"/>
-			<field eval="&quot;Membership 2007&quot;" name="name"/>
-			<field name="invoice_id" ref="account_invoice_2"/>
-			<field eval="160.0" name="price_unit"/>
-			<field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
-			<field name="product_id" ref="product_product_2"/>
-			<field eval="1.0" name="quantity"/>
-			<field name="account_id" ref="account.a_sale"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="account_invoice_2" model="account.invoice">
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="address_contact_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;none&quot;" name="reference_type"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+            <field eval="&quot;paid&quot;" name="state"/>
+            <field eval="&quot;out_invoice&quot;" name="type"/>
+            <field eval="&quot;2007-11-30&quot;" name="date_invoice"/>
+        </record>
+        <record id="account_invoice_line_membership1" model="account.invoice.line">
+            <field name="uos_id" ref="product.product_uom_unit"/>
+            <field eval="&quot;Membership 2007&quot;" name="name"/>
+            <field name="invoice_id" ref="account_invoice_2"/>
+            <field eval="160.0" name="price_unit"/>
+            <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/>
+            <field name="product_id" ref="product_product_2"/>
+            <field eval="1.0" name="quantity"/>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+    </data>
 <!--
-	<data>
-		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_2"/>
-	</data>
+    <data>
+        <workflow action="invoice_open" model="account.invoice" ref="account_invoice_2"/>
+    </data>
 
-	<data>
-		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_1"/>
-	</data>
+    <data>
+        <workflow action="invoice_open" model="account.invoice" ref="account_invoice_1"/>
+    </data>
 
 
-	<data>
-		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_0"/>
-	</data>
+    <data>
+        <workflow action="invoice_open" model="account.invoice" ref="account_invoice_0"/>
+    </data>
 -->
 </openerp>
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index 495050398d1..d16c6db68aa 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -1,183 +1,183 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
 <!-- Demo Data for Membership Product -->
-	<record id="member_product_0" model="product.product">
-		<field name="membership">True</field>
-		<field name="membership_date_from">2009-01-01</field>
-		<field name="membership_date_to">2010-06-01</field>
-		<field name="name">Membership Product - 1</field>
-		<field name="list_price">80</field>
-		<field name="categ_id" ref="product.cat1"/>
-		<field name="type">service</field>
-	</record>
-	<record id="member_product_1" model="product.product">
-		<field name="membership">True</field>
-		<field name="membership_date_from">2009-01-01</field>
-		<field name="membership_date_to">2010-08-01</field>
-		<field name="name">Membership Product - 2</field>
-		<field name="categ_id" ref="product.cat1"/>
-		<field name="list_price">80</field>
-		<field name="type">service</field>
-	</record>
+    <record id="member_product_0" model="product.product">
+        <field name="membership">True</field>
+        <field name="membership_date_from">2009-01-01</field>
+        <field name="membership_date_to">2010-06-01</field>
+        <field name="name">Membership Product - 1</field>
+        <field name="list_price">80</field>
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="type">service</field>
+    </record>
+    <record id="member_product_1" model="product.product">
+        <field name="membership">True</field>
+        <field name="membership_date_from">2009-01-01</field>
+        <field name="membership_date_to">2010-08-01</field>
+        <field name="name">Membership Product - 2</field>
+        <field name="categ_id" ref="product.cat1"/>
+        <field name="list_price">80</field>
+        <field name="type">service</field>
+    </record>
 
 
 <!-- Demo data for Accounts -->
-	<record id="account_account_membershipparent" model="account.account">
-		<field name="name">membership</field>
-		<field name="code">Membership-0</field>
-		<field name="company_id" ref="base.main_company"/>
-		<!--<field eval="1" name="sign"/>-->
-		<field eval="1" name="active"/>
-		<field name="type">view</field>
-		<field eval="0" name="reconcile"/>
-		<field name="user_type" ref="account.account_type_root"/>
-	</record>
-	<record id="account_account_membershipaccount0" model="account.account">
-		<field name="name">membership account</field>
-		<field name="code">Membership-1254</field>
-		<field name="company_id" ref="base.main_company"/>
-		<!--<field eval="1" name="sign"/>-->
-		<field eval="1" name="active"/>
-		<field name="type">other</field>
-		<field eval="1" name="reconcile"/>
-		<field name="user_type" ref="account.account_type_expense"/>
-		<field name="parent_id" ref="account_account_membershipparent"/>
-	</record>
+    <record id="account_account_membershipparent" model="account.account">
+        <field name="name">membership</field>
+        <field name="code">Membership-0</field>
+        <field name="company_id" ref="base.main_company"/>
+        <!--<field eval="1" name="sign"/>-->
+        <field eval="1" name="active"/>
+        <field name="type">view</field>
+        <field eval="0" name="reconcile"/>
+        <field name="user_type" ref="account.account_type_root"/>
+    </record>
+    <record id="account_account_membershipaccount0" model="account.account">
+        <field name="name">membership account</field>
+        <field name="code">Membership-1254</field>
+        <field name="company_id" ref="base.main_company"/>
+        <!--<field eval="1" name="sign"/>-->
+        <field eval="1" name="active"/>
+        <field name="type">other</field>
+        <field eval="1" name="reconcile"/>
+        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="parent_id" ref="account_account_membershipparent"/>
+    </record>
 
 <!-- Demo data for Invoices -->
-	<record id="account_invoice_0" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_8"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">paid</field>
-		<field name="type">out_invoice</field>
-	</record>
-	<record id="account_invoice_1" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_9"/>
-		<field name="partner_id" ref="base.res_partner_2"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">open</field>
-		<field name="type">out_invoice</field>
-	</record>
-	<record id="account_invoice_2" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_zen"/>
-		<field name="partner_id" ref="base.res_partner_3"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">cancel</field>
-		<field name="type">out_invoice</field>
-	</record>
-	<record id="account_invoice_3" model="account.invoice">
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="company_id" ref="base.main_company"/>
-		<field name="currency_id" ref="base.EUR"/>
-		<field name="address_invoice_id" ref="base.res_partner_address_14"/>
-		<field name="partner_id" ref="base.res_partner_15"/>
-		<field name="date_invoice">2008-05-09</field>
-		<field name="journal_id" ref="account.sales_journal"/>
-		<field name="state">draft</field>
-		<field name="type">out_invoice</field>
-	</record>
+    <record id="account_invoice_0" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_8"/>
+        <field name="partner_id" ref="base.res_partner_agrolait"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">paid</field>
+        <field name="type">out_invoice</field>
+    </record>
+    <record id="account_invoice_1" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_9"/>
+        <field name="partner_id" ref="base.res_partner_2"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">open</field>
+        <field name="type">out_invoice</field>
+    </record>
+    <record id="account_invoice_2" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_zen"/>
+        <field name="partner_id" ref="base.res_partner_3"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">cancel</field>
+        <field name="type">out_invoice</field>
+    </record>
+    <record id="account_invoice_3" model="account.invoice">
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="address_invoice_id" ref="base.res_partner_address_14"/>
+        <field name="partner_id" ref="base.res_partner_15"/>
+        <field name="date_invoice">2008-05-09</field>
+        <field name="journal_id" ref="account.sales_journal"/>
+        <field name="state">draft</field>
+        <field name="type">out_invoice</field>
+    </record>
 
 <!-- Demo data for invoice line -->
-	<record id="account_invoice_line_membershipproduct0" model="account.invoice.line">
-		<field name="name">Membership Product - 1</field>
-		<field name="invoice_id" ref="account_invoice_0"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_0"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
-	<record id="account_invoice_line_membershipproduct1" model="account.invoice.line">
-		<field name="name">Membership Product - 2</field>
-		<field name="invoice_id" ref="account_invoice_1"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_1"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
-	<record id="account_invoice_line_membershipproduct2" model="account.invoice.line">
-		<field name="name">Membership Product - 2</field>
-		<field name="invoice_id" ref="account_invoice_2"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_1"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
-	<record id="account_invoice_line_membershipproduct3" model="account.invoice.line">
-		<field name="name">Membership Product - 2</field>
-		<field name="invoice_id" ref="account_invoice_3"/>
-		<field eval="1.0" name="price_unit"/>
-		<field eval="1.0" name="quantity"/>
-		<field name="account_id" ref="account_account_membershipaccount0"/>
-		<field name="product_id" ref="membership.member_product_1"/>
-		<field name="account_analytic_id" ref="account.analytic_project_2"/>
-	</record>
+    <record id="account_invoice_line_membershipproduct0" model="account.invoice.line">
+        <field name="name">Membership Product - 1</field>
+        <field name="invoice_id" ref="account_invoice_0"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_0"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
+    <record id="account_invoice_line_membershipproduct1" model="account.invoice.line">
+        <field name="name">Membership Product - 2</field>
+        <field name="invoice_id" ref="account_invoice_1"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_1"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
+    <record id="account_invoice_line_membershipproduct2" model="account.invoice.line">
+        <field name="name">Membership Product - 2</field>
+        <field name="invoice_id" ref="account_invoice_2"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_1"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
+    <record id="account_invoice_line_membershipproduct3" model="account.invoice.line">
+        <field name="name">Membership Product - 2</field>
+        <field name="invoice_id" ref="account_invoice_3"/>
+        <field eval="1.0" name="price_unit"/>
+        <field eval="1.0" name="quantity"/>
+        <field name="account_id" ref="account_account_membershipaccount0"/>
+        <field name="product_id" ref="membership.member_product_1"/>
+        <field name="account_analytic_id" ref="account.analytic_project_2"/>
+    </record>
 
 <!-- Demo data for membership line -->
-	<record id="member_line_1" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct0" />
-		<field name="state">paid</field>
-		<field name="partner" ref="base.res_partner_agrolait"/>
-	</record>
-	<record id="member_line_2" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct1" />
-		<field name="state">invoiced</field>
-		<field name="partner" ref="base.res_partner_2"/>
-	</record>
-	<record id="member_line_3" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="date_cancel">2008-08-05</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct2" />
-		<field name="state">canceled</field>
-		<field name="partner" ref="base.res_partner_3"/>
-	</record>
-	<record id="member_line_3" model="membership.membership_line">
-		<field name="date_from">2008-01-01</field>
-		<field name="date_to">2009-08-01</field>
-		<field name="account_invoice_line" ref="account_invoice_line_membershipproduct3" />
-		<field name="state">waiting</field>
-		<field name="partner" ref="base.res_partner_15"/>
-	</record>
+    <record id="member_line_1" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct0" />
+        <field name="state">paid</field>
+        <field name="partner" ref="base.res_partner_agrolait"/>
+    </record>
+    <record id="member_line_2" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct1" />
+        <field name="state">invoiced</field>
+        <field name="partner" ref="base.res_partner_2"/>
+    </record>
+    <record id="member_line_3" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="date_cancel">2008-08-05</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct2" />
+        <field name="state">canceled</field>
+        <field name="partner" ref="base.res_partner_3"/>
+    </record>
+    <record id="member_line_3" model="membership.membership_line">
+        <field name="date_from">2008-01-01</field>
+        <field name="date_to">2009-08-01</field>
+        <field name="account_invoice_line" ref="account_invoice_line_membershipproduct3" />
+        <field name="state">waiting</field>
+        <field name="partner" ref="base.res_partner_15"/>
+    </record>
 
 <!-- Demo data for cancel member -->
-	<record id="base.res_partner_3" model="res.partner">
-		<field name="membership_cancel">2009-01-01</field>
-	</record>
+    <record id="base.res_partner_3" model="res.partner">
+        <field name="membership_cancel">2009-01-01</field>
+    </record>
 
 <!-- Demo data for free member -->
-	<record id="base.res_partner_desertic_hispafuentes" model="res.partner">
-		<field name="free_member">True</field>
-	</record>
+    <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
+        <field name="free_member">True</field>
+    </record>
 
 <!-- Demo data for associate member -->
-	<record id="base.res_partner_9" model="res.partner">
-		<field name="associate_member" ref="base.res_partner_agrolait"/>
-	</record>
-	<record id="base.res_partner_8" model="res.partner">
-		<field name="associate_member" ref="base.res_partner_agrolait"/>
-	</record>
+    <record id="base.res_partner_9" model="res.partner">
+        <field name="associate_member" ref="base.res_partner_agrolait"/>
+    </record>
+    <record id="base.res_partner_8" model="res.partner">
+        <field name="associate_member" ref="base.res_partner_agrolait"/>
+    </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 2ceb2fe00e9..a7853319237 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -5,175 +5,175 @@
         <record id="base.main_partner" model="res.partner">
             <field name="name">OpenERP Corp.</field>
         </record>
-		<record id="res_partner_oerp_editor" model="res.partner">
-			<field name="name">OpenERP Editor</field>
-		</record>
-		<record id="res_partner_oerp_us" model="res.partner">
-			<field name="name">OpenERP US</field>
-		</record>
-		<record id="res_partner_oerp_in" model="res.partner">
-			<field name="name">OpenERP IN</field>
-		</record>
-		<record id="res_partner_oerp_be" model="res.partner">
-			<field name="name">OpenERP BE</field>
-		</record>
-		<record id="res_partner_odoo" model="res.partner">
-			<field name="name">Odoo</field>
-		</record>
-		
-<!--                      Company                        -->    		
-		<record id="base.main_company" model="res.company">
-			<field name="name">OpenERP Corp.</field>
-		</record>
-		<record id="res_company_oerp_editor" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_editor"/>
-			<field name="parent_id" ref="base.main_company"/>
-			<field name="name">OpenERP Editor</field>
-		</record>
-		<record id="res_company_oerp_us" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_us"/>
-			<field name="parent_id" ref="res_company_oerp_editor"/>
-			<field name="name">OpenERP US</field>
-		</record>
-		<record id="res_company_oerp_be" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_be"/>
-			<field name="parent_id" ref="res_company_oerp_editor"/>
-			<field name="name">OpenERP BE</field>
-		</record>OpenERP IN
-		<record id="res_company_oerp_in" model="res.company">
-			<field name="partner_id" ref="res_partner_oerp_in"/>
-			<field name="parent_id" ref="res_company_oerp_editor"/>
-			<field name="name">OpenERP IN</field>
-		</record>
-		<record id="res_company_odoo" model="res.company">
-			<field name="partner_id" ref="res_partner_odoo"/>
-			<field name="parent_id" ref="base.main_company"/>
-			<field name="name">Odoo</field>
-		</record>
-		
+        <record id="res_partner_oerp_editor" model="res.partner">
+            <field name="name">OpenERP Editor</field>
+        </record>
+        <record id="res_partner_oerp_us" model="res.partner">
+            <field name="name">OpenERP US</field>
+        </record>
+        <record id="res_partner_oerp_in" model="res.partner">
+            <field name="name">OpenERP IN</field>
+        </record>
+        <record id="res_partner_oerp_be" model="res.partner">
+            <field name="name">OpenERP BE</field>
+        </record>
+        <record id="res_partner_odoo" model="res.partner">
+            <field name="name">Odoo</field>
+        </record>
+        
+<!--                      Company                        -->            
+        <record id="base.main_company" model="res.company">
+            <field name="name">OpenERP Corp.</field>
+        </record>
+        <record id="res_company_oerp_editor" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_editor"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="name">OpenERP Editor</field>
+        </record>
+        <record id="res_company_oerp_us" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_us"/>
+            <field name="parent_id" ref="res_company_oerp_editor"/>
+            <field name="name">OpenERP US</field>
+        </record>
+        <record id="res_company_oerp_be" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_be"/>
+            <field name="parent_id" ref="res_company_oerp_editor"/>
+            <field name="name">OpenERP BE</field>
+        </record>OpenERP IN
+        <record id="res_company_oerp_in" model="res.company">
+            <field name="partner_id" ref="res_partner_oerp_in"/>
+            <field name="parent_id" ref="res_company_oerp_editor"/>
+            <field name="name">OpenERP IN</field>
+        </record>
+        <record id="res_company_odoo" model="res.company">
+            <field name="partner_id" ref="res_partner_odoo"/>
+            <field name="parent_id" ref="base.main_company"/>
+            <field name="name">Odoo</field>
+        </record>
+        
 <!--                      User                        -->
 
-		<record id="res_users_editor_demo" model="res.users">
-			<field name="password">editor_demo</field>
-			<field name="name">OpenERP Editor</field>
-			<field name="login">editor_demo</field>
-			<field name="company_id" ref="res_company_oerp_editor"/>
+        <record id="res_users_editor_demo" model="res.users">
+            <field name="password">editor_demo</field>
+            <field name="name">OpenERP Editor</field>
+            <field name="login">editor_demo</field>
+            <field name="company_id" ref="res_company_oerp_editor"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_sales_demo_us" model="res.users">
-			<field name="password">sales_demo_us</field>
-			<field name="name">OpenERP Salesman US</field>
-			<field name="login">sales_demo_us</field>
-			<field name="company_id" ref="res_company_oerp_us"/>
+        </record>
+        <record id="res_users_sales_demo_us" model="res.users">
+            <field name="password">sales_demo_us</field>
+            <field name="name">OpenERP Salesman US</field>
+            <field name="login">sales_demo_us</field>
+            <field name="company_id" ref="res_company_oerp_us"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_sales_demo_be" model="res.users">
-			<field name="password">sales_demo_be</field>
-			<field name="name">OpenERP Salesman BE</field>
-			<field name="login">sales_demo_be</field>
-			<field name="company_id" ref="res_company_oerp_be"/>
+        </record>
+        <record id="res_users_sales_demo_be" model="res.users">
+            <field name="password">sales_demo_be</field>
+            <field name="name">OpenERP Salesman BE</field>
+            <field name="login">sales_demo_be</field>
+            <field name="company_id" ref="res_company_oerp_be"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_sales_demo_in" model="res.users">
-			<field name="password">sales_demo_in</field>
-			<field name="name">OpenERP Salesman IN</field>
-			<field name="login">sales_demo_in</field>
-			<field name="company_id" ref="res_company_oerp_in"/>
+        </record>
+        <record id="res_users_sales_demo_in" model="res.users">
+            <field name="password">sales_demo_in</field>
+            <field name="name">OpenERP Salesman IN</field>
+            <field name="login">sales_demo_in</field>
+            <field name="company_id" ref="res_company_oerp_in"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
-		<record id="res_users_odoo_demo" model="res.users">
-			<field name="password">odoo_demo</field>
-			<field name="name">Odoo</field>
-			<field name="login">odoo_demo</field>
-			<field name="company_id" ref="res_company_odoo"/>
+        </record>
+        <record id="res_users_odoo_demo" model="res.users">
+            <field name="password">odoo_demo</field>
+            <field name="name">Odoo</field>
+            <field name="login">odoo_demo</field>
+            <field name="company_id" ref="res_company_odoo"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('sale.group_sale_user'),ref('project.group_project_user'),ref('account.group_account_invoice'),ref('base.group_extended')])]"/>
-		</record>
+        </record>
 
 
         <!--
-	Resource: product.product
-	-->
+    Resource: product.product
+    -->
         
         <record id="product.product_product_0" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc1" model="product.product">
-    	    <field name="company_id" ref="res_company_oerp_editor"/>
+            <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc3" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_pc4" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_mb1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_mb2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu3" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_hdd1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_hdd2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_hdd3" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_fan" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_fan2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu_gen" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_ram" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_ram512" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_cpu2" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_tow1" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_20" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_21" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_22" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_23" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_24" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_25" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="product.product_product_26" model="product.product">
-	    <field name="company_id" ref="res_company_oerp_editor"/>
+        <field name="company_id" ref="res_company_oerp_editor"/>
         </record>
         <record id="Odoo1" model="product.category">
             <field name="parent_id" ref="product.cat0"/>
@@ -188,186 +188,186 @@
             <field name="uom_po_id" ref="product.product_uom_unit"/>
             <field name="name">Odoo Offer</field>
             <field name="categ_id" ref="Odoo1"/>
-	    <field name="company_id" ref="res_company_odoo"/>
+        <field name="company_id" ref="res_company_odoo"/>
         </record>
 
         <!--
-	Resource: sale.order
-	-->
+    Resource: sale.order
+    -->
 
         <record id="sale.order" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
         <record id="sale.order2" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
         <record id="sale.order3" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 
         <record id="sale.order4" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 
         <record id="sale.order5" model="sale.order">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
 
-<!--		Project		-->
+<!--        Project        -->
 
         <record id="project.project_project_9" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_project_21" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_project_22" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_project_23" model="project.project">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
 
         <record id="project.project_task_116" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_130" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_131" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_184" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_186" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_188" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_189" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_190" model="project.task">
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_192" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_193" model="project.task">
             <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_194" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_195" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_196" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_197" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_198" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_199" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_200" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_201" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="project.project_task_202" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_203" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_204" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="project.project_task_205" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="project.project_task_206" model="project.task">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
 
 
        
         <!--
-		Resource: res.partner
-		-->
+        Resource: res.partner
+        -->
         
         <record id="base.res_partner_asus" model="res.partner">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_agrolait" model="res.partner">
-            	    <field name="company_id" ref="res_company_oerp_be"/>
+                    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_c2c" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_sednacom" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_be"/>
+                  <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_thymbra" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_in"/>
+                   <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="base.res_partner_desertic_hispafuentes" model="res.partner">
-        	    <field name="company_id" ref="res_company_oerp_be"/>
+                <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_tinyatwork" model="res.partner">
-	    <field name="company_id" ref="res_company_oerp_us"/>
+        <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_2" model="res.partner">
-	    <field name="company_id" ref="res_company_oerp_be"/>
+        <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_3" model="res.partner">
-            	    <field name="company_id" ref="res_company_oerp_in"/>
+                    <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="base.res_partner_4" model="res.partner">
-        	    <field name="company_id" ref="res_company_oerp_be"/>
+                <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_5" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_6" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_maxtor" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_us"/>
+                  <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_seagate" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_us"/>
+                  <field name="company_id" ref="res_company_oerp_us"/>
         </record>
         <record id="base.res_partner_8" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_9" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_be"/>
+                  <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_10" model="res.partner">
-       	    <field name="company_id" ref="res_company_oerp_in"/>
+               <field name="company_id" ref="res_company_oerp_in"/>
         </record>
         <record id="base.res_partner_11" model="res.partner">
-           	    <field name="company_id" ref="res_company_oerp_be"/>
+                   <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_14" model="res.partner">
-          	    <field name="company_id" ref="res_company_oerp_be"/>
+                  <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_15" model="res.partner">
-         	    <field name="company_id" ref="res_company_oerp_be"/>
+                 <field name="company_id" ref="res_company_oerp_be"/>
         </record>
         <record id="base.res_partner_accent" model="res.partner">
-         	    <field name="company_id" ref="res_company_oerp_be"/>
+                 <field name="company_id" ref="res_company_oerp_be"/>
         </record>        
         
 
diff --git a/addons/multi_company/multi_company_view.xml b/addons/multi_company/multi_company_view.xml
index d2d26c48591..baac5b322d4 100644
--- a/addons/multi_company/multi_company_view.xml
+++ b/addons/multi_company/multi_company_view.xml
@@ -9,7 +9,7 @@
                 <tree string="Multi Company">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_dest_id"/>
                     <field name="object_id"/>
                     <field name="expression" />
@@ -24,7 +24,7 @@
                 <form string="Multi Company">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_dest_id"/>
                     <field name="object_id"/>
                     <field name="expression" />
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6d79a5c9952..60995fde34a 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -130,7 +130,7 @@
                             <group colspan="2" col="2" name="misc">
                                 <separator string="Miscelleanous" colspan="2"/>
                                 <field name="active" select="2"/>
-                                <field name="company_id" select="2" groups="base.group_extended" widget="selection"/>
+                                <field name="company_id" select="2" groups="base.group_multi_company" widget="selection"/>
                             </group>
 
                         </page>
@@ -139,11 +139,11 @@
                             <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <field name="standard_price_multi"/>
-            				<field name="list_price_multi"/>
-            				<newline/>
+                            <field name="list_price_multi"/>
+                            <newline/>
                             <field name="standard_price_ids" nolabel="1" colspan="2"/>
-            				<field name="list_price_ids" nolabel="1" colspan="2"/>
-            				<newline/>
+                            <field name="list_price_ids" nolabel="1" colspan="2"/>
+                            <newline/>
                             <field name="price_margin" select="1"/>
                             <field name="price_extra" select="1"/>
                             <newline/>
@@ -414,7 +414,7 @@
                     <field name="product_code"/>
                     <field name="delay"/>
                     <field name="qty"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
                         <tree editable="bottom" string="Pricelist">
                             <field name="min_quantity"/>
@@ -439,7 +439,7 @@
                     <field name="delay"/>
                     <field name="qty"/>
                     <field name="product_code"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -601,7 +601,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Company Wise Cost Prices">
-                    <field name="company_id" on_change="company_cost_onchange(company_id)"/>
+                    <field name="company_id" on_change="company_cost_onchange(company_id)" groups="base.group_multi_company"/>
                     <field name="standard_price"/>
                     <field name="currency_id"/>
                 </form>
@@ -614,7 +614,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Company Wise Cost Prices">
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="standard_price"/>
                     <field name="currency_id"/>
                 </tree>
@@ -627,7 +627,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Company Wise Sale Prices">
-                    <field name="company_id" on_change="company_sale_onchange(company_id)"/>
+                    <field name="company_id" on_change="company_sale_onchange(company_id)" groups="base.group_multi_company"/>
                     <field name="list_price"/>
                     <field name="currency_id"/>
                 </form>
@@ -640,7 +640,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Company Wise Sale Prices">
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="list_price"/>
                     <field name="currency_id"/>
                 </tree>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 1d255aff2c8..e0744f8ba95 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -14,7 +14,7 @@
 
      <record model="ir.rule.group" id="product_comp_rule_group">
         <field name="name" >Product multi-company</field>
-        <field name="model_id" search="[('model','=','product.product')]" model="ir.model"/>
+        <field name="model_id" ref="model_product_product"/>
         <field name="global" eval="True"/>
     </record>
     <record id="product_comp_rule" model="ir.rule">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index cb5bad3db9c..a350354ffca 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -12,32 +12,32 @@
         <field name="name">Project / User</field>
     </record>
 
-	<record model="ir.ui.menu" id="menu_definitions">
-		<field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
-	</record>
-	<record model="ir.ui.menu" id="menu_open_view_project">
-		<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
-	</record>
+    <record model="ir.ui.menu" id="menu_definitions">
+        <field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
+    </record>
+    <record model="ir.ui.menu" id="menu_open_view_project">
+        <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
+    </record>
 
-	<record model="ir.rule.group" id="project_comp_rule_group">
-		<field name="name">Project multi-company</field>
-		<field name="model_id" search="[('model','=','project.project')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="project_comp_rule">
-		<field name="rule_group" ref="project_comp_rule_group"/>
-        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
-	</record>
+    <record model="ir.rule.group" id="project_comp_rule_group">
+        <field name="name">Project multi-company</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="project_comp_rule">
+        <field name="rule_group" ref="project_comp_rule_group"/>
+            <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
 
-	<record model="ir.rule.group" id="task_comp_rule_group">
-		<field name="name" >Task multi-company</field>
-		<field name="model_id" search="[('model','=','project.task')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="task_comp_rule">
-        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
-		<field name="rule_group" ref="task_comp_rule_group"/>
-	</record>
+    <record model="ir.rule.group" id="task_comp_rule_group">
+        <field name="name" >Task multi-company</field>
+        <field name="model_id" ref="model_project_task"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="task_comp_rule">
+            <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="rule_group" ref="task_comp_rule_group"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 932dd9ff747..4faf2990fa9 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -2,30 +2,28 @@
 <openerp>
 <data noupdate="0">
 
-    	<record id="group_sale_manager" model="res.groups">
-        	<field name="name">Sale / Manager</field>
-    	</record>
-    	<record id="group_sale_user" model="res.groups">
-        	<field name="name">Sale / Salesman</field>
-     	</record>
+    <record id="group_sale_manager" model="res.groups">
+        <field name="name">Sale / Manager</field>
+    </record>
+    <record id="group_sale_user" model="res.groups">
+        <field name="name">Sale / Salesman</field>
+    </record>
 
 
-	<record model='ir.ui.menu' id='menu_shop_configuration'>
-		<field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_shop_configuration'>
+        <field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
+    </record>
 
-	<record model="ir.rule.group" id="sale_order_comp_rule_group">
-		<field name="name">Sale Order multi-company</field>
-		<field name="model_id" search="[('model','=','sale.order')]" model="ir.model"/>
-		<field name="global" eval="True"/>
-	</record>
-	<record model="ir.rule" id="sale_order_comp_rule">
-		<field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
-		<field name="rule_group" ref="sale_order_comp_rule_group"/>
-        	<field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
-	</record>
-
-	
+    <record model="ir.rule.group" id="sale_order_comp_rule_group">
+        <field name="name">Sale Order multi-company</field>
+        <field name="model_id" ref="model_sale_order"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="sale_order_comp_rule">
+        <field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="sale_order_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index f3f28df553f..bdb7c4eed74 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -9,13 +9,13 @@
         <field name="name">Stock / Worker</field>
     </record>
 
-	<record model='ir.ui.menu' id='menu_stock_root'>
-		<field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_stock_root'>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user')])]"/>
+    </record>
 
-	<record model='ir.ui.menu' id='menu_stock_configuration'>
-		<field name="groups_id" eval="[(6,0,[ref('group_stock_manager')])]"/>
-	</record>
+    <record model='ir.ui.menu' id='menu_stock_configuration'>
+        <field name="groups_id" eval="[(6,0,[ref('group_stock_manager')])]"/>
+    </record>
 
 </data>
 </openerp>

From 59bfc2b1917556e9c1ddde14c1c8fd786b3bea8b Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 26 Nov 2009 04:38:12 +0000
Subject: [PATCH 57/59] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20091126043812-p4914xz6mi8emytl
---
 addons/bin/addons/base/i18n/pt.po |  10 +-
 addons/bin/addons/base/i18n/sk.po | 339 ++++++++++++++++--------------
 addons/scrum/i18n/zh_CN.po        |  72 +++----
 3 files changed, 220 insertions(+), 201 deletions(-)

diff --git a/addons/bin/addons/base/i18n/pt.po b/addons/bin/addons/base/i18n/pt.po
index f3976c533c5..f2f76f7d865 100644
--- a/addons/bin/addons/base/i18n/pt.po
+++ b/addons/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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 08:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-25 22:34+0000\n"
+"Last-Translator: Paulino <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: 2009-11-18 04:39+0000\n"
+"X-Launchpad-Export-Date: 2009-11-26 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -30,12 +30,12 @@ msgstr "SMS - Gateway: clickatell"
 #: code:addons/addons/account/wizard/wizard_open_closed_fiscalyear.py:0
 #, python-format
 msgid "No journal for ending writing has been defined for the fiscal year"
-msgstr ""
+msgstr "Não foi definido o diário dos movimentos de fim de exercício."
 
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year as a decimal number [001,366]."
-msgstr "%j - Dia como um numero decimal [001,366]."
+msgstr "%j - Dia do ano como número decimal [001,366]."
 
 #. module: base
 #: code:addons/addons/mrp/report/price.py:0
diff --git a/addons/bin/addons/base/i18n/sk.po b/addons/bin/addons/base/i18n/sk.po
index e80a3ff3cfd..d063a64d38e 100644
--- a/addons/bin/addons/base/i18n/sk.po
+++ b/addons/bin/addons/base/i18n/sk.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: 2009-11-24 08:31+0000\n"
+"PO-Revision-Date: 2009-11-25 09:52+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@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: 2009-11-25 04:48+0000\n"
+"X-Launchpad-Export-Date: 2009-11-26 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -271,7 +271,7 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_DELETE"
-msgstr ""
+msgstr "STOCK_DELETE"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
@@ -1105,6 +1105,10 @@ msgid ""
 "Mail sent to following Partners successfully, !\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"E-mail pre partnerov bol úspešne odoslaný!\n"
+"\n"
 
 #. module: base
 #: view:res.lang:0
@@ -1117,12 +1121,12 @@ msgstr ""
 #. module: base
 #: field:res.partner.event,planned_cost:0
 msgid "Planned Cost"
-msgstr ""
+msgstr "Plánované náklady"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_config
 msgid "ir.model.config"
-msgstr ""
+msgstr "ir.model.config"
 
 #. module: base
 #: field:ir.module.module,website:0
@@ -1138,7 +1142,7 @@ msgstr "Testy"
 #. module: base
 #: view:ir.module.repository:0
 msgid "Repository"
-msgstr ""
+msgstr "Repozitár"
 
 #. module: base
 #: model:res.country,name:base.gs
@@ -1148,7 +1152,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.url,url:0
 msgid "Action URL"
-msgstr ""
+msgstr "Aktívne URL"
 
 #. module: base
 #: code:addons/addons/account/wizard/wizard_pay_invoice.py:0
@@ -1162,45 +1166,45 @@ msgstr ""
 #: code:addons/addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "Názov modulu"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_JUSTIFY_FILL"
-msgstr ""
+msgstr "STOCK_JUSTIFY_FILL"
 
 #. module: base
 #: model:res.country,name:base.mh
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Maršalové ostrovy"
 
 #. module: base
 #: code:addons/addons/account/account_move_line.py:0
 #, python-format
 msgid "Bad account!"
-msgstr ""
+msgstr "Zlý účet!"
 
 #. module: base
 #: model:res.country,name:base.ht
 msgid "Haiti"
-msgstr ""
+msgstr "Haity"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "RML"
-msgstr ""
+msgstr "RML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_category
 #: model:ir.ui.menu,name:base.menu_partner_category_main
 msgid "Partners by Categories"
-msgstr ""
+msgstr "Partneri podľa kategórií"
 
 #. module: base
 #: code:addons/addons/stock/product.py:0
 #, python-format
 msgid "Received Qty"
-msgstr ""
+msgstr "Prijaté množstvo"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_report_custom.py:0
@@ -1212,28 +1216,30 @@ msgstr ""
 #: code:addons/osv/orm.py:0
 #, python-format
 msgid "Id is not the same than existing one: %s"
-msgstr ""
+msgstr "ID nie je to isté, ako existujúce: %s"
 
 #. module: base
 #: help:wizard.module.lang.export,lang:0
 msgid "To export a new language, do not select a language."
-msgstr ""
+msgstr "Ak chcete exportovať nový jazyk, nevyberajte jazyk."
 
 #. module: base
 #: code:addons/addons/project/wizard/close_task.py:0
 #, python-format
 msgid "Couldn't send mail because your email address is not configured!"
 msgstr ""
+"Nepodarilo sa odoslať mail, pretože vaša e-mailová adresa nie je "
+"nakonfigurovaná!"
 
 #. module: base
 #: model:res.country,name:base.md
 msgid "Moldavia"
-msgstr ""
+msgstr "Moldavia"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Features"
-msgstr ""
+msgstr "Funkcie"
 
 #. module: base
 #: code:addons/addons/account/account_move_line.py:0
@@ -1246,12 +1252,12 @@ msgstr ""
 #: code:addons/addons/mrp/report/price.py:0
 #, python-format
 msgid "Unit Product Price"
-msgstr ""
+msgstr "Jednotková cena produktu"
 
 #. module: base
 #: field:ir.report.custom,frequency:0
 msgid "Frequency"
-msgstr ""
+msgstr "Frekvencia"
 
 #. module: base
 #: field:ir.report.custom.fields,fc0_op:0
@@ -1259,7 +1265,7 @@ msgstr ""
 #: field:ir.report.custom.fields,fc2_op:0
 #: field:ir.report.custom.fields,fc3_op:0
 msgid "Relation"
-msgstr ""
+msgstr "Vzťah"
 
 #. module: base
 #: field:ir.model.access,perm_read:0
@@ -1269,27 +1275,27 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
 msgid "ir.exports"
-msgstr ""
+msgstr "ir.exports"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_MISSING_IMAGE"
-msgstr ""
+msgstr "STOCK_MISSING_IMAGE"
 
 #. module: base
 #: view:res.users:0
 msgid "Define New Users"
-msgstr ""
+msgstr "Definovať nových používateľov"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_REMOVE"
-msgstr ""
+msgstr "STOCK_REMOVE"
 
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "raw"
-msgstr ""
+msgstr "raw"
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -1298,16 +1304,19 @@ msgid ""
 "you select the invoice, then `object.invoice_address_id.email` is the field "
 "which gives the correct address"
 msgstr ""
+"Stanovuje oblasti, ktoré budú použité, aby preniesol e-mailovú adresu, "
+"napríklad ak vyberiete faktúru, potom `object.invoice_address_id.email` je "
+"pole, ktoré vracia správne adresy"
 
 #. module: base
 #: field:res.roles,name:0
 msgid "Role Name"
-msgstr ""
+msgstr "Názov role"
 
 #. module: base
 #: field:res.partner,user_id:0
 msgid "Dedicated Salesman"
-msgstr ""
+msgstr "Priradený obchodník"
 
 #. module: base
 #: code:addons/addons/mrp/wizard/wizard_change_production_qty.py:0
@@ -1316,35 +1325,36 @@ msgid ""
 "The production is in \"%s\" state. You can not change the production "
 "quantity anymore"
 msgstr ""
+"Produkcia je v  \"%s\" stave. Nemôžete už  zmeniť množstvo produkcie."
 
 #. module: base
 #: rml:ir.module.reference:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: base
 #: code:addons/addons/auction/wizard/wizard_aie_send.py:0
 #: code:addons/addons/auction/wizard/wizard_aie_send_result.py:0
 #, python-format
 msgid "Connection to WWW.Auction-in-Europe.com failed !"
-msgstr ""
+msgstr "Pripojenie k WWW.Auction-in-Europe.com zlyhalo!"
 
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
-msgstr ""
+msgstr "Platobné podmienky (skrátený názov)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
 #: view:res.bank:0
 #: field:res.partner.bank,bank:0
 msgid "Bank"
-msgstr ""
+msgstr "Banka"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports_line
 msgid "ir.exports.line"
-msgstr ""
+msgstr "ir.exports.line"
 
 #. module: base
 #: code:addons/addons/mrp/mrp.py:0
@@ -1363,17 +1373,17 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,reports_by_module:0
 msgid "Reports"
-msgstr ""
+msgstr "Výkazy"
 
 #. module: base
 #: field:workflow,on_create:0
 msgid "On Create"
-msgstr ""
+msgstr "Vytvoril"
 
 #. module: base
 #: wizard_view:base.module.import,init:0
 msgid "Please give your module .ZIP file to import."
-msgstr ""
+msgstr "Uveďte prosím, modul so .ZIP súborom na import."
 
 #. module: base
 #: code:addons/addons/crm/crm.py:0
@@ -1387,29 +1397,29 @@ msgstr ""
 #: code:addons/addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "O(1)"
-msgstr ""
+msgstr "O(1)"
 
 #. module: base
 #: wizard_field:res.partner.sms_send,init,user:0
 #: field:res.users,login:0
 msgid "Login"
-msgstr ""
+msgstr "Prihlásiť"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_sequence_type
 msgid "ir.sequence.type"
-msgstr ""
+msgstr "ir.sequence.type"
 
 #. module: base
 #: view:maintenance.contract:0
 #: field:maintenance.contract,module_ids:0
 msgid "Covered Modules"
-msgstr ""
+msgstr "Skryté moduly"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_COPY"
-msgstr ""
+msgstr "STOCK_COPY"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
@@ -1441,45 +1451,45 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
 msgid "res.request.link"
-msgstr ""
+msgstr "res.request.link"
 
 #. module: base
 #: wizard_button:module.module.update,init,update:0
 msgid "Check new modules"
-msgstr ""
+msgstr "Kontrola nových modulov"
 
 #. module: base
 #: model:res.country,name:base.km
 msgid "Comoros"
-msgstr ""
+msgstr "Komory"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_server_action
 #: view:ir.actions.server:0
 #: model:ir.ui.menu,name:base.menu_server_action
 msgid "Server Actions"
-msgstr ""
+msgstr "Akcie servera"
 
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr ""
+msgstr "Východný Timor"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Simple domain setup"
-msgstr ""
+msgstr "Jednoduché nastavenie domény"
 
 #. module: base
 #: code:addons/addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "Skúšobná metóda"
 
 #. module: base
 #: field:res.currency,accuracy:0
 msgid "Computational Accuracy"
-msgstr ""
+msgstr "Presnosť výpočtu"
 
 #. module: base
 #: code:addons/addons/account/wizard/wizard_account_balance_report.py:0
@@ -1488,79 +1498,79 @@ msgstr ""
 #: code:addons/addons/account/wizard/wizard_third_party_ledger.py:0
 #, python-format
 msgid "Date to must be set between %s and %s"
-msgstr ""
+msgstr "Dátum musí byť nastavený medzi %s a %s"
 
 #. module: base
 #: model:res.country,name:base.kg
 msgid "Kyrgyz Republic (Kyrgyzstan)"
-msgstr ""
+msgstr "Kirgizská republika (Kirgizsko)"
 
 #. module: base
 #: code:addons/addons/product/product.py:0
 #: code:addons/addons/stock/product.py:0
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "Produkty: "
 
 #. module: base
 #: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
 #, python-format
 msgid "No bank account for the company."
-msgstr ""
+msgstr "Nie je žiadny bankový účet pre firmu."
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
 msgid "wizard.ir.model.menu.create.line"
-msgstr ""
+msgstr "wizard.ir.model.menu.create.line"
 
 #. module: base
 #: field:ir.attachment,res_id:0
 msgid "Attached ID"
-msgstr ""
+msgstr "ID pripojenia"
 
 #. module: base
 #: code:addons/addons/account/account.py:0
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr ""
+msgstr "Nemôžete upraviť / zmazať v denníku záznamy pre toto obdobie!"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Day: %(day)s"
-msgstr ""
+msgstr "Deň: %(day)s"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not read this document! (%s)"
-msgstr ""
+msgstr "Nedá sa prečítať tento dokument! (%s)"
 
 #. module: base
 #: code:addons/addons/hr_timesheet/hr_timesheet.py:0
 #, python-format
 msgid "UnknownError"
-msgstr ""
+msgstr "Neznáma chyba"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_FIND_AND_REPLACE"
-msgstr ""
+msgstr "STOCK_FIND_AND_REPLACE"
 
 #. module: base
 #: code:addons/osv/orm.py:0
 #, python-format
 msgid "Relation not found: %s on '%s'"
-msgstr ""
+msgstr "Vzťah nenájdený: %s po '%s'"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-crm"
-msgstr ""
+msgstr "terp-crm"
 
 #. module: base
 #: model:res.country,name:base.mv
 msgid "Maldives"
-msgstr ""
+msgstr "Maledivy"
 
 #. module: base
 #: help:ir.values,res_id:0
@@ -1570,13 +1580,13 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
 msgid "ir.rule"
-msgstr ""
+msgstr "Copy text   \t ir.rule"
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
 #, python-format
 msgid "Invalid Region"
-msgstr ""
+msgstr "Neplatný kraj"
 
 #. module: base
 #: code:addons/addons/base_module_quality/object_test/object_test.py:0
@@ -1590,39 +1600,39 @@ msgstr ""
 #. module: base
 #: field:ir.report.custom.fields,width:0
 msgid "Fixed Width"
-msgstr ""
+msgstr "Pevná šírka"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "terp-calendar"
-msgstr ""
+msgstr "terp-calendar"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_YES"
-msgstr ""
+msgstr "STOCK_YES"
 
 #. module: base
 #: code:addons/addons/stock/product.py:0
 #, python-format
 msgid "P&L Qty"
-msgstr ""
+msgstr "P&L množstvo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_custom
 #: model:ir.ui.menu,name:base.menu_ir_action_report_custom
 msgid "Report Custom"
-msgstr ""
+msgstr "Vlastné výkazy"
 
 #. module: base
 #: model:res.country,name:base.tm
 msgid "Turkmenistan"
-msgstr ""
+msgstr "Turkmenistan"
 
 #. module: base
 #: view:res.lang:0
 msgid "7.  %H:%M:%S      ==> 18:25:20"
-msgstr ""
+msgstr "7. %H:%M:%S ==> 18:25:20"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_form
@@ -1630,7 +1640,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_form
 #: view:res.partner:0
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1638,6 +1648,8 @@ msgid ""
 "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Špecifikujte správu. Môžete použiť pole pre objekt. napr.: `Vážený  "
+"[[object.partner_id.name]]`"
 
 #. module: base
 #: field:ir.attachment,res_model:0
@@ -1647,18 +1659,18 @@ msgstr ""
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Name"
-msgstr ""
+msgstr "Názov spustenia"
 
 #. module: base
 #: code:addons/addons/odms/portal.py:0
 #, python-format
 msgid "unable to find a server"
-msgstr ""
+msgstr "nemôže nájsť server"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
 msgid "ir.model.access"
-msgstr ""
+msgstr "ir.model.access"
 
 #. module: base
 #: field:ir.cron,priority:0
@@ -1666,7 +1678,7 @@ msgstr ""
 #: field:res.request,priority:0
 #: field:res.request.link,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Priorita"
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
@@ -1677,43 +1689,43 @@ msgstr ""
 #. module: base
 #: field:workflow.transition,act_from:0
 msgid "Source Activity"
-msgstr ""
+msgstr "Zdroj aktivity"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Legend (for prefix, suffix)"
-msgstr ""
+msgstr "Legenda (pre predponu, príponu)"
 
 #. module: base
 #: view:res.request:0
 msgid "Reply"
-msgstr ""
+msgstr "Odpovedať"
 
 #. module: base
 #: code:addons/addons/base/res/res_user.py:0
 #, python-format
 msgid "Can not remove root user!"
-msgstr ""
+msgstr "Nemožno odstrániť root/koreňového užívateľa !"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_JUSTIFY_LEFT"
-msgstr ""
+msgstr "STOCK_JUSTIFY_LEFT"
 
 #. module: base
 #: model:res.country,name:base.mw
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #. module: base
 #: field:res.partner.address,type:0
 msgid "Address Type"
-msgstr ""
+msgstr "Typ adresy"
 
 #. module: base
 #: selection:ir.actions.todo,start_on:0
 msgid "Auto"
-msgstr ""
+msgstr "Automaticky"
 
 #. module: base
 #: view:res.request:0
@@ -1729,7 +1741,7 @@ msgstr ""
 #. module: base
 #: view:res.request:0
 msgid "References"
-msgstr ""
+msgstr "Odporúčania"
 
 #. module: base
 #: view:res.lang:0
@@ -1742,7 +1754,7 @@ msgstr ""
 #. module: base
 #: wizard_view:module.lang.install,init:0
 msgid "Note that this operation may take a few minutes."
-msgstr ""
+msgstr "Upozorňujeme, že táto operácia môže trvať aj niekoľko minút."
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -1750,46 +1762,47 @@ msgstr ""
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Tree"
-msgstr ""
+msgstr "Stromová štruktúra"
 
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "Could you check your contract information ?"
-msgstr ""
+msgstr "Mohli by ste skontrolovať informácie na zmluve?"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_CLEAR"
-msgstr ""
+msgstr "STOCK_CLEAR"
 
 #. module: base
 #: help:res.users,password:0
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
 msgstr ""
+"Nechajte prázdne, ak nechcete, aby sa používateľ pripojil do systému."
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
 #: field:res.config.view,view:0
 msgid "View Mode"
-msgstr ""
+msgstr "Režim zobrazenia"
 
 #. module: base
 #: code:addons/addons/mrp/report/price.py:0
 #, python-format
 msgid "Product Cost Structure"
-msgstr ""
+msgstr "Štruktúra nákladov produktu"
 
 #. module: base
 #: code:addons/osv/fields.py:0
 #, python-format
 msgid "Not implemented search_memory method !"
-msgstr ""
+msgstr "Nie je implementovaná search_memory metóda!"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Spanish / Español"
-msgstr ""
+msgstr "Španielsky / Español"
 
 #. module: base
 #: code:addons/addons/point_of_sale/pos.py:0
@@ -1802,12 +1815,12 @@ msgstr ""
 #. module: base
 #: field:res.company,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_PROPERTIES"
-msgstr ""
+msgstr "STOCK_PROPERTIES"
 
 #. module: base
 #: code:addons/addons/account/wizard/wizard_fiscalyear_close.py:0
@@ -1819,7 +1832,7 @@ msgstr ""
 #: selection:ir.actions.act_window,target:0
 #: selection:ir.actions.url,target:0
 msgid "New Window"
-msgstr ""
+msgstr "Nové okno"
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
@@ -1830,12 +1843,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bs
 msgid "Bahamas"
-msgstr ""
+msgstr "Bahamy"
 
 #. module: base
 #: selection:res.partner.event,partner_type:0
 msgid "Commercial Prospect"
-msgstr ""
+msgstr "Obchodné prospekty"
 
 #. module: base
 #: code:addons/addons/base/res/partner/partner.py:0
@@ -1847,12 +1860,12 @@ msgstr ""
 #. module: base
 #: view:ir.attachment:0
 msgid "Attachment"
-msgstr ""
+msgstr "Príloha"
 
 #. module: base
 #: model:res.country,name:base.ie
 msgid "Ireland"
-msgstr ""
+msgstr "Írsko"
 
 #. module: base
 #: view:ir.sequence:0
@@ -1862,7 +1875,7 @@ msgstr ""
 #. module: base
 #: wizard_field:module.module.update,update,update:0
 msgid "Number of modules updated"
-msgstr ""
+msgstr "Počet aktualizovaných modulov"
 
 #. module: base
 #: code:addons/osv/fields.py:0
@@ -1890,7 +1903,7 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Skupiny"
 
 #. module: base
 #: code:addons/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -1901,23 +1914,23 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bz
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #. module: base
 #: code:addons/addons/stock/stock.py:0
 #, python-format
 msgid "Error, no partner !"
-msgstr ""
+msgstr "Chyba, nie je partner!"
 
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 #. module: base
 #: model:res.country,name:base.pl
 msgid "Poland"
-msgstr ""
+msgstr "Poľsko"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -1928,7 +1941,7 @@ msgstr ""
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "Maintenance contract added !"
-msgstr ""
+msgstr "Servisná zmluva pridaná!"
 
 #. module: base
 #: view:wizard.module.update_translations:0
@@ -1936,12 +1949,14 @@ msgid ""
 "This wizard will detect new terms in the application so that you can update "
 "them manually."
 msgstr ""
+"Tento sprievodca vám objavil nové termíny v aplikácii, môžete aktualizovať "
+"ručne."
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
 #, python-format
 msgid "The region should be in "
-msgstr ""
+msgstr "Región by mal byť v "
 
 #. module: base
 #: help:ir.actions.server,expression:0
@@ -1950,27 +1965,30 @@ msgid ""
 "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 príkaz na predaj v "
+"objekte, a môžete si vytvoriť slučku na objednávku. Expression = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Field"
-msgstr ""
+msgstr "Pole sprievodcu"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_SELECT_COLOR"
-msgstr ""
+msgstr "STOCK_SELECT_COLOR"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_NO"
-msgstr ""
+msgstr "STOCK_NO"
 
 #. module: base
 #: code:addons/addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Cannot delete a point of sale which is already confirmed !"
-msgstr ""
+msgstr "Nemožno odstrániť miesto predaja, ktoré už je potvrdené!"
 
 #. module: base
 #: model:res.country,name:base.st
@@ -1980,28 +1998,29 @@ msgstr ""
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktúra"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_REDO"
-msgstr ""
+msgstr "STOCK_REDO"
 
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #. module: base
 #: model:res.country,name:base.mg
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagaskar"
 
 #. module: base
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
 
 #. module: base
 #: help:ir.rule.group,global:0
@@ -2014,7 +2033,7 @@ msgstr ""
 #: view:ir.ui.menu:0
 #: field:ir.ui.menu,name:0
 msgid "Menu"
-msgstr ""
+msgstr "Ponuka"
 
 #. module: base
 #: field:res.currency,rate:0
@@ -2024,12 +2043,12 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr ""
+msgstr "Zobraziť originál"
 
 #. module: base
 #: view:ir.values:0
 msgid "Action To Launch"
-msgstr ""
+msgstr "Akcia, ktorá má začať"
 
 #. module: base
 #: code:addons/addons/stock/stock.py:0
@@ -2042,17 +2061,17 @@ msgstr ""
 #. module: base
 #: field:ir.actions.url,target:0
 msgid "Action Target"
-msgstr ""
+msgstr "Cieľ akcie"
 
 #. module: base
 #: model:res.country,name:base.ai
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #. module: base
 #: field:ir.model.config,password_check:0
 msgid "Confirmation"
-msgstr ""
+msgstr "Potvrdenie"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_report_custom.py:0
@@ -2095,23 +2114,23 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.zw
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
 #: view:res.users:0
 msgid "Configure User"
-msgstr ""
+msgstr "Konfigurácia používateľa"
 
 #. module: base
 #: field:ir.actions.server,email:0
 msgid "Email Address"
-msgstr ""
+msgstr "E-mailová adresa"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
@@ -2139,7 +2158,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.lv
 msgid "Latvia"
-msgstr ""
+msgstr "Lotyšsko"
 
 #. module: base
 #: view:ir.values:0
@@ -2160,7 +2179,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Customization"
-msgstr ""
+msgstr "Kustomizácia"
 
 #. module: base
 #: model:res.country,name:base.py
@@ -2176,12 +2195,12 @@ msgstr ""
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
 msgid "left"
-msgstr ""
+msgstr "vľavo"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_close
 msgid "ir.actions.act_window_close"
-msgstr ""
+msgstr "ir.actions.act_window_close"
 
 #. module: base
 #: field:ir.server.object.lines,col1:0
@@ -2191,7 +2210,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.lt
 msgid "Lithuania"
-msgstr ""
+msgstr "Lotyško"
 
 #. module: base
 #: code:addons/addons/crm_configuration/wizard/wizard_partner_create.py:0
@@ -2203,12 +2222,12 @@ msgstr ""
 #: code:addons/addons/project/wizard/task_delegate.py:0
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "KONTROLA: "
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_PRINT_PREVIEW"
-msgstr ""
+msgstr "STOCK_PRINT_PREVIEW"
 
 #. module: base
 #: code:addons/osv/orm.py:0
@@ -2220,12 +2239,12 @@ msgstr ""
 #: code:addons/addons/stock/wizard/wizard_inventory.py:0
 #, python-format
 msgid "Message !"
-msgstr ""
+msgstr "Správa !"
 
 #. module: base
 #: model:res.country,name:base.si
 msgid "Slovenia"
-msgstr ""
+msgstr "Slovinsko"
 
 #. module: base
 #: code:addons/addons/project_timesheet/project_timesheet.py:0
@@ -2239,7 +2258,7 @@ msgstr ""
 #: view:res.partner.canal:0
 #: field:res.partner.event,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanál"
 
 #. module: base
 #: code:addons/addons/crm/crm.py:0
@@ -2260,7 +2279,7 @@ msgstr ""
 #: code:addons/addons/stock/wizard/wizard_track_line.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Chyba!"
 
 #. module: base
 #: view:res.lang:0
@@ -2286,12 +2305,12 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nz
 msgid "New Zealand"
-msgstr ""
+msgstr "Nový Zéland"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "Openstuff.net"
-msgstr ""
+msgstr "Openstuff.net"
 
 #. module: base
 #: code:addons/addons/account/wizard/wizard_account_balance_report.py:0
@@ -2300,12 +2319,12 @@ msgstr ""
 #: code:addons/addons/account/wizard/wizard_third_party_ledger.py:0
 #, python-format
 msgid "Date not in a defined fiscal year"
-msgstr ""
+msgstr "Pre fiškálny rok nie je definovaný dátum"
 
 #. module: base
 #: model:res.country,name:base.nf
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Norfolkské ostrovy"
 
 #. module: base
 #: code:addons/addons/delivery/delivery.py:0
@@ -2316,7 +2335,7 @@ msgstr ""
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr ""
+msgstr "STOCK_MEDIA_PLAY"
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
@@ -2336,29 +2355,29 @@ msgstr ""
 #. module: base
 #: field:ir.rule,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operátor"
 
 #. module: base
 #: wizard_view:module.lang.install,start:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Nainštalované"
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
 #, python-format
 msgid "Registration of your account"
-msgstr ""
+msgstr "Registrácia účtu"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
 msgid "STOCK_OPEN"
-msgstr ""
+msgstr "STOCK_OPEN"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
 #: selection:ir.actions.server,state:0
 msgid "Client Action"
-msgstr ""
+msgstr "Klientske akcie"
 
 #. module: base
 #: code:addons/addons/sale/wizard/make_invoice_advance.py:0
@@ -2371,17 +2390,17 @@ msgstr ""
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
 msgid "right"
-msgstr ""
+msgstr "vpravo"
 
 #. module: base
 #: model:res.country,name:base.bd
 msgid "Bangladesh"
-msgstr ""
+msgstr "Bangladéž"
 
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Chyba! Nemôžete vytvárať rekurzívne spoločnosti."
 
 #. module: base
 #: code:addons/addons/account/account_bank_statement.py:0
@@ -2392,13 +2411,13 @@ msgstr ""
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Platný"
 
 #. module: base
 #: code:addons/addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not delete this document! (%s)"
-msgstr ""
+msgstr "Nedá sa odstrániť tento dokument! (%s)"
 
 #. module: base
 #: code:addons/addons/l10n_ch/wizard/dta_wizard.py:0
@@ -2410,18 +2429,18 @@ msgstr ""
 #: code:addons/addons/purchase/purchase.py:0
 #, python-format
 msgid "No Partner!"
-msgstr ""
+msgstr "Žiadny partner!"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "XSL"
-msgstr ""
+msgstr "XSL"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 #: model:ir.ui.menu,name:base.menu_partner_other_form
 msgid "Others Partners"
-msgstr ""
+msgstr "Ostatní partneri"
 
 #. module: base
 #: code:addons/addons/base/module/module.py:0
@@ -2432,17 +2451,17 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.cu
 msgid "Cuba"
-msgstr ""
+msgstr "Kuba"
 
 #. module: base
 #: view:res.lang:0
 msgid "%S - Second as a decimal number [00,61]."
-msgstr ""
+msgstr "%S - sekundy ako desatinné číslo [00,61]."
 
 #. module: base
 #: model:res.country,name:base.am
 msgid "Armenia"
-msgstr ""
+msgstr "Arménsko"
 
 #. module: base
 #: code:addons/addons/odms/odms.py:0
diff --git a/addons/scrum/i18n/zh_CN.po b/addons/scrum/i18n/zh_CN.po
index 86d7f3ea512..8e6f8c5d503 100644
--- a/addons/scrum/i18n/zh_CN.po
+++ b/addons/scrum/i18n/zh_CN.po
@@ -7,24 +7,24 @@ 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-30 13:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-26 02:10+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:54+0000\n"
+"X-Launchpad-Export-Date: 2009-11-26 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
 msgid "Scrum Product backlog"
-msgstr ""
+msgstr "sc"
 
 #. module: scrum
 #: field:scrum.meeting,name:0
 msgid "Meeting Name"
-msgstr ""
+msgstr "会议主题"
 
 #. module: scrum
 #: model:process.transition,note:scrum.process_transition_backlogtask0
@@ -35,13 +35,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:scrum.action_view_task4
 #: model:ir.ui.menu,name:scrum.menu_action_view_task4
 msgid "My tasks"
-msgstr ""
+msgstr "我的任务"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree6
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree6
 msgid "My opened sprints (Product Owner)"
-msgstr ""
+msgstr "我进行中的冲刺（项目负责人）"
 
 #. module: scrum
 #: model:process.node,note:scrum.process_node_productbacklog0
@@ -51,17 +51,17 @@ msgstr ""
 #. module: scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "操作定义中使用了无效的模式名称。"
 
 #. module: scrum
 #: model:ir.module.module,shortdesc:scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "Scrum，敏捷开发方法"
 
 #. module: scrum
 #: field:scrum.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "进度"
 
 #. module: scrum
 #: help:scrum.task,remaining_hours:0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: scrum
 #: field:scrum.project,child_id:0
 msgid "Subproject"
-msgstr ""
+msgstr "子项目"
 
 #. module: scrum
 #: view:scrum.meeting:0
@@ -88,34 +88,34 @@ msgstr ""
 #. module: scrum
 #: field:scrum.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "项目成员"
 
 #. module: scrum
 #: view:scrum.project:0
 msgid "Scrum Projects"
-msgstr ""
+msgstr "Scrum 项目列表"
 
 #. module: scrum
 #: field:scrum.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "已委托的任务列表"
 
 #. module: scrum
 #: help:scrum.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 ""
+msgstr "任务关闭时通知客户的消息邮件的头"
 
 #. module: scrum
 #: field:scrum.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "优先级"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_task
 msgid "Scrum Task"
-msgstr ""
+msgstr "Scrum 任务"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.dblc_proj
@@ -126,13 +126,13 @@ msgstr ""
 #: help:scrum.project,members:0
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
-msgstr ""
+msgstr "项目成员没有被任何统计计算所使用，而是仅仅为了记录信息。"
 
 #. module: scrum
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "非常紧急"
 
 #. module: scrum
 #: field:scrum.sprint,retrospective:0
@@ -142,7 +142,7 @@ msgstr ""
 #. module: scrum
 #: field:scrum.sprint,name:0
 msgid "Sprint Name"
-msgstr ""
+msgstr "冲刺主题"
 
 #. module: scrum
 #: help:scrum.task,planned_hours:0
@@ -155,7 +155,7 @@ msgstr ""
 #: field:scrum.project,notes:0
 #: field:scrum.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. module: scrum
 #: model:ir.model,name:scrum.model_scrum_product_backlog
@@ -167,20 +167,20 @@ msgstr ""
 #: field:scrum.sprint,project_id:0
 #: field:scrum.task,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: scrum
 #: help:scrum.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 ""
+msgstr "如果选中此字段，项目经理当他的团队完成每一个任务的时候将收到一个请求。"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 #: selection:scrum.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: scrum
 #: field:scrum.team,name:0
@@ -190,7 +190,7 @@ msgstr ""
 #. module: scrum
 #: field:scrum.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "邮件头"
 
 #. module: scrum
 #: field:scrum.project,sprint_size:0
@@ -200,12 +200,12 @@ msgstr ""
 #. module: scrum
 #: field:scrum.sprint,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "结束时间"
 
 #. module: scrum
 #: help:scrum.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "任务完成的工作时间合计"
 
 #. module: scrum
 #: help:scrum.project,warn_customer:0
@@ -217,12 +217,12 @@ msgstr ""
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_task_open
 msgid "View sprint Tasks"
-msgstr ""
+msgstr "查看冲刺任务列表"
 
 #. module: scrum
 #: field:scrum.project,category_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "分析科目"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_view_task
@@ -233,25 +233,25 @@ msgstr "所有任务"
 #. module: scrum
 #: field:scrum.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "截止日期"
 
 #. module: scrum
 #: field:scrum.project,partner_id:0
 #: field:scrum.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: scrum
 #: field:scrum.product.backlog,planned_hours:0
 #: field:scrum.sprint,planned_hours:0
 #: field:scrum.task,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "计划小时数"
 
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "模版"
 
 #. module: scrum
 #: field:scrum.product.backlog,priority:0
@@ -262,7 +262,7 @@ msgstr ""
 #: field:scrum.project,state:0
 #: view:scrum.sprint:0
 msgid "State"
-msgstr ""
+msgstr "状态"
 
 #. module: scrum
 #: help:scrum.project,progress_rate:0
@@ -272,7 +272,7 @@ msgstr ""
 #. module: scrum
 #: help:scrum.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "项目的内部说明"
 
 #. module: scrum
 #: field:scrum.sprint,meetings_id:0
@@ -282,7 +282,7 @@ msgstr ""
 #. module: scrum
 #: help:scrum.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "计算方法：花费时间－剩余时间"
 
 #. module: scrum
 #: field:scrum.task,type:0

From 8a69247d552ca3e516c0fc98d0d6cae0244250b4 Mon Sep 17 00:00:00 2001
From: rpa-openerp <>
Date: Thu, 26 Nov 2009 11:20:50 +0530
Subject: [PATCH 58/59] [FIX] account: security xml file error for bad schema
 validator

bzr revid: mra@tinyerp.com-20091126055050-ktny3rnlqreitaxl
---
 addons/account/security/account_security.xml | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 529f287e602..1ee295e328b 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -38,7 +38,7 @@
 
     <record id="account_move_comp_rule_group" model="ir.rule.group">
             <field name="name">Account Entry</field>
-            <field model="ir.model" ref="model_account_move"/>
+            <field model="ir.model" name="model_id" ref="model_account_move"/>
             <field eval="True" name="global"/>
     </record>
 
@@ -51,7 +51,7 @@
 
     <record id="account_move_line_comp_rule_group" model="ir.rule.group">
             <field name="name">Entry lines</field>
-            <field model="ir.model" ref="model_account_move_line"/>
+            <field model="ir.model" name="model_id" ref="model_account_move_line"/>
             <field eval="True" name="global"/>
     </record>
 
@@ -63,7 +63,7 @@
     </record>
     <record id="journal_period_comp_rule_group" model="ir.rule.group">
         <field name="name">Journal Period</field>
-        <field model="ir.model" ref="model_account_journal_period"/>
+        <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
         <field eval="True" name="global"/>
     </record>
     <record id="journal_period_comp_rule" model="ir.rule">
@@ -75,7 +75,7 @@
     
     <record id="journal_comp_rule_group" model="ir.rule.group">
         <field name="name">Journal multi-company</field>
-        <field model="ir.model" ref="model_account_journal"/>
+        <field model="ir.model" name="model_id" ref="model_account_journal"/>
         <field eval="True" name="global"/>
     </record>
     <record id="journal_comp_rule" model="ir.rule">
@@ -87,7 +87,7 @@
     
     <record id="analytic_journal_comp_rule_group" model="ir.rule.group">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" ref="model_account_analytic_journal"/>
+        <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
     </record>
     <record id="analytic_journal_comp_rule" model="ir.rule">
@@ -98,7 +98,7 @@
     </record>
     <record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" ref="model_account_analytic_journal"/>
+        <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
     </record>
     
@@ -111,7 +111,7 @@
     
     <record id="period_comp_rule_group" model="ir.rule.group">
         <field name="name">Period multi-company</field>
-        <field model="ir.model" ref="model_account_period"/>
+        <field model="ir.model" name="model_id" ref="model_account_period"/>
         <field eval="True" name="global"/>
     </record>
     <record id="period_comp_rule" model="ir.rule">
@@ -124,7 +124,7 @@
     
     <record id="fiscal_year_comp_rule_group" model="ir.rule.group">
         <field name="name">Fiscal year multi-company</field>
-        <field model="ir.model" ref="model_account_fiscalyear"/>
+        <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
         <field eval="True" name="global"/>
     </record>
     <record id="fiscal_year_comp_rule" model="ir.rule">
@@ -136,7 +136,7 @@
     
     <record id="account_comp_rule_group" model="ir.rule.group">
         <field name="name">Account multi-company</field>
-        <field model="ir.model" ref="model_account_account"/>
+        <field model="ir.model" name="model_id" ref="model_account_account"/>
         <field eval="True" name="global"/>
     </record>
     <record id="account_comp_rule" model="ir.rule">
@@ -148,7 +148,7 @@
     
     <record id="tax_comp_rule_group" model="ir.rule.group">
         <field name="name">Tax multi-company</field>
-        <field model="ir.model" ref="model_account_tax"/>
+        <field model="ir.model" name="model_id" ref="model_account_tax"/>
         <field eval="True" name="global"/>
     </record>
     <record id="tax_comp_rule" model="ir.rule">
@@ -160,7 +160,7 @@
     
     <record id="tax_code_comp_rule_group" model="ir.rule.group">
         <field name="name">Tax code multi-company</field>
-        <field model="ir.model" ref="model_account_tax_code"/>
+        <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
         <field eval="True" name="global"/>
     </record>
     <record id="tax_code_comp_rule" model="ir.rule">
@@ -172,7 +172,7 @@
     
     <record id="invoice_comp_rule_group" model="ir.rule.group">
         <field name="name">Invoice multi-company</field>
-        <field model="ir.model" ref="model_account_invoice"/>
+        <field model="ir.model" name="model_id" ref="model_account_invoice"/>
         <field eval="True" name="global"/>
     </record>
     <record id="invoice_comp_rule" model="ir.rule">

From d8dc05715d93963f3c72b78a57d07ca9552ef45f Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 26 Nov 2009 12:25:58 +0530
Subject: [PATCH 59/59] [FIX] hr_holidays: solve problem of no reference error
 for hr view

bzr revid: mra@tinyerp.com-20091126065558-ft9llj0zjmujpjbs
---
 addons/hr_holidays/hr_view.xml | 76 +++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 9aa266a1c5b..321541beb92 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -2,6 +2,31 @@
 <openerp>
     <data>
 
+        <!-- Menu Items -->
+
+        <record id="view_hr_holidays_filter" model="ir.ui.view">
+            <field name="name">hr.holidays.filter</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Leave">
+	               	<group col='6' colspan='4'>
+	               		<filter icon="gtk-execute" string="My Leaves" domain="[('user_id','=',uid)]" separator="1" help="Leaves Related to Current User"/>
+                        <filter icon="gtk-execute" string="My Departments Leaves" domain="[('user_id','child_of',[uid])]" help="Leaves Related to Department"/>
+	              		<field name="state" select="1">
+	              			<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Holidays"/>
+	              			<filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
+	              			<filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
+	              		</field>
+	              		<field name="name" select='1'/>
+	              		<field name="user_id" select="1" widget="selection"/>
+	              	</group>
+             	</search>
+            </field>
+        </record>
+
+
+
         <!-- Holidays: Leave Request -->
 
         <record model="ir.ui.view" id="edit_holiday_new">
@@ -37,7 +62,7 @@
         </record>
 
         <!-- Holidays: Allocation Request -->
-        
+
         <record model="ir.ui.view" id="allocation_leave_new">
             <field name="name">Allocation Request</field>
             <field name="model">hr.holidays</field>
@@ -68,7 +93,7 @@
         </record>
 
         <!-- Holidays: Company Allocation -->
-        
+
         <record model="ir.ui.view" id="allocation_company_new">
             <field name="name">Company Allocation</field>
             <field name="model">hr.holidays</field>
@@ -133,21 +158,21 @@
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
-		
+
  	<record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="view_holiday"/>
         <field name="act_window_id" ref="open_ask_holidays"/>
-    </record>    
-    
+    </record>
+
     <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
         <field name="sequence" eval="2"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="edit_holiday_new"/>
         <field name="act_window_id" ref="open_ask_holidays"/>
-    </record>   
-    
+    </record>
+
      <menuitem
           name="Holidays Requests"
             parent="menu_open_ask_holidays"
@@ -162,21 +187,21 @@
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new" />
         </record>
-		
+
 	<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="view_holiday"/>
         <field name="act_window_id" ref="open_allocation_holidays"/>
-    </record>    
-    
+    </record>
+
     <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
         <field name="sequence" eval="2"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="allocation_company_new"/>
         <field name="act_window_id" ref="open_allocation_holidays"/>
-    </record>   
-    
+    </record>
+
      <menuitem
           name="Allocation Requests"
             parent="menu_open_ask_holidays"
@@ -217,37 +242,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
+
         <menuitem
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
             parent="hr.menu_hr_configuration"/>
 
-
-        <!-- Menu Items -->
-
-        <record id="view_hr_holidays_filter" model="ir.ui.view">
-            <field name="name">hr.holidays.filter</field>
-            <field name="model">hr.holidays</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Leave">
-	               	<group col='6' colspan='4'>
-	               		<filter icon="gtk-execute" string="My Leaves" domain="[('user_id','=',uid)]" separator="1" help="Leaves Related to Current User"/>
-                        <filter icon="gtk-execute" string="My Departments Leaves" domain="[('user_id','child_of',[uid])]" help="Leaves Related to Department"/>
-	              		<field name="state" select="1">
-	              			<filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Holidays"/>
-	              			<filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
-	              			<filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
-	              		</field>
-	              		<field name="name" select='1'/>
-	              		<field name="user_id" select="1" widget="selection"/>
-	              	</group>
-             	</search>
-            </field>
-        </record>
-
-
     <!--  Shortcuts -->
         <act_window name="My Holiday Requests"
             domain="[('employee_id', '=', active_id), ('type','=','remove')]"