diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index 9cbc57bbdc9..8e83d9aa7a7 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -32,5 +32,6 @@ import report
 import product
 import sequence
 import company
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/account.py b/addons/account/account.py
index 8896f8a7a69..852e8e483f7 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -917,7 +917,7 @@ class account_move(osv.osv):
         'to_check': fields.boolean('To Be Verified'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
-        'date': fields.date('Date', required=True),
+        'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
         'type': fields.selection([
             ('pay_voucher','Cash Payment'),
             ('bank_pay_voucher','Bank Payment'),
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 6350f32afbc..d02dec33af0 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -167,7 +167,7 @@ class res_partner(osv.osv):
 
     _columns = {
                 'contract_ids': fields.one2many('account.analytic.account', \
-                                                    'partner_id', 'Contracts'),
+                                                    'partner_id', 'Contracts', readonly=True),
                 }
 
 res_partner()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 701d3c9fcc9..77369bdca25 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -356,7 +356,7 @@
                         <field name="amount_total"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="12" col="10">
+                    <group expand="1" string="Group By...">
                         <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 9d449f116f4..656d9d2f595 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -23,21 +23,30 @@
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 
         <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
-
+        
         <report
-        	auto="False"
-        	id="account_vat_declaration"
-        	menu="False"
-        	model="account.tax.code"
-        	name="account.vat.declaration"
-        	rml="account/report/tax_report.rml"
-        	string="Taxes Report"/>
-
+            auto="False"
+            id="account_vat_declaration"
+            menu="False"
+            model="account.tax.code"
+            name="account.vat.declaration"
+            rml="account/report/tax_report.rml"
+            string="Taxes Report"/>
+        
+        <report id="report_account_voucher_new"
+            string="Print Voucher"
+            model="account.move"
+            name="account.move.voucher"
+            rml="account/report/voucher_print.rml"
+            auto="False"
+            header = "False"
+            menu="True"/>
+        
         <menuitem
             id="menu_tax_report"
             name="Taxes"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
-
+        
 <!--        <wizard
             id="wizard_vat_declaration"
             menu="False"
@@ -68,20 +77,20 @@
 
 
         <report id="account_account_balance_compare"
-			string="Account balance"
-			model="account.account"
-			name="account.balance.account.balance"
-			rml="account/report/compare_account_balance.rml"
-			auto="False"
-			menu="False"/>
+            string="Account balance"
+            model="account.account"
+            name="account.balance.account.balance"
+            rml="account/report/compare_account_balance.rml"
+            auto="False"
+            menu="False"/>
 
-		<report id="account_account_balance_landscape"
-			string="Account balance"
-			model="account.account"
-			name="account.account.balance.landscape"
-			rml="account/report/account_balance_landscape.rml"
-			auto="False"
-			menu="False"/>
+        <report id="account_account_balance_landscape"
+            string="Account balance"
+            model="account.account"
+            name="account.account.balance.landscape"
+            rml="account/report/account_balance_landscape.rml"
+            auto="False"
+            menu="False"/>
 
         <!--
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 63700676127..a5591cb3252 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -239,7 +239,7 @@
             <field name="arch" type="xml">
                 <form string="Journal View">
                     <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="columns_id" widget="one2many_list"/>
+                    <field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
@@ -277,20 +277,41 @@
 
                     <notebook colspan="4">
                         <page string="General Information">
-                            <field name="view_id"/>
-                            <field name="currency"/>
-                            <field name="sequence_id"/>
-                            <field name="invoice_sequence_id"/>
-                            <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="allow_date" groups="base.group_extended"/>
-                            <field name="company_id" groups="base.group_multi_company"/>
-                            <newline/>
-                            <field name="centralisation"/>
-                            <field name="group_invoice_lines"/>
-                            <field name="update_posted"/>
-                            <field name="entry_posted"/>
+                            <group colspan="2" col="2">
+                                <separator string="Journal View" colspan="4"/>
+                                <field name="view_id"/>
+                            </group>
+                            
+                            <group colspan="2" col="2">
+                                <separator string="Sequence" colspan="4"/>
+                                <field name="sequence_id"/>
+                                <field name="invoice_sequence_id"/>
+                            </group>
+                            
+                            <group colspan="2" col="2">
+                                <separator string="Accounts" colspan="4"/>
+                                <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')]"/>
+                            </group>
+                            
+                            <group colspan="2" col="2">
+                                <separator string="Validations" colspan="4"/>  
+                                <field name="allow_date" groups="base.group_extended"/>
+                            </group>
+                            
+                            <group colspan="2" col="2">
+                                <separator string="Company" colspan="4"/> 
+                                <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="user_id" groups="base.group_extended"/>
+                                <field name="currency"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Other Configuration" colspan="4"/> 
+                                <field name="centralisation"/>
+                                <field name="group_invoice_lines"/>
+                                <field name="update_posted"/>
+                                <field name="entry_posted"/>
+                            </group>
                         </page>
                         <page string="Entry Controls">
                             <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
@@ -342,7 +363,7 @@
                     <group colspan="2" col="3">
 <!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
 <!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
-                    	<button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
+                        <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
                     </group>
                     <newline/>
                     <field name="balance_start"/>
@@ -880,65 +901,69 @@
                         <field name="period_id"/>
                         <field name="type"/>
                         <field name="ref" select="1"/>
-                        <field name="company_id" required="1" groups="base.group_multi_company"/>
-                        <field name="date" select="1" groups="base.group_extended"/>
-                        <field name="to_check" groups="base.group_extended"/>
                     </group>
-                    <field name="partner_id" invisible="1" select="1"/>
-                    <field name="amount" invisible="1" select="1"/>
+                    <notebook colspan="4">
+                        <page string="Journal Entries Lines">
+                            <field colspan="4" height="200" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+                                <form string="Account Entry Line">
+                                    <separator colspan="4" string="General Information"/>
+                                    <field name="name" select="1"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
 
-                    <field colspan="4" height="260" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
-                        <form string="Account Entry Line">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="name" select="1"/>
-                            <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <field name="debit" select="1"/>
+                                    <field name="credit" select="1"/>
+                                    <field name="date" select="1"/>
 
-                            <field name="debit" select="1"/>
-                            <field name="credit" select="1"/>
-                            <field name="date" select="1"/>
+                                    <separator colspan="4" string="Optional Information"/>
+                                    <field name="currency_id"/>
+                                    <field name="amount_currency"/>
+                                    <field name="quantity" select="1"/>
+                                    <newline/>
+                                    <field name="date_maturity"/>
+                                    <field name="date_created"/>
 
-                            <separator colspan="4" string="Optional Information"/>
-                            <field name="currency_id"/>
-                            <field name="amount_currency"/>
-                            <field name="quantity" select="1"/>
-                            <newline/>
-                            <field name="date_maturity"/>
-                            <field name="date_created"/>
-
-                            <separator colspan="4" string="State"/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id"/>
-                            <field name="statement_id"/>
-                            <field name="state"/>
-                        </form>
-                        <tree editable="top" string="Account Entry Line">
-                            <field name="ref"/>
-                            <field name="invoice"/>
-                            <field name="name"/>
-                            <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
-                            <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
-                            <field name="date_maturity"/>
-                            <field name="debit" sum="Total Debit"/>
-                            <field name="credit" sum="Total Credit"/>
-                            <field name="analytic_account_id"/>
-                            <field name="amount_currency" groups="base.group_extended"/>
-                            <field name="currency_id" groups="base.group_extended"/>
-                            <field name="tax_code_id"/>
-                            <field name="tax_amount"/>
-                            <field name="state"/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id" groups="base.group_extended"/>
-                        </tree>
-                    </field>
-                    <separator colspan="4" string="Narration"/>
-                    <field name="narration" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string="State"/>
-                    <field name="state" select="1"/>
-                    <group col="2" colspan="2">
-                        <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
-                        <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
-                    </group>
+                                    <separator colspan="4" string="State"/>
+                                    <field name="reconcile_id"/>
+                                    <field name="reconcile_partial_id"/>
+                                    <field name="statement_id"/>
+                                    <field name="state"/>
+                                </form>
+                                <tree editable="top" string="Account Entry Line">
+                                    <field name="ref"/>
+                                    <field name="invoice"/>
+                                    <field name="name"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+                                    <field name="date_maturity"/>
+                                    <field name="debit" sum="Total Debit"/>
+                                    <field name="credit" sum="Total Credit"/>
+                                    <field name="analytic_account_id"/>
+                                    <field name="amount_currency" groups="base.group_extended"/>
+                                    <field name="currency_id" groups="base.group_extended"/>
+                                    <field name="tax_code_id"/>
+                                    <field name="tax_amount"/>
+                                    <field name="state"/>
+                                    <field name="reconcile_id"/>
+                                    <field name="reconcile_partial_id" groups="base.group_extended"/>
+                                </tree>
+                            </field>
+                            <separator colspan="4" string="Narration"/>
+                            <field name="narration" colspan="4" nolabel="1"/>
+                            <field name="state" select="1"/>
+                            <group col="2" colspan="2">
+                                <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
+                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                            </group>
+                        </page>
+                        <page string="Other Information">
+                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+                            <field name="date" select="1" groups="base.group_extended"/>
+                            <field name="to_check" groups="base.group_extended"/>
+                            <field name="partner_id" invisible="1" select="1"/>
+                            <field name="amount" invisible="1" select="1"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index dbaa321f329..4af3b43d54c 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -23,7 +23,6 @@ import time
 import decimal_precision as dp
 
 import netsvc
-
 from osv import fields, osv, orm
 import pooler
 from tools import config
@@ -1525,7 +1524,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
-                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'),
+                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
                 }
 
 res_partner()
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index edbe704d4db..286d0f1d79e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -74,7 +74,7 @@
                 <page string="Accounting" position="inside">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
-                        <field name="property_account_receivable"/>
+                        <field name="property_account_receivable" />
                         <field name="property_account_position" widget="selection"/>
                         <field name="property_payment_term" widget="selection"/>
                     </group>
@@ -118,10 +118,27 @@
                             <field name="acc_number"/>
                         </tree>
                     </field>
+                    <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
                 </page>
                 </notebook>
             </field>
         </record>
+        
+        <!--  Partners info tab view-->
 
+        <record id="view_account_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.account.info.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">
+                <notebook position="inside">
+                    <page string="Project">
+                        <field name="contract_ids" colspan="4" nolabel="1" />
+                    </page>
+                </notebook>
+            </field>
+        </record>
+        
     </data>
 </openerp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e57629d2618..b4a7b67a05a 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -67,7 +67,7 @@
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
                         <field name="parent_id" on_change="on_change_parent(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="type" select="2"/>
                         <field name="company_currency_id" select="2"/>
                     </group>
@@ -153,7 +153,7 @@
                     <field name="ref" select="2"/>
                     <field name="currency_id" select="2"/>
                     <field name="amount_currency" select="2"/>
-                    <field name="company_id" select="2"/>
+                    <field name="company_id" select="2" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="product_id" select="2"/>
                     <field name="product_uom_id" select="2"/>
@@ -178,7 +178,7 @@
                     <field name="ref"/>
                     <field name="currency_id" />
                     <field name="amount_currency" />
-                    <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                    <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -288,7 +288,7 @@
                     <field name="code" select="1"/>
                     <field name="type" select="2"/>
                     <field name="active" select="2"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </form>
             </field>
         </record>
@@ -443,21 +443,6 @@
                 </graph>
             </field>
      </record>
-	
-	<!--  Partners inherited form -->
-
-		<record id="view_contract_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.contract.info.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="invoice_ids" position="after">
-					<field name="contract_ids" colspan="4" nolabel="1" />
-				</field>
-            </field>
-        </record>
-	
 
     </data>
 </openerp>
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index b411e404cac..0afffa24417 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -40,5 +40,6 @@ import account_analytic_report
 import account_account_report
 import account_entries_report
 import account_analytic_entries_report
+import voucher_print
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index 32e77be341f..f2d6338c951 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -57,22 +57,23 @@
                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <field name="type" />
-                    <field name="user_type" widget="selection"/>
-                    <field name="parent_account_id" />
-                </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                	<filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
-                	<filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
-                	<filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                	<separator orientation="vertical"/>
-                	<filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
+                <group expand="1" string="Group By...">
+                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
+                    <filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
+                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
                     <filter string="Internal Type" icon="terp-account" context="{'group_by':'type'}"/>
                     <filter string="Account Type" icon="terp-account" context="{'group_by':'user_type'}"/>
                     <filter string="Parent Account" icon="terp-account" context="{'group_by':'parent_account_id'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <field name="type" />
+                    <field name="user_type" widget="selection"/>
+                    <field name="parent_account_id" />
+                </group>
+
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 41d9c0976f2..e1cd7967b8d 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -55,17 +55,7 @@
 	                <field name="currency_id"/>
 	            </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-					<field name="account_id" />
-					<field name="general_account_id" widget="selection"/>
-					<field name="journal_id" widget="selection"/>
-					<separator orientation="vertical"/>
-					<field name="product_id" />
-					<field name="product_uom_id" widget="selection"/>
-            <field name="company_id" widget="selection" groups="base.multi_company"/>
-        		</group>
-        		<newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
                     <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.multi_company"/>
@@ -81,6 +71,17 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended options..." groups="base.group_extended">
+					<field name="account_id" />
+					<field name="general_account_id" widget="selection"/>
+					<field name="journal_id" widget="selection"/>
+					<separator orientation="vertical"/>
+					<field name="product_id" />
+					<field name="product_uom_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.multi_company"/>
+        		</group>
+
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 838cefe5898..9a60b8a7bd0 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -58,7 +58,7 @@
                     <filter icon="terp-account"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
 	                <field name="name"/>
 	                <field name="user_id" widget="selection">
 	                    <filter icon="terp-account"
@@ -69,25 +69,6 @@
 	                <field name="partner_id"/>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-account"
-                    		string="Close"
-                    		domain="[('state','=','close')]"/>
-                    <filter icon="terp-account"
-                    		string="Template"
-                    		domain="[('state','=','template')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="parent_id"/>
-                    <field name="journal_id" widget="selection"/>
-                    <newline/>
-                    <field name="product_id" />
-                    <field name="type"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                 	<filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Associated Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
@@ -104,7 +85,36 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
-            </search>
+
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+                    <filter icon="terp-account"
+                    		string="Draft"
+                    		domain="[('state','=','draft')]"/>
+                    <filter icon="terp-account"
+                    		string="Open"
+                    		domain="[('state','=','open')]"/>
+                    <filter icon="terp-account"
+                    		string="Pending"
+                    		domain="[('state','=','pending')]"/>
+                    <filter icon="terp-account"
+                    		string="Close"
+                    		domain="[('state','=','close')]"/>
+                    <filter icon="terp-account"
+                    		string="Template"
+                    		domain="[('state','=','template')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="parent_id"/>
+                    <field name="journal_id" widget="selection"/>
+                    <newline/>
+                    <field name="product_id" />
+                    <field name="type"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                </group>
+                </search>
         </field>
     </record>
     <record id="view_account_analytic_report_search" model="ir.ui.view">
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index c6308ec9928..625d98fa9cb 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -74,25 +74,6 @@
                         <field name="partner_id" />
 					</group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter string="Posted"
-                   			icon="terp-account"
-                   			domain="[('state','=','posted')]"
-                   			help = "Posted tasks"/>
-                		<field name="state_2"/>
-                	<separator orientation="vertical"/>
-                		<field name="period_id" widget="selection"/>
-                		<field name="period_id2" widget="selection"/>
-                		<field name="type"/>
-                    <field name="product_id" />
-                    <field name="analytic_account_id"/>
-                    <newline/>
-                	<separator orientation="vertical"/>
-                    <field name="date_created"/>
-                		<field name="date"/>
-                    <field name="date_maturity"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
@@ -111,6 +92,25 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                  </group>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                	<filter string="Posted"
+                   			icon="terp-account"
+                   			domain="[('state','=','posted')]"
+                   			help = "Posted tasks"/>
+                		<field name="state_2"/>
+                	<separator orientation="vertical"/>
+                		<field name="period_id" widget="selection"/>
+                		<field name="period_id2" widget="selection"/>
+                		<field name="type"/>
+                    <field name="product_id" />
+                    <field name="analytic_account_id"/>
+                    <newline/>
+                	<separator orientation="vertical"/>
+                    <field name="date_created"/>
+                		<field name="date"/>
+                    <field name="date_maturity"/>
+                </group>
+
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b974afdb8a3..ae00608b164 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -56,10 +56,10 @@
         <field name="arch" type="xml">
             <search string="Invoices">
               <group col="10" colspan="12">
-	            	<filter icon="terp-account" string="Last 365 Days"
+	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Invoices of last 365 days"/>
-	                <filter icon="terp-account" string="Last 30 Days"
+	                <filter icon="gtk-media-rewind" string="Last 30 Days"
 	                		name="month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Invoices of last 30 days"/>
@@ -94,29 +94,8 @@
                     		domain="[('user_id','=',False)]"/>
                     </field>
 				</group>
-                <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <field name="type"/>
-                    <field name="currency_id" widget="selection"/>
-                    <field name="partner_bank" widget="selection"/>
-                    <field name="fiscal_position" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="address_contact_id"/>
-                    <field name="account_id"/>
-                    <newline/>
-                    <field name="payment_term" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <separator orientation="vertical"/>
-                	<field name="address_invoice_id"/>
-                	<field name="product_id"/>
-                	<newline/>
-					<field name="date" string="Date Invoiced"/>
-					<field name="date_due"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+				<newline/>
+                <group expand="1" string="Group By...">
                     <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
@@ -138,6 +117,27 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <field name="type"/>
+                    <field name="currency_id" widget="selection"/>
+                    <field name="partner_bank" widget="selection"/>
+                    <field name="fiscal_position" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="address_contact_id"/>
+                    <field name="account_id"/>
+                    <newline/>
+                    <field name="payment_term" widget="selection"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <separator orientation="vertical"/>
+                	<field name="address_invoice_id"/>
+                	<field name="product_id"/>
+                	<newline/>
+					<field name="date" string="Date Invoiced"/>
+					<field name="date_due"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/voucher_print.py b/addons/account/report/voucher_print.py
new file mode 100755
index 00000000000..1eefd995df7
--- /dev/null
+++ b/addons/account/report/voucher_print.py
@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from tools import amount_to_text_en
+
+class report_voucher_move(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_voucher_move, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+            'convert':self.convert,
+            'debit':self.debit,
+            'credit':self.credit,
+            #'get_ref' : self._get_ref
+        })
+ 	self.user=uid
+     
+    def convert(self,amount):
+    	user_id = self.pool.get('res.users').browse(self.cr, self.user,[self.user])[0]
+    	cur = user_id.company_id.currency_id.name
+        amt_en = amount_to_text_en.amount_to_text(amount,'en',cur);
+        return amt_en
+    
+    def debit(self, move_ids):
+        debit = 0.0
+        for move in move_ids:
+            debit +=move.debit
+        return debit
+    
+    def credit(self, move_ids):
+        credit = 0.0
+        for move in move_ids:
+            credit +=move.credit
+        return credit
+    
+report_sxw.report_sxw(
+    'report.account.move.voucher',
+    'account.move',
+    'addons/account/report/voucher_print.rml',
+    parser=report_voucher_move,header=False
+)
diff --git a/addons/account/report/voucher_print.rml b/addons/account/report/voucher_print.rml
new file mode 100755
index 00000000000..795fd678645
--- /dev/null
+++ b/addons/account/report/voucher_print.rml
@@ -0,0 +1,436 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Heading1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="last_info">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,6" stop="0,6"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,6" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,6" stop="1,6"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,6" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,6" stop="2,6"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="22.0" leading="27" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P15" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P20" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P21" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P22" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P23" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P25" rightIndent="0.0" leftIndent="35.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P27" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
+    <paraStyle name="P28" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P5">[[ repeatIn(objects,'voucher') ]]</para>
+    <para style="P6">[[ company.name ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].street ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].phone ]]</para>
+    <para style="P8">[[ company.partner_id.address and company.partner_id.address[0].email ]]</para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+    <para style="P21">Cash Receipt Voucher [[ (voucher.type == 'rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Cash Payment Voucher [[ (voucher.type == 'pay_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P21">Bank Receipt Voucher [[ (voucher.type == 'bank_rec_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Bank Payment Voucher [[ (voucher.type == 'bank_pay_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Contra Voucher [[ (voucher.type == 'cont_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Journal Sale Voucher [[ (voucher.type == 'journal_sale_vou' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Journal Purchase Voucher [[ (voucher.type == 'journal_pur_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P2">Journal Voucher [[ (voucher.type == 'journal_voucher' or removeParentNode('para')) and '' ]]</para>
+    <para style="P20">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="49.0,143.0,116.0,69.0,106.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P12">Name:</para>
+        </td>
+        <td>
+          <para style="P13">[[ voucher.name ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">Dated :</para>
+        </td>
+        <td>
+          <para style="P13">[[ time.strftime('%d %B,%Y', time.strptime(voucher.date , '%Y-%m-%d')) or '' ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P12">State :</para>
+        </td>
+        <td>
+          <para style="P3">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
+          <para style="P3">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+          <para style="P3">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+          <para style="P3">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">Ref. :</para>
+        </td>
+        <td>
+          <para style="P13">[[ voucher.ref]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P15">
+      <font color="white"> </font>
+    </para>
+    <para style="P15">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="275.0,106.0,102.0" style="Heading1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Particulars</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(voucher.line_id,'line_id') ]]</para>
+      <blockTable colWidths="274.0,106.0,102.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_Bold_9">[[ (line_id.partner_id and line_id.partner_id.name) or 'Account']]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.debit) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.credit) ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9_30">[[ line_id.account_id.name ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9_30">[[ line_id.name ]]-[[voucher.ref]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="275.0,106.0,102.0" style="last_info">
+      <tr>
+        <td>
+          <para style="P16">Through : </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P22">[[ voucher.narration or '']]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">On Account of : </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P25">[[ voucher.line_id and voucher.line_id.name and voucher.line_id.name[1] or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P16">Amount (in words) : </para>
+        </td>
+        <td>
+          <para style="P16">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P16">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P26">[[ convert(voucher.amount) ]]</para>
+        </td>
+        <td>
+          <para style="P15">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P15">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P17">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(debit(voucher.line_id))]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(credit(voucher.line_id)) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P18">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="142.0,99.0,105.0,136.0" style="Table3">
+      <tr>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P10">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P20">Receiver's Signature</para>
+        </td>
+        <td>
+          <para style="P20">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P20">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P20">Authorised Signatory</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account/rml_parse.py b/addons/account/rml_parse.py
new file mode 100755
index 00000000000..fd73d16a406
--- /dev/null
+++ b/addons/account/rml_parse.py
@@ -0,0 +1,166 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from report import report_sxw
+import xml.dom.minidom
+import os, time
+import osv
+import re
+import tools
+import pooler
+import re
+import sys
+
+class rml_parse(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(rml_parse, self).__init__(cr, uid, name, context=None)
+        self.localcontext.update({
+            'comma_me': self.comma_me,
+            'format_date': self._get_and_change_date_format_for_swiss,
+            'strip_name' : self._strip_name,
+            'explode_name' : self._explode_name,
+        })
+
+    def comma_me(self,amount):
+        #print "#" + str(amount) + "#"
+        if not amount:
+            amount = 0.0
+        if  type(amount) is float :
+            amount = str('%.2f'%amount)
+        else :
+            amount = str(amount)
+        if (amount == '0'):
+             return ' '
+        orig = amount
+        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
+        if orig == new:
+            return new
+        else:
+            return self.comma_me(new)
+        
+    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
+        ellipsis = ellipsis or ''
+        try:
+            return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
+        except Exception, e:
+            return False
+        
+    def _strip_name(self, name, maxlen=50):
+        return self._ellipsis(name, maxlen, '...')
+
+    def _get_and_change_date_format_for_swiss (self,date_to_format):
+        date_formatted=''
+        if date_to_format:
+            date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+        return date_formatted
+
+    def _explode_name(self,chaine,length):
+        # We will test if the size is less then account
+        full_string = ''
+        if (len(str(chaine)) <= length):
+            return chaine
+        #
+        else:
+            chaine = unicode(chaine,'utf8').encode('iso-8859-1')
+            rup = 0
+            for carac in chaine:
+                rup = rup + 1
+                if rup == length:
+                    full_string = full_string + '\n'
+                    full_string = full_string + carac
+                    rup = 0
+                else:
+                    full_string = full_string + carac
+
+        return full_string
+
+    def makeAscii(self,str):
+        try:
+            Stringer = str.encode("utf-8")
+        except UnicodeDecodeError:
+            try:
+                Stringer = str.encode("utf-16")
+            except UnicodeDecodeError:
+                print "UTF_16 Error"
+                Stringer = str
+            else:
+                return Stringer
+        else:
+            return Stringer
+        return Stringer
+    
+    def explode_this(self,chaine,length):
+        #chaine = self.repair_string(chaine)
+        chaine = rstrip(chaine)
+        ast = list(chaine)
+        i = length
+        while i <= len(ast):
+            ast.insert(i,'\n')
+            i = i + length
+        chaine = str("".join(ast))
+        return chaine
+    
+    def repair_string(self,chaine):
+        ast = list(chaine)
+        UnicodeAst = []
+        _previouslyfound = False
+        i = 0
+        #print str(ast)
+        while i < len(ast):
+            elem = ast[i]
+            try:
+                Stringer = elem.encode("utf-8")
+            except UnicodeDecodeError:
+                to_reencode = elem + ast[i+1]
+                print str(to_reencode)
+                Good_char = to_reencode.decode('utf-8')
+                UnicodeAst.append(Good_char)
+                i += i +2
+            else:
+                UnicodeAst.append(elem)
+                i += i + 1
+        return "".join(UnicodeAst)
+
+    def ReencodeAscii(self,str):
+        print sys.stdin.encoding
+        try:
+            Stringer = str.decode("ascii")
+        except UnicodeEncodeError:
+            print "REENCODING ERROR"
+            return str.encode("ascii")
+        except UnicodeDecodeError:
+            print "DECODING ERROR"
+            return str.encode("ascii")
+        else:
+            print Stringer
+            return Stringer
+
+    def _add_header(self, node, header=1):
+        if header==2:
+            rml_head =  self.rml_header2
+        else:
+            rml_head =  self.rml_header
+        rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
+        return True
+
+
+
diff --git a/addons/account/wizard/account_aged_trial_balance_view.xml b/addons/account/wizard/account_aged_trial_balance_view.xml
index 7984f69e86e..769d7ee268f 100644
--- a/addons/account/wizard/account_aged_trial_balance_view.xml
+++ b/addons/account/wizard/account_aged_trial_balance_view.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Print Aged Trial Balance">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 				    <newline/>
 				    <field name="date1"/>
 				    <field name="period_length"/>
diff --git a/addons/account/wizard/account_balance_report_view.xml b/addons/account/wizard/account_balance_report_view.xml
index dd1b7147f13..f50cce039cc 100644
--- a/addons/account/wizard/account_balance_report_view.xml
+++ b/addons/account/wizard/account_balance_report_view.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
               	<form string="Select period">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 				    <field name="display_account" required = "True"/>
 				    <newline/>
 				    <field name="fiscalyear"/>
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index ba94bbfb37c..af3f0c26511 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -24,7 +24,7 @@ from tools.translate import _
 class account_chart(osv.osv_memory):
     """
     For Chart of Accounrs
-        """
+    """
     _name = "account.chart"
     _description = "chart"
     _columns = {
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
index 0790a1654b9..a2ff3accf5f 100644
--- a/addons/account/wizard/account_general_ledger_report_view.xml
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Date-Period">
-			    <field name="company_id" colspan="4"/>
+			    <field name="company_id" colspan="4" groups="base.group_multi_company"/>
 			    <newline/>
 			    <field name="fiscalyear"/>
 			    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 7820e327256..9396209ccc6 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -18,10 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+import time
+
 from osv import fields, osv
 from tools.translate import _
 import netsvc
-import time
 
 class account_invoice_refund(osv.osv_memory):
 
@@ -30,16 +31,15 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation date', required=False, help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
-       'period': fields.many2one('account.period', 'Force period', required=False),
-       'description': fields.char('Description', size=150, required=True),
+       'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
+       'period': fields.many2one('account.period', 'Force period'),
+       'description': fields.char('Description', size=128, required=True),
     }
-    
     _defaults = {
         'date': time.strftime('%Y-%m-%d'),
-    }
+                }
 
-    def compute_refund(self, cr, uid, ids, mode, context=None):
+    def compute_refund(self, cr, uid, ids, mode='refund', context=None):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -78,21 +78,20 @@ class account_invoice_refund(osv.osv_memory):
                             result_query = cr.fetchone()
                             if result_query:
                                 cr.execute("""SELECT id
-                                          from account_period where date('%s')
+                                          from account_period where date(%s)
                                           between date_start AND  date_stop \
                                           and company_id = %s limit 1 """,
-                                          (form['date'], self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
+                                          (date, self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
                             else:
                                 cr.execute("""SELECT id
-                                        from account_period where date('%s')
+                                        from account_period where date(%s)
                                         between date_start AND  date_stop  \
-                                        limit 1 """, (form['date'],))
+                                        limit 1 """, (date,))
                             res = cr.fetchone()
                             if res:
                                 period = res[0]
                 else:
                     date = inv.date_invoice
-
                 if form['description'] :
                     description = form['description']
                 else:
@@ -129,7 +128,7 @@ class account_invoice_refund(osv.osv_memory):
                                         writeoff_journal_id=inv.journal_id.id,
                                         writeoff_acc_id=inv.account_id.id
                                         )
-                    if mode == 'modify' :
+                    if mode == 'modify':
                         invoice = inv_obj.read(cr, uid, [inv.id],
                                     ['name', 'type', 'number', 'reference',
                                     'comment', 'date_due', 'partner_id',
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 02c2ec03a25..55fb71553d7 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
               	<form string="Select Date-Period">
-     				<field name="company_id"/>
+     				<field name="company_id" groups="base.group_multi_company"/>
      				<field name="result_selection" required = "True"/>
     	 			<newline/>
      				<field name="fiscalyear"/>
diff --git a/addons/account/wizard/account_third_party_ledger.xml b/addons/account/wizard/account_third_party_ledger.xml
index 6ddc9a1e847..e731086af2c 100644
--- a/addons/account/wizard/account_third_party_ledger.xml
+++ b/addons/account/wizard/account_third_party_ledger.xml
@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Select Date-Period">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 				    <field name="result_selection"/>
 				    <newline/>
 				    <field name="fiscalyear"/>
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 02e6ee2515e..c57e61e79ab 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -29,7 +29,7 @@ class account_unreconcile(osv.osv_memory):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
         if context is None:
             context = {}
-        recs = obj_move_line.read(cr, uid, data['ids'], ['reconcile_id','reconcile_partial_id'])
+        recs = obj_move_line.read(cr, uid, context['active_ids'], ['reconcile_id','reconcile_partial_id'])
         unlink_ids = []
         full_recs = filter(lambda x: x['reconcile_id'], recs)
         rec_ids = [rec['reconcile_id'][0] for rec in full_recs]
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 7662594bb79..528922d8763 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Period">
-				    <field name="company_id"/>
+				    <field name="company_id" groups="base.group_multi_company"/>
 					<newline/>
 				    <field name="based_on"/>
 				    <newline/>
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 84fd933d9a9..1db16ca8787 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -47,7 +47,7 @@ class account_analytic_default(osv.osv):
             domain += ['|',('partner_id','=',partner_id)]
         domain += [('partner_id','=',False)]
         if user_id:
-            domain += ['|',('user_id','=',uid)]
+            domain += ['|',('user_id','=',user_id)]
         domain += [('user_id','=',False)]
         if date:
             domain += ['|',('date_start','<=',date),('date_start','=',False)]
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 2fc950d9e0c..df3955d8180 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -30,7 +30,7 @@
     You can define your multiple levels of recall through the menu:
         Financial Management/Configuration/Payment Terms/Follow-Ups
 
-    Once it's defined, you can automatically prints recall every days
+    Once it's defined, you can automatically print recalls every day
     through simply clicking on the menu:
         Financial_Management/Periodical_Processing/Print_Follow-Ups
 
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index f2df124dc75..8692385179e 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -32,7 +32,7 @@
         * add titles, comment lines, sub total lines
         * draw horizontal lines and put page breaks
 
-    Moreover, there is one option which allow you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
+    Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
 
     """,
     'author': 'Tiny',
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 0388bc2d4e4..5cdc1254976 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -28,7 +28,7 @@
     "depends": ["account"],
     "init_xml": [],
     "description": """
-    This module provide :
+    This module provides :
     * a more efficient way to manage invoice payment.
     * a basic mechanism to easily plug various automated payment.
     """,
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 14265e3403a..ed250f0aaf0 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -24,8 +24,8 @@
     "version" : "1.0",
     "author" : 'Tiny & Axelor',
     "description": """
-    India Accounting module includes all the basic requirenment of
-    Basic Accounting, plus new things which available are
+    Indian Accounting module includes all the basic requirenments of
+    Basic Accounting, plus new things which are available :
     * Indian Account Chart
     * New Invoice - (Local, Retail)
     * Invoice Report
@@ -36,7 +36,10 @@
     """,
     "category" : "Generic Modules/Accounting",
     "website" : "http://tinyerp.com",
-    "depends" : ["base", "account"],
+    "depends" : [
+        "base", 
+        "account"
+    ],
     "init_xml" : [
     ],
 
@@ -46,10 +49,12 @@
     "update_xml" : [
         "security/ir.model.access.csv",
         "voucher_sequence.xml",
+        "voucher_workflow.xml",
         "voucher_report.xml",
         "voucher_view.xml",
         "voucher_wizard.xml",
         "wizard/account_voucher_open_view.xml",
+        
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 140442aa02e..7da226b3188 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -28,6 +28,17 @@ import mx.DateTime
 from mx.DateTime import RelativeDateTime
 from tools import config
 
+type2journal = {
+    'rec_voucher': 'cash',
+    'bank_rec_voucher': 'cash',
+    'pay_voucher': 'cash',
+    'bank_pay_voucher': 'cash',
+    'cont_voucher': 'cash',
+    'journal_sale_vou': 'sale',
+    'journal_pur_voucher': 'purchase',
+    'journal_voucher':'expanse'
+}
+
 class ir_sequence_type(osv.osv):
     _inherit = "ir.sequence.type"
     _columns = {
@@ -36,7 +47,15 @@ class ir_sequence_type(osv.osv):
     }
 ir_sequence_type()
 
+class account_journal(osv.osv):
+    _inherit = "account.journal"
+    _columns = {
+        'max_amount': fields.float('Verify Transection', digits=(16, int(config['price_accuracy'])), help="Validate voucher entry twice before posting it, if transection amount more then entered here"),
+    }
+account_journal()
+
 class account_voucher(osv.osv):
+
     def _get_period(self, cr, uid, context):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
@@ -45,34 +64,22 @@ class account_voucher(osv.osv):
             return False
 
     def _get_type(self, cr, uid, context={}):
-        type = context.get('type', 'rec_voucher')
+        type = context.get('type', 'bank_rec_voucher')
         return type
 
     def _get_reference_type(self, cursor, user, context=None):
         return [('none', 'Free Reference')]
 
-    def _get_journal(self, cr, uid, context):
-        type_inv = 'rec_voucher'
-
-        if type(context) == type(''):
-            type_inv = context
-        elif type(context) == type({}):
-            type_inv = context.get('type', 'rec_voucher')
-
-        type2journal = {
-            'rec_voucher': 'cash',
-            'bank_rec_voucher': 'cash',
-            'pay_voucher': 'cash',
-            'bank_pay_voucher': 'cash',
-            'cont_voucher': 'cash',
-            'journal_sale_vou': 'sale',
-            'journal_pur_voucher': 'purchase',
-            'journal_voucher':'expanse'
-        }
-
-        journal_obj = self.pool.get('account.journal')
-        ttype = type2journal.get(type_inv, 'cash')
-        res = journal_obj.search(cr, uid, [('type', '=', ttype)], limit=1)
+    def _get_journal(self, cr, uid, context={}):
+        journal_pool = self.pool.get('account.journal')
+        
+        if context.get('journal_id', False):
+            return context.get('journal_id')
+        
+        type_inv = context.get('type', 'rec_voucher')
+        
+        ttype = type2journal.get(type_inv, type_inv)
+        res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
 
         if res:
             return res[0]
@@ -80,7 +87,7 @@ class account_voucher(osv.osv):
             return False
 
     def _get_currency(self, cr, uid, context):
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
         if user.company_id:
             return user.company_id.currency_id.id
         else:
@@ -92,13 +99,13 @@ class account_voucher(osv.osv):
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
-            ('pay_voucher','Cash Payment Voucher'),
-            ('bank_pay_voucher','Bank Payment Voucher'),
-            ('rec_voucher','Cash Receipt Voucher'),
-            ('bank_rec_voucher','Bank Receipt Voucher'),
-            ('cont_voucher','Contra Voucher'),
-            ('journal_sale_vou','Journal Sale Voucher'),
-            ('journal_pur_voucher','Journal Purchase Voucher'),
+            ('pay_voucher','Cash Payment'),
+            ('bank_pay_voucher','Bank Payment'),
+            ('rec_voucher','Cash Receipt'),
+            ('bank_rec_voucher','Bank Receipt'),
+            ('cont_voucher','Contra'),
+            ('journal_sale_vou','Journal Sale'),
+            ('journal_pur_voucher','Journal Purchase'),
             ('journal_voucher','Journal Voucher'),
             ],'Type', readonly=True, select=True , size=128),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
@@ -110,16 +117,17 @@ class account_voucher(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state':fields.selection(
-                    [('draft','Draft'),
-                     ('proforma','Pro-forma'),
-                     ('posted','Posted'),
-                     ('cancel','Cancel')
-                    ], 'State',
-                    readonly=True,
-                    help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
+            [('draft','Draft'),
+             ('proforma','Pro-forma'),
+             ('posted','Posted'),
+             ('recheck','Waiting for Re-checking'),
+             ('cancel','Cancel'),
+             ('audit','Audit Complete')
+            ], 'State', readonly=True, size=32,
+            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
-                        \n* The \'Cancelled\' state is used when user cancel voucher.'),
+                        \n* The \'Cancelled\' state is used when user cancel voucher.'),                    
         'amount':fields.float('Amount', readonly=True),
         'number':fields.char('Number', size=32, readonly=True),
         'reference': fields.char('Voucher Reference', size=64),
@@ -433,14 +441,14 @@ class account_voucher(osv.osv):
         if not len(ids):
             return []
         types = {
-                'pay_voucher': 'CPV: ',
-                'rec_voucher': 'CRV: ',
-                'cont_voucher': 'CV: ',
-                'bank_pay_voucher': 'BPV: ',
-                'bank_rec_voucher': 'BRV: ',
-                'journal_sale_vou': 'JSV: ',
-                'journal_pur_voucher': 'JPV: ',
-                'journal_voucher':'JV'
+            'pay_voucher': 'CPV: ',
+            'rec_voucher': 'CRV: ',
+            'cont_voucher': 'CV: ',
+            'bank_pay_voucher': 'BPV: ',
+            'bank_rec_voucher': 'BRV: ',
+            'journal_sale_vou': 'JSV: ',
+            'journal_pur_voucher': 'JPV: ',
+            'journal_voucher':'JV'
         }
         return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
 
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 956d9e533a0..08262bb17df 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -6,7 +6,7 @@
             <field name="model">account.voucher</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Vouchers">
+                <tree string="Accounting Vouchers">
                     <field name="date"/>
                     <field name="number"/>
                     <field name="name"/>
@@ -25,7 +25,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Voucher">
+                <form string="Accounting Voucher">
                     <group col="6" colspan="4">
                         <field name="name" colspan="4"/>
                         <field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
@@ -36,8 +36,8 @@
                         <!--field name="partner_id"/-->
                     </group>
                     <notebook colspan="4">
-                        <page string="Entry Lines">
-                            <field name="payment_ids" colspan="4" nolabel="1" height="275">
+                        <page string="Journal Entries">
+                            <field name="payment_ids" colspan="4" nolabel="1" height="260">
                                 <tree string="Voucher Lines" editable="top">
                                     <field name="account_analytic_id"/>
                                     <field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type)"/>
@@ -49,13 +49,14 @@
                                 </tree>
                             </field>
                             <separator string="Narration" colspan="4"/>
-                            <field name="narration" colspan="4" nolabel="1"/>
+                            <field name="narration" colspan="4" nolabel="1" height="50"/>
                             <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"/>
+                                <button name="open_voucher" string="Pro-forma" states="draft"/>
+                                <button name="proforma_voucher" string="Create" states="proforma"/>
+                                <button name="recheck_voucher" string="Validate" states="recheck"/>
+                                <button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck"  type="object"/>
+                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                             </group>
                         </page>
                         <page string="Other Info">
@@ -103,19 +104,9 @@
             </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 action="action_voucher_list" id="menu_action_voucher_list"
-        name="Voucher Entries" parent="account.menu_finance_entries" sequence="60"/>
-
         <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
-            <field name="name">Receipt Vouchers</field>
+            <field name="name">Receivable Entries</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -123,8 +114,8 @@
             <field name="domain">[('type','like','rec_voucher')]</field>
             <field name="context">{'type':'rec_voucher'}</field>
         </record>
-        <menuitem name="Receipt Vouchers" id="menu_action_receipt_vou_voucher_list"
-        action="action_receipt_vou_voucher_list" parent="menu_action_voucher_list"/>
+        <menuitem id="menu_action_receipt_vou_voucher_list"
+        action="action_receipt_vou_voucher_list" parent="account.menu_finance_entries" sequence="8"/>
 
         <record model="ir.actions.act_window" id="action_receipt_cashreceipt_voucher_list">
             <field name="name">Cash Receipt</field>
@@ -135,7 +126,7 @@
             <field name="domain">[('type','=','rec_voucher')]</field>
             <field name="context">{'type':'rec_voucher'}</field>
         </record>
-        <menuitem name="Cash Receipts" id="menu_action_receipt_cashreceipt_voucher_list"
+        <menuitem id="menu_action_receipt_cashreceipt_voucher_list"
         action="action_receipt_cashreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
 
         <record model="ir.actions.act_window" id="action_receipt_bakreceipt_voucher_list">
@@ -147,7 +138,7 @@
             <field name="domain">[('type','=','bank_rec_voucher')]</field>
             <field name="context">{'type':'bank_rec_voucher'}</field>
         </record>
-        <menuitem name="Bank Receipts" id="menu_action_receipt_bakreceipt_voucher_list"
+        <menuitem id="menu_action_receipt_bakreceipt_voucher_list"
         action="action_receipt_bakreceipt_voucher_list" parent="menu_action_receipt_vou_voucher_list"/>
 
         <!--  End Receipt Vouchers -->
@@ -155,7 +146,7 @@
 
         <!-- Payment Vouchers -->
         <record model="ir.actions.act_window" id="action_payments_voucher_list">
-            <field name="name">Payment Vouchers</field>
+            <field name="name">Payable Entries</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -163,11 +154,11 @@
             <field name="domain">[('type','like','pay_voucher')]</field>
             <field name="context">{'type':'pay_voucher'}</field>
         </record>
-        <menuitem name="Payment Vouchers" id="menu_action_payments_voucher_list"
-        action="action_payments_voucher_list" parent="menu_action_voucher_list"/>
+        <menuitem id="menu_action_payments_voucher_list"
+        action="action_payments_voucher_list" parent="account.menu_finance_entries" sequence="8"/>
 
         <record model="ir.actions.act_window" id="action_payments_cashpay_voucher_list">
-            <field name="name">Payment Vouchers</field>
+            <field name="name">Cash Payment</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -175,11 +166,11 @@
             <field name="domain">[('type','=','pay_voucher')]</field>
             <field name="context">{'type':'pay_voucher'}</field>
         </record>
-        <menuitem name="Cash Payments" id="menu_action_payments_cashpay_voucher_list"
+        <menuitem id="menu_action_payments_cashpay_voucher_list"
         action="action_payments_cashpay_voucher_list" parent="menu_action_payments_voucher_list"/>
 
         <record model="ir.actions.act_window" id="action_payments_bankpay_voucher_list">
-            <field name="name">Payment Vouchers</field>
+            <field name="name">Bank Payment</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -187,24 +178,24 @@
             <field name="domain">[('type','=','bank_pay_voucher')]</field>
             <field name="context">{'type':'bank_pay_voucher'}</field>
         </record>
-        <menuitem name="Bank Payments" id="menu_action_payments_bankpay_voucher_list"
+        <menuitem id="menu_action_payments_bankpay_voucher_list"
         action="action_payments_bankpay_voucher_list" parent="menu_action_payments_voucher_list"/>
 
         <!-- 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="name">Other Entries</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="Other Vouchers" id="menu_action_other_voucher_list"
-        action="action_other_voucher_list" parent="menu_action_voucher_list"/>
+        <menuitem id="menu_action_other_voucher_list"
+        action="action_other_voucher_list" parent="account.menu_finance_entries" sequence="8"/>
 
         <record model="ir.actions.act_window" id="action_view_cont_voucher_form">
-            <field name="name">Contra Voucher</field>
+            <field name="name">Contra Entries</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -212,11 +203,11 @@
             <field name="domain">[('type','=','cont_voucher')]</field>
             <field name="context">{'type':'cont_voucher'}</field>
         </record>
-        <menuitem name="Contra Voucher" id="menu_action_view_cont_voucher_form"
+        <menuitem id="menu_action_view_cont_voucher_form"
         action="action_view_cont_voucher_form" parent="menu_action_other_voucher_list"/>
 
         <record model="ir.actions.act_window" id="action_view_jour_sale_voucher_form">
-            <field name="name">Journal Sale Voucher</field>
+            <field name="name">Journal Sale</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -224,11 +215,11 @@
             <field name="domain">[('type','=','journal_sale_vou')]</field>
             <field name="context">{'type':'journal_sale_vou'}</field>
         </record>
-        <menuitem name="Journal Sale Voucher" id="menu_action_view_jour_sale_voucher_form"
+        <menuitem id="menu_action_view_jour_sale_voucher_form"
         action="action_view_jour_sale_voucher_form" parent="menu_action_other_voucher_list"/>
 
         <record model="ir.actions.act_window" id="action_view_jour_pur_voucher_form">
-            <field name="name">Journal Purchase Voucher</field>
+            <field name="name">Journal Purchase</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -236,7 +227,7 @@
             <field name="domain">[('type','=','journal_pur_voucher')]</field>
             <field name="context">{'type':'journal_pur_voucher'}</field>
         </record>
-        <menuitem name="Journal Purchase Voucher" id="menu_action_view_jour_pur_voucher_form"
+        <menuitem id="menu_action_view_jour_pur_voucher_form"
         action="action_view_jour_pur_voucher_form" parent="menu_action_other_voucher_list"/>
 
         <record model="ir.actions.act_window" id="action_view_jour_voucher_form">
@@ -248,9 +239,28 @@
             <field name="domain">[('type','=','journal_voucher')]</field>
             <field name="context">{'type':'journal_voucher'}</field>
         </record>
-        <menuitem
-            name="Journal Voucher" id="menu_action_view_jour_voucher_form"
+        <menuitem id="menu_action_view_jour_voucher_form"
             action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>
-
+        
+        <record model="ir.ui.view" id="view_account_journal_form_inherit">
+            <field name="name">account.journal.form.inherit</field>
+            <field name="model">account.journal</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+                <field name="allow_date" position="after">
+                    <field name="max_amount" select="1"/>
+                </field>
+            </field>
+        </record>
+        
+        <act_window
+            domain="[('journal_id', '=', active_id)]"
+            id="act_journal_voucher_open"
+            name="Voucher Entries"
+            context="{'journal_id': active_id, 'type':type}"
+            res_model="account.voucher"
+            src_model="account.journal"/>
+        
         </data>
 </openerp>
diff --git a/addons/account_voucher/voucher_wizard.xml b/addons/account_voucher/voucher_wizard.xml
index 661acdd4241..b8851b51afe 100644
--- a/addons/account_voucher/voucher_wizard.xml
+++ b/addons/account_voucher/voucher_wizard.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-
-<!--		<wizard
-	     	id="wizard_account_voucher_open"
-	     	model="account.voucher"
-	     	name="account.voucher.open"
-	     	menu="False"
-	     	string="Open a Voucher Entry"/>
-	    <menuitem
-	     	action="wizard_account_voucher_open"
-	     	id="menu_wizard_account_voucher_open"
-	     	name="Open Vouchers"
-	     	sequence="0"
-	     	type="wizard"
-	     	parent="menu_action_voucher_list"/> -->
-
-	</data>
+    <data>
+<!--        <wizard-->
+<!--             id="wizard_account_voucher_open"-->
+<!--             model="account.voucher"-->
+<!--             name="account.voucher.open"-->
+<!--             menu="False"-->
+<!--             string="Open a Voucher Entry"/>-->
+<!--        <menuitem-->
+<!--             action="wizard_account_voucher_open"-->
+<!--             id="menu_wizard_account_voucher_open"-->
+<!--             name="Open Vouchers"-->
+<!--             sequence="0"-->
+<!--             type="wizard"-->
+<!--             parent="menu_action_voucher_list"/>-->
+    </data>
 </openerp>
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index 261a56ebb34..ceb8da48722 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -1,75 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
-
-		<record id="wkf_voucher" model="workflow">
+    <data>
+        <record id="wkf" model="workflow">
             <field name="name">account.voucher.basic</field>
             <field name="osv">account.voucher</field>
             <field name="on_create">True</field>
         </record>
-
+        
         <record id="act_draft" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
+            <field name="wkf_id" ref="wkf"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
-        </record>
-        
-        <record id="act_performa" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
-            <field name="name">performa</field>
-            <field name="action">open_voucher()</field>
+            <field name="action">write({'state':'draft'})</field>
             <field name="kind">function</field>
         </record>
         
-        <record id="act_posted" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
-            <field name="name">posted</field>
-            <field name="action">proforma_voucher()</field>
+        <record id="act_proforma" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">proforma</field>
+            <field name="action">write({'state':'proforma'})
+            open_voucher()</field>
+            <field name="kind">function</field>
+        </record>
+        
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">done</field>
+            <field name="action">write({'state':'posted'})
+            proforma_voucher()</field>
             <field name="flow_stop">True</field>
             <field name="kind">function</field>
         </record>
         
-        <record id="act_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_voucher"/>
-            <field name="name">cancel</field>
-            <field name="action">cancel_voucher()</field>
+        <record id="act_recheck" model="workflow.activity">
+            <field name="wkf_id" ref="wkf"/>
+            <field name="name">recheck</field>
+            <field name="action">write({'state':'recheck'})</field>
             <field name="kind">function</field>
         </record>
         
         <record id="t1" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_performa"/>
+            <field name="act_to" ref="act_proforma"/>
             <field name="signal">open_voucher</field>
         </record>
         
         <record id="t2" model="workflow.transition">
-            <field name="act_from" ref="act_performa"/>
-            <field name="act_to" ref="act_posted"/>
+            <field name="act_from" ref="act_proforma"/>
+            <field name="act_to" ref="act_done"/>
             <field name="signal">proforma_voucher</field>
+            <field name="condition">amount &lt;= journal_id.max_amount</field>
         </record>
         
         <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_performa"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_voucher</field>
+            <field name="act_from" ref="act_proforma"/>
+            <field name="act_to" ref="act_recheck"/>
+            <field name="signal">proforma_voucher</field>
+            <field name="condition">amount &gt; journal_id.max_amount</field>
+        </record>
+        
+        <record id="t4" model="workflow.transition">
+            <field name="act_from" ref="act_recheck"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">recheck_voucher</field>
         </record>
         
         <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_voucher</field>
+            <field name="act_from" ref="act_recheck"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">action_cancel_draft</field>
         </record>
         
         <record id="t6" model="workflow.transition">
-            <field name="act_from" ref="act_posted"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel_voucher</field>
+            <field name="act_from" ref="act_proforma"/>
+            <field name="act_to" ref="act_draft"/>
+            <field name="signal">action_cancel_draft</field>
         </record>
-	
-		<record id="t7" model="workflow.transition">
-            <field name="act_from" ref="act_cancel"/>
-            <field name="act_to" ref="act_performa"/>
-            <field name="signal">open_voucher</field>
-        </record>
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_voucher/wizard/account_voucher_open.py b/addons/account_voucher/wizard/account_voucher_open.py
index b286217e106..f33c00fd099 100644
--- a/addons/account_voucher/wizard/account_voucher_open.py
+++ b/addons/account_voucher/wizard/account_voucher_open.py
@@ -31,11 +31,11 @@ _types = {
         'journal_pur_voucher':'Journal Purchase Voucher'
         }
 _states = {
-        'draft':'Draft',
-        'proforma':'Pro-forma',
-        'posted':'Posted',
-        'cancel':'Cancel'
-        }
+    'draft':'Draft',
+    'proforma':'Pro-forma',
+    'posted':'Posted',
+    'cancel':'Cancel'
+}
 
 class account_open_voucher(osv.osv_memory):
     _name = "account.open.voucher"
@@ -43,18 +43,18 @@ class account_open_voucher(osv.osv_memory):
 
     _columns = {
         'type': fields.selection([('pay_voucher','Cash Payment Voucher'),
-                             ('bank_pay_voucher','Bank Payment Voucher'),
-                             ('rec_voucher','Cash Receipt Voucher'),
-                             ('bank_rec_voucher','Bank Receipt Voucher'),
-                             ('cont_voucher','Contra Voucher'),
-                             ('journal_sale_vou','Journal Sale Voucher'),
-                             ('journal_pur_voucher','Journal Purchase Voucher')],'Voucher Type', required=True),
+             ('bank_pay_voucher','Bank Payment Voucher'),
+             ('rec_voucher','Cash Receipt Voucher'),
+             ('bank_rec_voucher','Bank Receipt Voucher'),
+             ('cont_voucher','Contra Voucher'),
+             ('journal_sale_vou','Journal Sale Voucher'),
+             ('journal_pur_voucher','Journal Purchase Voucher')],'Voucher Type', required=True),
         'state': fields.selection([('draft','Draft'),
-                                   ('proforma','Pro-forma'),
-                                   ('posted','Posted'),
-                                   ('cancel','Cancel')], 'State', required=True),
+           ('proforma','Pro-forma'),
+           ('posted','Posted'),
+           ('cancel','Cancel')], 'State', required=True),
         'period_ids': fields.many2many('account.period', 'voucher_period_rel', 'voucher_id', 'period_id', 'Periods'),
-        }
+    }
 
     def action_open_window(self, cr, uid, ids, context=None):
         obj_period = self.pool.get('account.period')
@@ -83,4 +83,4 @@ class account_open_voucher(osv.osv_memory):
 
 account_open_voucher()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/wizard/account_voucher_open_view.xml b/addons/account_voucher/wizard/account_voucher_open_view.xml
index 11ab3d1ca8a..b6277e7615c 100644
--- a/addons/account_voucher/wizard/account_voucher_open_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_open_view.xml
@@ -31,12 +31,12 @@
             <field name="target">new</field>
        </record>
 
-       <menuitem
-            icon="STOCK_EXECUTE"
-            name="Open Vouchers"
-            action="action_account_open_vouchers"
-            id="menu_account_voucher_open"
-            parent="menu_action_voucher_list"/>
+<!--       <menuitem-->
+<!--            icon="STOCK_EXECUTE"-->
+<!--            name="Open Vouchers"-->
+<!--            action="action_account_open_vouchers"-->
+<!--            id="menu_account_voucher_open"-->
+<!--            parent="menu_action_voucher_list"/>-->
 
     </data>
 </openerp>
diff --git a/addons/account_voucher_payment/__init__.py b/addons/account_voucher_payment/__init__.py
new file mode 100755
index 00000000000..75d9f73de64
--- /dev/null
+++ b/addons/account_voucher_payment/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: 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 account_voucher_payment
+import account_voucher_unreconcile
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/__terp__.py b/addons/account_voucher_payment/__terp__.py
new file mode 100755
index 00000000000..83864a543be
--- /dev/null
+++ b/addons/account_voucher_payment/__terp__.py
@@ -0,0 +1,48 @@
+# -*- encoding: 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" : "Invoice Payment/Receipt by Vouchers.",
+    "version" : "1.0",
+    "author" : 'Tiny & Axelor',
+    "description": """This module includes :
+    * It reconcile the invoice (supplier, customer) while paying through 
+    Accounting Vouchers
+    """,
+    "category" : "Generic Modules/Indian Accounting",
+    "website" : "http://tinyerpindia.com",
+    "depends" : [
+        "base", 
+        "account",
+        "account_voucher",
+    ],
+    "init_xml" : [
+    ],
+    
+    "demo_xml" : [],
+    "update_xml" : [
+        "account_voucher_payment_view.xml",
+        "account_voucher_payment_wizard.xml"
+    ],
+    "active": False,
+    "installable": True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
new file mode 100755
index 00000000000..3d08ad9e1f3
--- /dev/null
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -0,0 +1,290 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+    _columns = {
+        'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True),
+    }
+account_move_line()
+
+class account_voucher(osv.osv):
+    _inherit = 'account.voucher'
+    _columns = {
+        'voucher_line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=False, states={'proforma':[('readonly',True)]}),
+    }
+        
+    def action_move_line_create(self, cr, uid, ids, *args):
+        
+        for inv in self.browse(cr, uid, ids):
+            if inv.move_id:
+                continue
+            company_currency = inv.company_id.currency_id.id
+
+            line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids']
+            ils = self.pool.get('account.voucher.line').read(cr, uid, line_ids)
+
+            iml = self._get_analytic_lines(cr, uid, inv.id)
+
+            diff_currency_p = inv.currency_id.id <> company_currency
+
+            total = 0
+            if inv.type in ('pay_voucher', 'journal_voucher', 'rec_voucher','cont_voucher','bank_pay_voucher','bank_rec_voucher','journal_sale_voucher','journal_pur_voucher'):
+                ref = inv.reference
+            else:
+                ref = self._convert_ref(cr, uid, inv.number)
+                
+            date = inv.date
+            total_currency = 0
+            for i in iml:
+                partner_id=i['partner_id']
+                acc_id = i['account_id']    
+                if inv.currency_id.id != company_currency:
+                    i['currency_id'] = inv.currency_id.id
+                    i['amount_currency'] = i['amount']
+                else:
+                    i['amount_currency'] = False
+                    i['currency_id'] = False
+                if inv.type in ('rec_voucher','bank_rec_voucher','journal_pur_voucher','journal_voucher'):
+                    total += i['amount']
+                    total_currency += i['amount_currency'] or i['amount']
+                    i['amount'] = - i['amount']
+                else:
+                    total -= i['amount']
+                    total_currency -= i['amount_currency'] or i['amount']
+
+            name = inv['name'] or '/'
+            totlines = False
+
+            iml.append({
+                'type': 'dest',
+                'name': name,
+                'amount': total or False,
+                'account_id': acc_id,
+                'amount_currency': diff_currency_p \
+                        and total_currency or False,
+                'currency_id': diff_currency_p \
+                        and inv.currency_id.id or False,
+                'ref': ref,
+                'partner_id':partner_id or False,
+            })
+
+            date = inv.date
+            inv.amount=total
+
+            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x,date, context={})) ,iml)
+            an_journal_id=inv.journal_id.analytic_journal_id.id
+            journal_id = inv.journal_id.id
+            
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
+            if journal.sequence_id:
+                name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
+
+            move = {
+                'name': name, 
+                'journal_id': journal_id, 
+                'voucher_type':inv.type,
+                'narration' : inv.narration,
+                'data':date
+            }
+            
+            if inv.period_id:
+                move['period_id'] = inv.period_id.id
+                for i in line:
+                    i[2]['period_id'] = inv.period_id.id
+            move_id = self.pool.get('account.move').create(cr, uid, move)
+            ref=move['name']
+            amount=0.0
+            #create the first line our self
+            move_line = {
+                'name': inv.name,
+                'voucher_invoice' : iml and iml[0]['invoice'] and iml[0]['invoice'].id or False,
+                'debit': False,
+                'credit':False,
+                'account_id': inv.account_id.id or False,
+                'move_id':move_id ,
+                'journal_id':journal_id ,
+                'period_id':inv.period_id.id,
+                'partner_id': False,
+                'ref': ref, 
+                'date': date
+            }
+            if inv.type in ('rec_voucher', 'bank_rec_voucher', 'journal_pur_voucher', 'journal_voucher'):
+                move_line['debit'] = inv.amount
+            else:
+                move_line['credit'] = inv.amount * (-1)
+            self.pool.get('account.move.line').create(cr, uid, move_line)
+            id_mapping_dict = {}
+            mline_ids = []
+            for line in inv.voucher_line_ids:
+                move_line = {
+                    'name':line.name,
+                    'voucher_invoice' : iml and iml[0]['invoice'] and iml[0]['invoice'].id or False,
+                    'debit':False,
+                    'credit':False,
+                    'move_id':move_id,                    
+                    'account_id':line.account_id.id or False,
+                    'journal_id':journal_id ,
+                    'period_id':inv.period_id.id,
+                    'partner_id':line.partner_id.id or False,
+                    'ref':ref, 
+                    'date':date
+                 }
+                
+                if line.type == 'dr':
+                    move_line['debit'] = line.amount or False
+                    amount=line.amount
+                elif line.type == 'cr':
+                    move_line['credit'] = line.amount or False
+                    amount=line.amount * (-1)
+                ml_id=self.pool.get('account.move.line').create(cr, uid, move_line)
+                id_mapping_dict[line.id] = ml_id
+                
+                total = 0.0
+                mline = self.pool.get('account.move.line')
+                if line.invoice_id.id:
+                    invoice = self.pool.get('account.invoice').browse(cr, uid, line.invoice_id.id)
+                    src_account_id = invoice.account_id.id
+                    cr.execute('select id from account_move_line where move_id in ('+str(invoice.move_id.id)+')')
+                    temp_ids = map(lambda x: x[0], cr.fetchall())
+                    temp_ids.append(ml_id)
+                    mlines = mline.browse(cr, uid, temp_ids)
+                    for ml in mlines:
+                        if ml.account_id.id==src_account_id:
+                            mline_ids.append(ml.id)
+                            total += (ml.debit or 0.0) - (ml.credit or 0.0)
+                #end if line.invoice_id.id:
+                if inv.narration:
+                    line.name=inv.narration
+                else:
+                    line.name=line.name
+                
+                if line.account_analytic_id:
+                    an_line = {
+                         'name':line.name,
+                         'date':date,
+                         'amount':amount,
+                         'account_id':line.account_analytic_id.id or False,
+                         'move_id':ml_id,
+                         'journal_id':an_journal_id ,
+                         'general_account_id':line.account_id.id,
+                         'ref':ref
+                     }
+                    self.pool.get('account.analytic.line').create(cr,uid,an_line)
+            if mline_ids:
+                self.pool.get('account.move.line').reconcile_partial(cr, uid, mline_ids, 'manual', context={})
+            self.write(cr, uid, [inv.id], {'move_id': move_id})
+            obj=self.pool.get('account.move').browse(cr, uid, move_id)
+            
+            for line in obj.line_id :
+                cr.execute('insert into voucher_id (account_id,rel_account_move) values (%d, %d)',(int(ids[0]),int(line.id)))
+                
+        return True
+
+account_voucher()
+
+class VoucherLine(osv.osv):
+    _inherit = 'account.voucher.line'
+    
+    def default_get(self, cr, uid, fields, context={}):
+        data = super(VoucherLine, self).default_get(cr, uid, fields, context)
+        self.voucher_context = context
+        return data
+    
+    _columns = {
+        'invoice_id' : fields.many2one('account.invoice','Invoice'),
+    }
+
+    
+    def move_line_get_item(self, cr, uid, line, context={}):
+        res = super(VoucherLine, self).move_line_get_item(cr, uid, line, context)
+        res['invoice'] = line.invoice_id or False
+        return res 
+    
+    def onchange_invoice_id(self, cr, uid, ids, invoice_id, context={}):
+        lines = []
+        if 'lines' in self.voucher_context:
+            lines = [x[2] for x in self.voucher_context['lines']]
+        if not invoice_id:
+            return {'value':{}}
+        else:
+            invoice_obj = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
+            residual = invoice_obj.residual
+            same_invoice_amounts = [x['amount'] for x in lines if x['invoice_id']==invoice_id]
+            residual -= sum(same_invoice_amounts)
+            return {'value' : {'amount':residual}}  
+    
+    def onchange_line_account(self, cr, uid, ids, account_id, type, type1):
+        if not account_id:
+            return {'value' : {'account_id' : False, 'type' : False ,'amount':False}}
+        obj = self.pool.get('account.account')
+        acc_id = False
+        
+        if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
+            acc_id = obj.browse(cr, uid, account_id)
+            balance = acc_id.credit
+            type = 'cr'
+        elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : 
+            acc_id = obj.browse(cr, uid, account_id)
+            balance = acc_id.debit
+            type = 'dr'
+        elif type1 in ('journal_sale_vou') : 
+            acc_id = obj.browse(cr, uid, account_id)
+            balance = acc_id.credit
+            type = 'dr'
+        elif type1 in ('journal_pur_voucher') : 
+            acc_id = obj.browse(cr, uid, account_id)
+            balance = acc_id.debit
+            type = 'cr'
+
+        return {
+            'value' : {'type' : type, 'amount':balance}
+        }
+
+VoucherLine()
+
+
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+    
+    def action_cancel(self, cr, uid, ids, *args):
+        
+        res = super(account_invoice, self).action_cancel(cr, uid, ids, *args)
+        
+        invoices = self.read(cr, uid, ids, ['move_id'])
+        voucher_db = self.pool.get('account.voucher')
+        voucher_ids = voucher_db.search(cr, uid, [])
+        voucher_obj = voucher_db.browse(cr, uid, voucher_ids)
+        move_db = self.pool.get('account.move')
+        move_ids = move_db.search(cr, uid, [])
+        move_obj = move_db.browse(cr, uid, move_ids)
+        
+        return res
+    
+account_invoice()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
new file mode 100755
index 00000000000..d87802e0e1a
--- /dev/null
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--
+        Voucher line extension
+    -->
+        
+        <record id="view_voucher_form" model="ir.ui.view">
+            <field name="name">account.voucher.line.form.inherit</field>
+            <field name="model">account.voucher.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_voucher_form"/>
+            <field name="arch" type="xml">
+                    <field name="name" position="after">
+                        <field name="invoice_id" on_change="onchange_invoice_id(invoice_id)" domain="[('partner_id','=',partner_id),('state','=','open')]"/>
+                    </field>
+            </field>
+        </record>
+
+        <record id="view_voucher_form" model="ir.ui.view">
+            <field name="name">account.voucher.form.inherit</field>
+            <field name="model">account.voucher</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_voucher.view_voucher_form"/>
+            <field name="arch" type="xml">
+                <field name="payment_ids" position="replace">
+                    <field name="voucher_line_ids"  default_get="{'lines': voucher_line_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" on_change="onchange_line_account(account_id, type, parent.type)"/>
+                            <field name="name"/>
+                            <field name="invoice_id" on_change="onchange_invoice_id(invoice_id)" domain="[('partner_id','=',partner_id),('state','=','open'),('residual','&gt;',0.0)]"/>
+                            <field name="type"/>
+                            <field name="amount"/>
+                            <field name="ref"/>
+                        </tree>
+                    </field>
+                </field>
+            </field>
+        </record>
+        
+        
+        <record id="view_move_line_form" model="ir.ui.view">
+            <field name="name">account.move.line.form.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_move_line_form"/>
+            <field name="arch" type="xml">
+                    <field name="invoice" position="replace">
+                        <field name="voucher_invoice"/>
+                    </field>
+            </field>
+        </record>
+        
+        <record id="view_move_line_tree" model="ir.ui.view">
+            <field name="name">account.move.line.form.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
+            <field name="arch" type="xml">
+                    <field name="invoice" position="replace">
+                        <field name="voucher_invoice"/>
+                    </field>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/account_voucher_payment/account_voucher_payment_wizard.xml b/addons/account_voucher_payment/account_voucher_payment_wizard.xml
new file mode 100644
index 00000000000..0551b1bbcb5
--- /dev/null
+++ b/addons/account_voucher_payment/account_voucher_payment_wizard.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <wizard 
+            id="wizard_unreconcile_voucher" 
+            menu="True" 
+            model="account.voucher" 
+            name="account.voucher.unreconcile" 
+            string="Unreconcile entries"/>
+    </data>
+</openerp>
diff --git a/addons/account_voucher_payment/account_voucher_unreconcile.py b/addons/account_voucher_payment/account_voucher_unreconcile.py
new file mode 100644
index 00000000000..a209fe13ba0
--- /dev/null
+++ b/addons/account_voucher_payment/account_voucher_unreconcile.py
@@ -0,0 +1,56 @@
+# -*- encoding: 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 wizard
+import pooler
+
+_info_form = '''<?xml version="1.0"?>
+<form string="Unreconciliation">
+    <separator string="Unreconciliation transactions" colspan="4"/>
+    <image name="gtk-dialog-info" colspan="2"/>
+    <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
+</form>'''
+
+def _trans_unrec(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    voucher = pool.get('account.voucher').browse(cr, uid, data.get('id'))
+    recs = None
+    for line in voucher.move_ids:
+        if line.reconcile_id:
+            recs = [line.reconcile_id.id]
+    
+    for rec in recs:
+        pool.get('account.move.reconcile').unlink(cr, uid, rec)
+    return {}
+
+class wiz_unreconcile(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': _info_form, 'fields': {}, 'state':[('end', 'Cancel'), ('unrec', 'Unreconcile')]}
+        },
+        'unrec': {
+            'actions': [_trans_unrec],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wiz_unreconcile('account.voucher.unreconcile')
+
diff --git a/addons/account_voucher_payment/i18n/account_voucher_payment.pot b/addons/account_voucher_payment/i18n/account_voucher_payment.pot
new file mode 100644
index 00000000000..4824e4d9d74
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/account_voucher_payment.pot
@@ -0,0 +1,82 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-05-13 20:11:36+0000\n"
+"PO-Revision-Date: 2009-05-13 20:11:36+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid "This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr ""
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr ""
+
diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po
new file mode 100644
index 00000000000..daf15f0ea67
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/ca.po
@@ -0,0 +1,94 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-01-26 11:00+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invàlid per a la definició de la vista!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Trenca conciliació de transaccions"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+"Aquest mòdul inclou:\n"
+"    * Concilia factures de proveïdors i clients mentre són pagades "
+"mitjançant \n"
+"    comprovants comptables\n"
+"    "
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Si trenqueu conciliació de transaccions, també heu de comprovar totes les "
+"accions que estan relacionades amb aquestes transaccions ja que no seran "
+"eliminades"
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Línies de comprovant"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr "Pagaments i rebuts de factures per comprovant."
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Trenca conciliació entrades"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Trenca conciliació"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Trenca conciliació"
diff --git a/addons/account_voucher_payment/i18n/ca_ES.po b/addons/account_voucher_payment/i18n/ca_ES.po
new file mode 100644
index 00000000000..e168daa59a1
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/ca_ES.po
@@ -0,0 +1,81 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-05-13 19:47:47+0000\n"
+"PO-Revision-Date: 2009-05-16 18:57+0100\n"
+"Last-Translator: Jordi Esteve <jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invàlid per a la definició de la vista!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Trenca conciliació de transaccions"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
+msgstr "Si trenqueu conciliació de transaccions, també heu de comprovar totes les accions que estan relacionades amb aquestes transaccions ja que no seran eliminades"
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Línies de comprovant"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr "Pagaments i rebuts de factures per comprovant."
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Trenca conciliació entrades"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+"Aquest mòdul inclou:\n"
+"    * Concilia factures de proveïdors i clients mentre són pagades mitjançant \n"
+"    comprovants comptables\n"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Trenca conciliació"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Trenca conciliació"
+
diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po
new file mode 100644
index 00000000000..a3df62eaec2
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/es.po
@@ -0,0 +1,92 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-02-19 05:54+0000\n"
+"Last-Translator: Luis Alejandro Rangel Sánchez <xlarsx@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-21 03:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Romper conciliación de transacciones"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+"Este módulo incluye :\n"
+"    * Concilia facturas de proveedores y clientes mientras son pagadas "
+"mediante \n"
+"    comprobantes contables\n"
+"    "
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Si rompe conciliación de transacciones, también debe verificar todas las "
+"acciones que están enlazadas a estas transacciones porque no serán eliminadas"
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Líneas de comprobante"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr "Pagos y recibos de facturas por comprobantes."
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Romper concilación entradas"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "Compañero"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Romper conciliación"
diff --git a/addons/account_voucher_payment/i18n/es_ES.po b/addons/account_voucher_payment/i18n/es_ES.po
new file mode 100644
index 00000000000..edeedde1f12
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/es_ES.po
@@ -0,0 +1,81 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-05-13 19:47:47+0000\n"
+"PO-Revision-Date: 2009-05-16 18:57+0100\n"
+"Last-Translator: Jordi Esteve <jesteve@zikzakmedia.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Romper conciliación de transacciones"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
+msgstr "Si rompe conciliación de transacciones, también debe verificar todas las acciones que están enlazadas a estas transacciones porque no serán eliminadas"
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Líneas de comprobante"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr "Pagos y recibos de facturas por comprobantes."
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Romper concilación entradas"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+"Este módulo incluye :\n"
+"    * Concilia facturas de proveedores y clientes mientras son pagadas mediante \n"
+"    comprobantes contables\n"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Romper conciliación"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Romper conciliación"
+
diff --git a/addons/account_voucher_payment/i18n/fr_BE.po b/addons/account_voucher_payment/i18n/fr_BE.po
new file mode 100644
index 00000000000..65e082f1a34
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/fr_BE.po
@@ -0,0 +1,77 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_voucher_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 06:54:11+0000\n"
+"PO-Revision-Date: 2009-11-26 06:54:11+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_meta_information
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_meta_information
+msgid "This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr ""
+
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
index 0049d03f3c5..f77f5ad625c 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_journal_billing_rate/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """
 
-    This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encode his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
+    This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
 
     Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations.
 
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index a6149cabb7c..072d6cfc4f9 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Others',
     'description': """
 
-    This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encode his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
+    This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
 
     Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.
 
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index de44f6e0333..2c6c8bf3f9b 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -20,10 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Basic Calendar Functionality",
-    "version" : "1.0",
-    "depends" : ["base"],
-    'description': """Full featured calendar system that support:
+    "name" : "Basic Calendar Functionality", 
+    "version" : "1.0", 
+    "depends" : ["base"], 
+    'description': """Full featured calendar system that supports:
+
     - Alerts (create requests)
     - Recurring events (*)
     - Invitations to others people""",
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4c3940301b3..bf93c9c775d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1660,9 +1660,10 @@ class ir_model(osv.osv):
         @param ids: List of IR Model’s IDs.
         @param context: A standard dictionary for contextual values
         """
+        new_ids = isinstance(ids, (str, int, long)) and [ids] or ids
         if not context:
             context = {}
-        data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
+        data = super(ir_model, self).read(cr, uid, new_ids, fields=fields, \
                         context=context, load=load)
         if data:
             for val in data:
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d31266c9090..a5afddc9823 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-		
+
 		<!--		Attendee form view-->
 
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
@@ -24,7 +24,7 @@
                                 <field name="user_id" string="Invited User"/>
                                 <newline/>
                                 <field name="partner_address_id"
-                                    string="Partner Contact" />
+                                    string="Contact" />
                                 <field name="partner_id"
                                     string="Partner" readonly="1" />
                             </group>
@@ -67,7 +67,7 @@
                 </form>
             </field>
         </record>
-		
+
 		<!--		Attendee tree view-->
 
         <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
@@ -86,9 +86,9 @@
                 </tree>
             </field>
         </record>
-		
+
 		<!--		Attendee search view-->
-		
+
         <record id="base_calendar_attendee_search_view" model="ir.ui.view">
             <field name="name">calendar.attendee.search</field>
             <field name="model">calendar.attendee</field>
@@ -108,7 +108,7 @@
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
                    <newline/>
-					<group expand="0" string="Group By..." colspan="16">
+				    <group expand="1" string="Group By...">
 						<filter string="Type" icon="terp-project" help="Invitation Type"
 					        domain="[]" context="{'group_by':'cutype'}" />
 					    <filter string="Role" icon="terp-project"
@@ -119,14 +119,13 @@
 					    <filter string="User" icon="terp-partner" domain="[]"
 					        context="{'group_by':'user_id'}" />
 					    <filter string="Contact" icon="terp-partner" domain="[]"
-					        context="{'group_by':'partner_address_id'}" />
+					        context="{'group_by':'partner_address_id'}" />						
+					    <filter string="State" icon="terp-project" help="Invitation Type"
+                            domain="[]" context="{'group_by':' state'}" />
 					</group>
                </search>
             </field>
         </record>
-        
-        <!--		Action for attendee view-->
-
 		<record id="action_view_attendee_form" model="ir.actions.act_window">
 	         <field name="name">Event Invitations</field>
 	         <field name="type">ir.actions.act_window</field>
@@ -136,14 +135,14 @@
 	         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
 	         <field name="context">{'default_sent_by_uid': uid}</field>
 	     </record>
-		
+
 		<!-- Calenadar's menu -->
-		
+
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="10" />
-		
+
 		<!-- Invitation menu -->
-		
+
 		<menuitem id="menu_attendee_invitations"
 			name="Event Invitations" parent="base.menu_calendar_configuration"
 			sequence="10" action="action_view_attendee_form" />
@@ -183,9 +182,6 @@
                 </tree>
             </field>
         </record>
-            
-		<!--		Action for alarms view-->
-
         <record id="action_res_alarm_view" model="ir.actions.act_window">
             <field name="name">Available Alarms</field>
             <field name="type">ir.actions.act_window</field>
@@ -193,7 +189,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-		
+
 		<!--		Menu for Alarms-->
 
         <menuitem id="menu_crm_meeting_avail_alarm"
@@ -201,8 +197,8 @@
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
 
-        <!-- Event Form View-->	
-	
+        <!-- Event Form View-->
+
 		<record model="ir.ui.view" id="event_form_view">
 	        <field name="name">Event Form</field>
 	        <field name="model">calendar.event</field>
@@ -300,7 +296,7 @@
 	                            nolabel="1" widget="one2many" mode="tree,form">
 	                            <tree string="Invitation details" editable="top">
 	                                <field name="email" />
-	                                <field name="role" select="1" />
+	                                <field name="role" width="200" select="1" />
 	                                <field name="state" />
 	                            </tree>
 	                            <form string="Invitation details">
@@ -363,7 +359,7 @@
 	            </tree>
 	        </field>
 	    </record>
-	    
+
 		<!-- Event Calendar View  -->
 
 		<record model="ir.ui.view" id="event_calendar_view">
@@ -379,9 +375,9 @@
 	            </calendar>
 	        </field>
 	    </record>
-	    
+
 		<!--	 Event Search View-->
-	    
+
 	    <record id="view_calendar_event_filter" model="ir.ui.view">
 	        <field name="name">Calendar Events Search</field>
 	        <field name="model">calendar.event</field>
@@ -402,7 +398,7 @@
                            <field name="class" select="1"/>
                        </group>
                        <newline/>
-						<group expand="0" string="Group By..." colspan="16">
+						<group expand="1" string="Group By...">
 							<filter string="Date" icon="terp-project"
 						        domain="[]" context="{'group_by':'date'}" />
 						    <filter string="Availability" icon="terp-project"
@@ -419,7 +415,7 @@
 
 
 	    <!-- Event action  -->
-	    
+
 		<record id="action_view_event" model="ir.actions.act_window">
 	            <field name="name">Events</field>
 	            <field name="type">ir.actions.act_window</field>
@@ -428,12 +424,12 @@
 	            <field name="view_mode">tree,form,calendar</field>
 	            <field name="search_view_id" ref="view_calendar_event_filter"/>
 	        </record>
-		
+
 		<!-- Event menu  -->
 
 		<menuitem id="menu_events"
 				name="Events" parent="base.menu_calendar_configuration"
 				sequence="5" action="action_view_event" />
-		
+
      </data>
  </openerp>
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index ebf2ce92092..eba4e092f14 100755
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -6,3 +6,4 @@
 "access_calendar_todo","calendar.todo","model_calendar_todo",,1,1,1,1
 "access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",,1,1,1,1
 "access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",,1,1,1,1
+"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",,1,1,1,1
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index df9992b2ab8..a0fc97aa5a1 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -25,14 +25,14 @@
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
-        This module allows you to manage entirely your contacts.
+        This module allows you to manage your contacts entirely.
 
     It lets you define
         *contacts unrelated to a partner,
         *contacts working at several addresses (possibly for different partners),
         *contacts with possibly different functions for each of its job's addresses
 
-    It also add new menu items located in
+    It also adds new menu items located in
         Partners \ Contacts
         Partners \ Functions
 
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 5521263a270..568d8a612a2 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
-This module install the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
+This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
 
     """,
     'author': 'Tiny',
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index eaf73199e43..e6952263268 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -27,7 +27,7 @@
     'description': """
 This module's aim is to check the quality of other modules.
 
-It defines a wizard on the list of modules in OpenERP, which allow you to
+It defines a wizard on the list of modules in OpenERP, which allows you to
 evaluate them on different criteria such as: the respect of OpenERP coding
 standards, the speed efficiency...
 
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 51dceec5b70..9e91153be2b 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -39,7 +39,7 @@ for custom configurations and demo/testing data.
 
 How to use it:
 Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.
-Select datetime critearea of recording and objects to be recorded and Record module.
+Select datetime critearia of recording and objects to be recorded and Record module.
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index a706f0c9317..22d7adffe8b 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -24,8 +24,8 @@
     'name': 'Report Creator',
     'version': '1.0',
     'category': 'Generic Modules/Base',
-    'description': """This modules allows you to create any statistic
-report on several object. It's a SQL query builder and browser
+    'description': """This module allows you to create any statistic
+report on several objects. It's a SQL query builder and browser
 for and users.
 
 After installing the module, it adds a menu to define custom report in
diff --git a/addons/board_account/i18n/pl.po b/addons/board_account/i18n/pl.po
index 9dcb5a5372b..3e9e382ea8c 100644
--- a/addons/board_account/i18n/pl.po
+++ b/addons/board_account/i18n/pl.po
@@ -7,24 +7,24 @@ 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-09-08 12:10+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-25 16:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Konta analityczne do zamknięcia"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "Projekty faktur"
 
 #. module: board_account
 #: constraint:ir.ui.view:0
@@ -35,61 +35,61 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #: model:ir.actions.act_window,name:board_account.open_board_account
 #: model:ir.ui.menu,name:board_account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Konsola księgowości"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Konta wierzytelności"
 
 #. module: board_account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Konta do faktur"
 
 #. module: board_account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Koszty do faktur"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "Przeterminowane wierzytelności"
 
 #. module: board_account
 #: model:ir.module.module,shortdesc:board_account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Konsola dla księgowści"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Konta przychodowe"
 
 #. module: board_account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "Moje wskaźniki"
 
 #. module: board_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: board_account
 #: model:ir.ui.menu,name:board_account.next_id_68
 msgid "Accounting"
-msgstr ""
+msgstr "Księgowość"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Konsola kont"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Przeterminowany dochód"
diff --git a/addons/board_manufacturing/__openerp__.py b/addons/board_manufacturing/__openerp__.py
index 50afa0d6cbc..e61a1c08fcf 100644
--- a/addons/board_manufacturing/__openerp__.py
+++ b/addons/board_manufacturing/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Board/Manufacturing',
     'description': """
-    This module creates a dashboards for Manufaturing that includes:
+    This module creates a dashboard for Manufaturing that includes:
     * List of next production orders
     * List of deliveries (out picking)
     * Graph of work center load
diff --git a/addons/board_project/__openerp__.py b/addons/board_project/__openerp__.py
index f934c7d3bc5..6d5518b17f2 100644
--- a/addons/board_project/__openerp__.py
+++ b/addons/board_project/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Board/Projects & Services',
     'description': """
-This module implements a dashboard for project member that includes:
+This module implements a dashboard for project members that includes:
     * List of my open tasks
     * List of messages
     * Members list of project
diff --git a/addons/board_purchase/__terp__.py b/addons/board_purchase/__terp__.py
index f5ada7cfe46..bd31ee75d56 100644
--- a/addons/board_purchase/__terp__.py
+++ b/addons/board_purchase/__terp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Board/Purchase',
     'description': """
-This module implements a dashboard for purcgase management that includes:
+This module implements a dashboard for purchase management that includes:
     * Current Purchase Orders
     * Draft Purchase Orders
     * Graph for quantity and amount per month
diff --git a/addons/board_sale/__openerp__.py b/addons/board_sale/__openerp__.py
index 1c9d01d376a..4c2ae1e88c3 100644
--- a/addons/board_sale/__openerp__.py
+++ b/addons/board_sale/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Board/Sales & Purchase',
     'description': """
 This module implements a dashboard for salesman that includes:
-    * You open quotations
+    * Your open quotations
     * Top 10 sales of the month
     * Cases statistics
     * Graph of sales by product
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index de0fac56e29..362444ccc2c 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -33,6 +33,7 @@ import crm_installer
 import report
 import wizard
 
+import res_partner
 
 
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 3bc1f703454..386387b1157 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -32,12 +32,12 @@ assignment, resolution and notification.
 
 Open ERP ensures that all cases are successfully tracked by users, customers and
 suppliers. It can automatically send reminders, escalate the request, trigger
-specific methods and lots of others actions based on your enterprise own rules.
+specific methods and lots of other actions based on your own enterprise rules.
 
 The greatest thing about this system is that users don't need to do anything
 special. They can just send email to the request tracker. Open ERP will take
 care of thanking them for their message, automatically routing it to the
-appropriate staff, and making sure all future correspondence gets to the right
+appropriate staff, and make sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
@@ -96,7 +96,9 @@ between mails and Open ERP.""",
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
-        'crm_installer_view.xml'
+        'crm_installer_view.xml', 
+        
+        'res_partner_view.xml'
     ],
     'demo_xml': [
         'crm_demo.xml',
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3fbca9d5595..9c24e306154 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<!--Lead Stage Form view -->
+	<!--Lead Stage Form view -->
 
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
         <field name="name">Lead Stages</field>
@@ -16,7 +16,7 @@
         groups="base.group_extended"
         parent="crm.menu_crm_case_stage" />
 
-    <!--  Resource Type Form View -->
+    	<!--  Resource Type Form View -->
 
         <record id="crm_lead_resource_act" model="ir.actions.act_window">
             <field name="name">Lead Resource Type</field>
@@ -31,7 +31,7 @@
             groups="base.group_extended"
             parent="crm.menu_crm_case_resource_type" />
 
-<!-- CRM Lead Form View  -->
+		<!-- CRM Lead Form View  -->
 
         <record model="ir.ui.view" id="crm_case_form_view_leads">
         <field name="name">CRM - Leads Form</field>
@@ -190,7 +190,7 @@
         </field>
     </record>
 
-<!-- CRM Lead Tree View -->
+	<!-- CRM Lead Tree View -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_leads">
         <field name="name">CRM - Leads Tree</field>
@@ -239,7 +239,7 @@
         </field>
     </record>
 
-<!-- CRM Lead Calendar View -->
+	<!-- CRM Lead Calendar View -->
 
     <record model="ir.ui.view" id="crm_case_calendar_view_leads">
         <field name="name">CRM - Leads Calendar</field>
@@ -257,7 +257,7 @@
         </field>
     </record>
 
-<!-- CRM Lead Search View -->
+	<!-- CRM Lead Search View -->
 
     <record id="view_crm_case_leads_filter" model="ir.ui.view">
         <field name="name">CRM - Leads Search</field>
@@ -306,7 +306,7 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="14">
+                <group expand="1" string="Group By...">
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
@@ -322,6 +322,5 @@
         </field>
     </record>
 
-
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 20ae1176ca6..e45ee85b31d 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -175,16 +175,4 @@ class res_users(osv.osv):
 res_users()
 
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds meetings information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
-                                                     'Meetings'), 
-                }
-
-res_partner()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index ac61809cfad..e84bbb673ee 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- CRM Meetings Categories Form View -->
+	<!-- CRM Meetings Categories Form View -->
 
     <record id="crm_meeting_categ_action" model="ir.actions.act_window">
         <field name="name">Meeting Categories</field>
@@ -16,7 +16,7 @@
     <menuitem action="crm_meeting_categ_action"
         id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
 
-<!-- CRM Meetings Form View -->
+	<!-- CRM Meetings Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_meet">
         <field name="name">CRM - Meetings Form</field>
@@ -204,7 +204,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Tree View  -->
+	<!-- CRM Meeting Tree View  -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_meet">
         <field name="name">CRM - Meetings Tree</field>
@@ -222,7 +222,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Calendar -->
+	<!-- CRM Meeting Calendar -->
 
     <record model="ir.ui.view" id="crm_case_calendar_view_meet">
         <field name="name">CRM - Meetings Calendar</field>
@@ -238,7 +238,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Gantt  -->
+	<!-- CRM Meeting Gantt  -->
 
     <record id="crm_case_gantt_view_meet" model="ir.ui.view">
         <field name="name">CRM - Meetings Gantt</field>
@@ -254,7 +254,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Search View  -->
+	<!-- CRM Meeting Search View  -->
 
     <record id="view_crm_case_meetings_filter" model="ir.ui.view">
         <field name="name">CRM - Meetings Search</field>
@@ -277,7 +277,7 @@
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                        <newline/>
-					   	<group expand="0" string="Group By..." colspan="16">
+					   	<group expand="1" string="Group By...">
 							<filter string="Date" icon="terp-project"
 						        domain="[]" context="{'group_by':'date'}" />
 						    <filter string="Privacy" icon="terp-crm"
@@ -296,7 +296,7 @@
             </field>
         </record>
 
-<!-- Calendar Attendee Form View -->
+		<!-- Calendar Attendee Form View -->
 
         <record id="attendee_form_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.form.inherit</field>
@@ -310,7 +310,7 @@
                 </field>
         </record>
 
-<!-- Calendar Attendee Tree View -->
+		<!-- Calendar Attendee Tree View -->
 
         <record id="attendee_tree_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.tree.inherit</field>
@@ -324,21 +324,5 @@
                 </field>
         </record>
 
-        <!--  Partners inherited form -->
-
-		<record id="view_meeting_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.meeting.info.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">
-                <notebook position="inside">
-               		<page string="CRM Info">
-						<field name="meeting_ids" colspan="4" nolabel="1" />
-					</page>
-                </notebook>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 3bc9fdd6d81..98e4c6f3ded 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -163,16 +163,4 @@ class crm_opportunity(osv.osv):
 
 crm_opportunity()
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds Opportunities information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
-                }
-
-res_partner()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3ce0ce788f6..6f34e42324d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<!-- Opportunity Categories Form View -->
+	<!-- Opportunity Categories Form View -->
 
     <record id="crm_opportunity_categ_action" model="ir.actions.act_window">
         <field name="name">Opportunity Categories</field>
@@ -17,7 +17,7 @@
         id="menu_crm_case_opportunity-act"
         parent="crm.menu_crm_case_categ" />
 
-<!-- Opportunity Stages Form View-->
+		<!-- Opportunity Stages Form View-->
 
         <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
             <field name="name">Opportunity Stages</field>
@@ -32,7 +32,7 @@
             id="menu_crm_opportunity_stage_act"
             parent="crm.menu_crm_case_stage" />
 
-<!-- Opportunity Resource Type Form View -->
+		<!-- Opportunity Resource Type Form View -->
 
         <record id="crm_opportunity_resource_act" model="ir.actions.act_window">
             <field name="name">Opportunity Resource Type</field>
@@ -47,7 +47,7 @@
             id="menu_crm_opportunity_resource_act"
             parent="crm.menu_crm_case_resource_type" />
 
-<!-- Opportunities Form View -->
+	<!-- Opportunities Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">Opportunities</field>
@@ -204,7 +204,7 @@
         </field>
     </record>
 
-<!-- Opportunities Tree View -->
+	<!-- Opportunities Tree View -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_oppor">
         <field name="name">Opportunities Tree</field>
@@ -246,7 +246,7 @@
         </field>
     </record>
 
-<!-- Opportunities Graph View -->
+	<!-- Opportunities Graph View -->
 
     <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
         <field name="name">CRM - Opportunity Graph</field>
@@ -261,7 +261,7 @@
         </field>
     </record>
 
-<!-- Opportunities Search View -->
+	<!-- Opportunities Search View -->
 
     <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
         <field name="name">CRM - Opportunities Search</field>
@@ -293,11 +293,10 @@
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
-                        help="My Opportunities" default="1"
-                    />
+                        help="My Opportunities" default="1"/>
                     <filter icon="terp-partner"
                         domain="[('user_id','=', uid)]"
-                        help="Unassigned Opportunities" />
+                        help="Unassigned Opportunities"/>
                 </field>
                 <field name="section_id"
                     default="context.get('section_id', False)" select="1"
@@ -307,80 +306,26 @@
                         help="My Sale Team" />
                 </field>
                 <newline/>
-                <group expand="0" string="Group By..." colspan="16">
+                <group expand="1" string="Group By...">
                     <filter string="Stage" icon="terp-crm" domain="[]"
-                        context="{'group_by':'stage_id'}" />
+                        context="{'group_by':'stage_id'}"/>
                     <filter string="Priority" icon="terp-crm" domain="[]"
-                        context="{'group_by':'priority'}" />
+                        context="{'group_by':'priority'}"/>
                     <filter string="Category" icon="terp-crm"
-                        domain="[]" context="{'group_by':'categ_id'}" />
+                        domain="[]" context="{'group_by':'categ_id'}"/>
 
-                    <separator orientation="vertical" />
+                    <separator orientation="vertical"/>
                     <filter string="Salesman" icon="terp-crm"
-                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
-                    <separator orientation="vertical" />
+                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Creation" icon="terp-project"
-                        domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}"/>
                     <filter string="Exp.Closing" icon="terp-project"
-                        domain="[]" context="{'group_by':'date_deadline'}" />
+                        domain="[]" context="{'group_by':'date_deadline'}"/>
                 </group>
            </search>
         </field>
     </record>
-    
-    <!--  Partners inherited form -->
-
-		<record id="view_opp_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.opportunity.info.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="phonecall_ids" position="after">
-               			<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
-               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-				                <field name="create_date"/>
-				                <field name="partner_name"/>
-				                <field name="name"/>
-				                <field name="email_from"/>
-				                <field name="phone"/>
-				
-				                <field name="categ_id" invisible="1"/>
-				                <field name="type_id" invisible="1"/>
-				                <field name="referred" invisible="1"/>
-				
-				                <field name="stage_id"/>
-				                <button name="stage_previous" string="Previous"
-				                    states="open,pending" type="object" icon="gtk-go-back" />
-				                <button name="stage_next" string="Next"
-				                    states="open,pending" type="object"
-				                    icon="gtk-go-forward" />
-				                <field name="section_id"
-				                    invisible="context.get('invisible_section', True)" />
-				                <field name="user_id" />
-				                <field name="state" />
-				                <button name="case_open" string="Open"
-				                    states="draft,pending" type="object"
-				                    icon="gtk-go-forward" />
-				                <button name="case_close" string="Close"
-				                    states="open,draft,pending" type="object"
-				                    icon="gtk-close" />
-				                <button string="Convert to Opportunity"
-				                    name="convert_opportunity"
-				                    states="draft,open,pending" icon="gtk-index"
-				                    type="object" />
-				                <button name="case_escalate" string="Escalate"
-				                    states="open,draft,pending" type="object"
-				                    icon="gtk-go-up" />
-				                <button name="case_cancel" string="Cancel"
-				                    states="draft,open,pending" type="object"
-				                    icon="gtk-cancel" />
-				            </tree>
-               			</field>
-               		</field>
-            </field>
-        </record>
-
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 7131a3730d2..205b30d39dc 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -178,15 +178,5 @@ class crm_phonecall(osv.osv, crm_case):
 
 crm_phonecall()
 
-class res_partner(osv.osv):
-    """ Inherits partner and adds Phonecalls information in the partner form """
-    _inherit = 'res.partner'
-    
-    _columns = {
-                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
-                }
-
-res_partner()
-
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a72a8df9de8..65b77ed5abe 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -289,19 +289,5 @@
         </field>
     </record>
     
-        <!--  Partners inherited form -->
-        
-    <record id="view_phonecall_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.phonecall.info.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="meeting_ids" position="after">
-               			<field name="phonecall_ids" colspan="4" nolabel="1" />
-               		</field>
-            </field>
-        </record>
-    
     </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 79e1fc3496b..52450419fd2 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -45,7 +45,7 @@
             </field>
         </record>
 
-<!-- Case Sections Tree View -->
+		<!-- Case Sections Tree View -->
 
         <record id="crm_case_section_view_tree" model="ir.ui.view">
             <field name="name">crm.case.section.tree</field>
@@ -61,7 +61,7 @@
             </field>
         </record>
 
-<!-- Case Sections Action -->
+		<!-- Case Sections Action -->
 
         <record id="crm_case_section_act" model="ir.actions.act_window">
             <field name="name">Sales Team</field>
@@ -70,7 +70,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-<!-- CRM Stage Tree View -->
+		<!-- CRM Stage Tree View -->
 
         <record model="ir.ui.view" id="crm_case_stage_tree">
             <field name="name">crm.case.stage.tree</field>
@@ -87,7 +87,7 @@
             </field>
         </record>
 
-<!-- CRM Stage Form View -->
+		<!-- CRM Stage Form View -->
 
         <record model="ir.ui.view" id="crm_case_stage_form">
             <field name="name">crm.case.stage.form</field>
@@ -108,7 +108,7 @@
             </field>
         </record>
 
-<!-- CRM Stage Action -->
+		<!-- CRM Stage Action -->
 
         <record id="crm_case_stage_act" model="ir.actions.act_window">
             <field name="name">Stages</field>
@@ -119,7 +119,7 @@
 
         <menuitem  id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration" groups="base.group_extended"/>
 
-<!-- Case Categories Form View -->
+		<!-- Case Categories Form View -->
 
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -134,7 +134,7 @@
             </field>
         </record>
 
-<!-- Case Categories Tree View -->
+		<!-- Case Categories Tree View -->
 
         <record id="crm_case_categ_tree-view" model="ir.ui.view">
             <field name="name">crm.case.categ.tree</field>
@@ -148,7 +148,7 @@
             </field>
         </record>
 
-<!-- Case Categories Action -->
+		<!-- Case Categories Action -->
 
         <record id="crm_case_categ-act" model="ir.actions.act_window">
             <field name="name">Categories</field>
@@ -163,7 +163,7 @@
             parent="base.menu_crm_configuration" />
 
 
-<!-- Resource Type of case Tree View -->
+		<!-- Resource Type of case Tree View -->
 
         <record model="ir.ui.view" id="crm_case_resource_type_tree">
             <field name="name">crm.case.resource.type.tree</field>
@@ -178,7 +178,7 @@
             </field>
         </record>
 
-<!-- Resource Type of case Form View -->
+		<!-- Resource Type of case Form View -->
 
         <record model="ir.ui.view" id="crm_case_resource_type_form">
             <field name="name">crm.case.resource.type.form</field>
@@ -193,7 +193,7 @@
             </field>
         </record>
 
-<!-- Resource Type of case Action -->
+		<!-- Resource Type of case Action -->
 
         <record id="crm_case_resource_type_act" model="ir.actions.act_window">
             <field name="name">Resource Type</field>
@@ -212,7 +212,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-<!-- Cases Tree View  -->
+		<!-- Cases Tree View  -->
 
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
@@ -232,8 +232,7 @@
             </field>
         </record>
 
-
-<!-- Segmentation line Tree View  -->
+		<!-- Segmentation line Tree View  -->
 
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.tree</field>
@@ -250,7 +249,7 @@
             </field>
         </record>
 
-<!-- Segmentation line Form View  -->
+		<!-- Segmentation line Form View  -->
 
         <record id="crm_segmentation_line-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.form</field>
@@ -270,7 +269,7 @@
             </field>
         </record>
 
-<!-- CRM Segmentation  Form View  -->
+		<!-- CRM Segmentation  Form View  -->
 
         <record id="crm_segmentation-view" model="ir.ui.view">
             <field name="name">crm.segmentation.form</field>
@@ -315,7 +314,7 @@
             </field>
         </record>
 
-<!-- CRM Segmentation  Tree View  -->
+		<!-- CRM Segmentation  Tree View  -->
 
         <record id="crm_segmentation_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.tree</field>
@@ -375,7 +374,7 @@
                 </field>
         </record>
 
-<!-- Inherit View From Partner  -->
+		<!-- Inherit View From Partner  -->
 
         <record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c1d64ee332c..c65ee0fd285 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -107,7 +107,7 @@
                    				help="My section" />
 
                    		</field>
-                   		<field name="company_id" widget="selection">
+                   		<field name="company_id" widget="selection" groups="base.group_multi_company">
                            <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
@@ -119,21 +119,7 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                   		<group>
-		            	    <separator orientation="vertical"/>
-		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-			            </group>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                   <group  expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-sale"
                         	domain="[]" context="{'group_by':'user_id'}" />
 
@@ -166,6 +152,21 @@
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." groups="base.group_extended">
+
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+                   		<group>
+		            	    <separator orientation="vertical"/>
+		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+			            </group>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 72bc4847608..4e57ba1d474 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -63,7 +63,7 @@
         </record>
 
 <!-- Phone calls by user and section Search View -->
-	
+
 	<record id="view_report_crm_phonecall_filter" model="ir.ui.view">
             <field name="name">crm.phonecall.report.select</field>
             <field name="model">crm.phonecall.report</field>
@@ -107,7 +107,7 @@
                    				help="My section" />
 
                    		</field>
-                   		<field name="company_id" widget="selection">
+                   		<field name="company_id" widget="selection" groups="base.group_multi_company">
                            <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
@@ -118,8 +118,39 @@
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
+                    <newline/>
+                   <group  expand="1" string="Group By...">
+                        <filter string="User" name="User" icon="terp-sale"
+                            domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                            domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                            domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                            domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                            domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                            domain="[]" context="{'group_by':'name'}" />
+                  </group>
+
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="0" string="Extended options..."  groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -131,39 +162,8 @@
 		            	    <separator orientation="vertical"/>
 			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
 			             </group>
-	             
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
new file mode 100644
index 00000000000..93d865d7f74
--- /dev/null
+++ b/addons/crm/res_partner.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class res_partner(osv.osv):
+    """ Inherits partner and adds CRM information in the partner form """
+    _inherit = 'res.partner'
+    
+    _columns = {
+                'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
+                                                     'Opportunities', domain=[('type', '=', 'opportunity')]), 
+                'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
+                                                     'Meetings'), 
+                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
+                }
+
+res_partner()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
new file mode 100644
index 00000000000..540c8d13186
--- /dev/null
+++ b/addons/crm/res_partner_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+         <!--  Partners inherited form -->
+
+		<record id="view_crm_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.crm.info.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">
+                <notebook position="inside">
+               		<page string="CRM">
+						<field name="meeting_ids" colspan="4" nolabel="1" />
+						<field name="phonecall_ids" colspan="4" nolabel="1" />
+						<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
+               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+				                <field name="create_date"/>
+				                <field name="partner_name"/>
+				                <field name="name"/>
+				                <field name="email_from"/>
+				                <field name="phone"/>
+				
+				                <field name="categ_id" invisible="1"/>
+				                <field name="type_id" invisible="1"/>
+				                <field name="referred" invisible="1"/>
+				
+				                <field name="stage_id"/>
+				                <button name="stage_previous" string="Previous"
+				                    states="open,pending" type="object" icon="gtk-go-back" />
+				                <button name="stage_next" string="Next"
+				                    states="open,pending" type="object"
+				                    icon="gtk-go-forward" />
+				                <field name="section_id"
+				                    invisible="context.get('invisible_section', True)" />
+				                <field name="user_id" />
+				                <field name="state" />
+				                <button name="case_open" string="Open"
+				                    states="draft,pending" type="object"
+				                    icon="gtk-go-forward" />
+				                <button name="case_close" string="Close"
+				                    states="open,draft,pending" type="object"
+				                    icon="gtk-close" />
+				                <button string="Convert to Opportunity"
+				                    name="convert_opportunity"
+				                    states="draft,open,pending" icon="gtk-index"
+				                    type="object" />
+				                <button name="case_escalate" string="Escalate"
+				                    states="open,draft,pending" type="object"
+				                    icon="gtk-go-up" />
+				                <button name="case_cancel" string="Cancel"
+				                    states="draft,open,pending" type="object"
+				                    icon="gtk-cancel" />
+				            </tree>
+               			</field>
+					</page>
+                </notebook>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index a824f279e28..2decc56b806 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -147,7 +147,6 @@ class crm_lead2partner(osv.osv_memory):
                         'user_id': lead.user_id.id,
                         'comment': lead.description,
                     })
-                    function_id = self.pool.get('res.partner.function').search(cr,uid,[('name','=',lead.function_name)])
                     contact_id = contact_obj.create(cr, uid, {
                         'partner_id': partner_id,
                         'name': lead.name,
@@ -156,7 +155,7 @@ class crm_lead2partner(osv.osv_memory):
                         'email': lead.email_from,
                         'fax': lead.fax,
                         'title': lead.title,
-                        'function': function_id and function_id[0] or False,
+                        'function': lead.function_name,
                         'street': lead.street,
                         'street2': lead.street2,
                         'zip': lead.zip,
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7a3dd4cc829..a625ec4dbc8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -271,7 +271,7 @@
                    <field name="section_id" select="1"
                        widget="selection"/>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="10" col="20">
+                   <group expand="1" string="Group By...">
                        <filter string="Deadline" icon="terp-crm"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 6f906f3d21f..ca6fdb95277 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -67,7 +67,7 @@
         </record>
 
 <!-- CRM Claim Report Search View -->
-		
+
 		<record id="view_report_crm_claim_filter" model="ir.ui.view">
             <field name="name">crm.claim.report.select</field>
             <field name="model">crm.claim.report</field>
@@ -122,8 +122,47 @@
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
+                    <newline/>
+                   <group  expand="1" string="Group By...">
+                        <filter string="User" name="User" icon="terp-sale"
+                            domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+
+                        <filter string="Section" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                            domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Stage" icon="terp-sale" domain="[]"
+                             context="{'group_by':'stage_id'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                            domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical"/>
+                         <filter string="Priority" icon="terp-sale" domain="[]"
+                             context="{'group_by':'priority'}" />
+                         <filter string="Type" icon="terp-sale" domain="[]"
+                             context="{'group_by':'type_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                            domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                            domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                            domain="[]" context="{'group_by':'name'}" />
+                  </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="0" string="Extended options..." groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -141,46 +180,6 @@
 			                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
 		                </group>
                    </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-						
-						<filter string="Stage" icon="terp-sale" domain="[]"
-		                     context="{'group_by':'stage_id'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-						
-						<separator orientation="vertical"/>
-		                 <filter string="Priority" icon="terp-sale" domain="[]"
-		                     context="{'group_by':'priority'}" />
-		                 <filter string="Type" icon="terp-sale" domain="[]"
-		                     context="{'group_by':'type_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 68fcd768d74..908e9c7616d 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -256,7 +256,7 @@
                 <field name="type">search</field>
                 <field name="arch" type="xml">
                     <search string="Search Funds">
-                        <group col='6' colspan='4'>
+                        <group>
                             <filter icon="gtk-new" string="Current"
                                 domain="[('state','in',('draft', 'open'))]" name="current"
                                 help="Current Funds" />
@@ -284,7 +284,7 @@
                             </field>
                         </group>
                         <newline/>
-                        <group expand="0" string="Group By..." colspan="10" col="20">
+                        <group expand="1" string="Group By...">
                             <filter string="Partner" icon="terp-partner"
                                 domain="[]"
                                 context="{'group_by':'partner_id'}" />
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 73f35ddba50..20e8ef68b6b 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -121,8 +121,38 @@
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
+                   <group  expand="1" string="Group By...">
+                        <filter string="User" name="User" icon="terp-sale"
+                            domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                            domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                            domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                            domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                            domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                            domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="0" string="Extended options..." groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -130,44 +160,12 @@
                     	<filter icon="terp-sale"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
-                    	
+
                     	<group>
 		            	    <separator orientation="vertical"/>
 			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
 			             </group>
-
                    </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 27ccee6ef0d..e771e0ba29f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -243,7 +243,7 @@
                             help="My section" />
                     </field>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="12" col="20">
+                    <group expand="1" string="Group By...">
                         <filter string="Customer" icon="terp-crm"
                             domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="State" icon="terp-crm" domain="[]"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index a8857c0d557..f564bb38d4d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,36 +114,10 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Extended options..." colspan="4" col="5">
-                        <filter icon="terp-sale"
-                            string="Lowest"
-                            domain="[('priority','=','5')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Low"
-                            domain="[('priority','=','4')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Normal"
-                            domain="[('priority','=','3')]"/>
-
-                        <filter icon="terp-sale"
-                            string="High"
-                            domain="[('priority','=','2')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Highest"
-                            domain="[('priority','=','1')]"/>
-
-                   </group>
-                   <newline/>
-
-<!-- Helpdesk report after Sales Services Apply Group -->
-
-                  <group expand="1" string="Group By..." colspan="4" col="8">
+                  <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}"
-                        	default="1" />
+                            domain="[]" context="{'group_by':'user_id'}"
+                            default="1" />
 
                         <filter string="Company" icon="terp-sale"
                             domain="[]"
@@ -169,6 +143,31 @@
                             domain="[]" context="{'group_by':'name'}" />
 
                   </group>
+                    <newline/>
+                   <group expand="0" string="Extended options..."  groups="base.group_extended">
+                        <filter icon="terp-sale"
+                            string="Lowest"
+                            domain="[('priority','=','5')]"/>
+
+                        <filter icon="terp-sale"
+                            string="Low"
+                            domain="[('priority','=','4')]"/>
+
+                        <filter icon="terp-sale"
+                            string="Normal"
+                            domain="[('priority','=','3')]"/>
+
+                        <filter icon="terp-sale"
+                            string="High"
+                            domain="[('priority','=','2')]"/>
+
+                        <filter icon="terp-sale"
+                            string="Highest"
+                            domain="[('priority','=','1')]"/>
+
+                   </group>
+                   
+
                </search>
             </field>
         </record>
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 684547e0a89..9cdc402ae56 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Carriers and deliveries',
     'version': '1.0',
     'category': 'Generic Modules/Sales & Purchases',
-    'description': """Allows you to add delivery methods in sales orders and picking.
+    'description': """Allows you to add delivery methods in sale orders and picking.
      You can define your own carrier and delivery grids for prices.
      When creating invoices from picking, Open ERP is able to add and compute the shipping line.
 
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 7626bd3c51b..8a78ae46fdd 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -31,7 +31,7 @@
     ATTENTION:
     - When you install this module in a running company that have already PDF files stored into the database,
       you will lose them all.
-    - After installing this module PDF's are not longer stored into the database,
+    - After installing this module PDF's are no longer stored into the database,
       but in the servers rootpad like /server/bin/filestore.
 """,
     'author': 'Tiny',
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 7fcdfd8d0d5..18042dabf93 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Others',
     'description': """This is a support FTP Interface with document management system.
     With this module you would not only be able to access documents through open erp
-    also you would be able to connect with them through the file system using the FTP protocol.
+    but you would also be able to connect with them through the file system using the FTP protocol.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 7fd52a7fc8b..a1276c11643 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -26,7 +26,7 @@
     "version" : "1.0",
     "depends" : ["base"],
     "author" : "Tiny",
-    "description": """Fetchail: 
+    "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
     * Support SSL
     * Integrated with all Modules
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
old mode 100644
new mode 100755
index d6477640582..7c0b0bed128
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -47,6 +47,8 @@
     ],
     'demo_xml': ['hr_demo.xml',
         'hr_department_demo.xml'],
+        
+    'test': ['test/test_hr.yml'],    
     'installable': True,
     'active': False,
     'certificate': '0086710558965',
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6f20b9fda14..210e83c11ad 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -109,7 +109,7 @@
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id" widget="selection" />
                     <newline />
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By...">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical" />
diff --git a/addons/hr/test/test_hr.yml b/addons/hr/test/test_hr.yml
new file mode 100644
index 00000000000..494111737b1
--- /dev/null
+++ b/addons/hr/test/test_hr.yml
@@ -0,0 +1,68 @@
+- |
+  In order to test the hr module in OpenERP, I will create new Employee , Department and Job Position.
+-
+  |
+  First I create Department  "R & D" in Department form.
+- 
+  !record {model: hr.department, id: hr_department_rd0}:
+    manager_id: base.user_root
+    name: 'R & D '
+-     
+  |
+  Now, I  create a new employee “employee1”.
+  select "R & D" Department  which I had created.    
+-
+  !record {model: hr.employee, id: hr_employee_employee0}:
+    address_home_id: base.res_partner_address_1
+    company_id: base.main_company
+    gender: male
+    marital: hr.hr_employee_marital_status_single
+    name: employee1
+    user_id: base.user_root
+    department_id: 'hr_department_rd0'
+
+- |
+  In order to check the wizard “Employee Hierarchy” I will create new employee “employee2” and select "employee1" as 
+  Manager.    
+- 
+  !record {model: hr.employee, id: hr_employee_employee1}:
+    address_home_id: base.res_partner_address_3000
+    company_id: base.main_company
+    gender: male
+    name: employee2
+    user_id: base.user_demo
+    parent_id: 'hr_employee_employee0'
+- |
+  Now I will open up form view of  “employee1” and test the wizard “Employee Hierarchy” so it display the employee
+  hierarchy starting from “employee1”. 
+       
+- |
+  Now I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
+- 
+  !record {model: hr.job, id: hr_job_jea0}:
+    department_id: 'hr_department_rd0'
+    description: 'Position of Junier Application Engineer '
+    expected_employees: 5
+    name: 'JEA '
+- |
+  I check that Employee form is in "Open" state.
+-
+  !assert {model: hr.job, id: hr_job_jea0}:
+    - state == 'open'  
+    
+- |
+  I create Employee for this position in this Job Position form.
+- 
+  !record {model: hr.job, id: hr_job_jea0}:
+    employee_ids:
+      - address_home_id: base.res_partner_address_1
+        name: employee3 
+        department_id: 'hr_department_rd0'
+        gender: male
+        parent_id: 'hr_employee_employee0'
+-
+  I check that "NO of Employee" is "1"     
+-
+  !assert {model: hr.job, id: hr_job_jea0}:
+    - no_of_employee != False       
+        
\ No newline at end of file
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 2ea2d325867..8b9a68575b0 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -55,7 +55,7 @@
                     <field name="name" select="1"  />
                     <field name="action" select="1" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By...">
                         <filter name="employee" string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/>
                     </group>
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
old mode 100644
new mode 100755
index d47b3b687cb..29678612e34
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -42,6 +42,7 @@
         'hr_contract_view.xml'
     ],
     'demo_xml': [],
+    'test': ['test/test_hr_contract.yml'],
     'installable': True,
     'active': False,
     'certificate': '0046298028637',
diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml
new file mode 100644
index 00000000000..87c44722e2c
--- /dev/null
+++ b/addons/hr_contract/test/test_hr_contract.yml
@@ -0,0 +1,46 @@
+- |
+  In order to test hr_contract module in OpenERP,   
+  I will create contract for "Mark Johnson" employee.
+  
+- |
+  First I create Employee "Mark Johnson" 
+-
+  !record {model: hr.employee, id: hr_employee_employee0}:
+    address_home_id: base.res_partner_address_1
+    company_id: base.main_company
+    gender: male
+    name: Mark Johnson
+    user_id: base.user_root
+    
+- |
+  Given that I have Contract wage period "monthly" and 
+  specify "hours in period" is "176.00"
+- 
+  !record {model: hr.contract.wage.type.period, id: hr_contract_wage_type_period_monthly0}:
+    factor_days: 178.0
+    name: monthly
+- |
+  Given that I have Contract wage type "Monthly Gross Wage". 
+  select wage period "monthly" and type "Gross". with hour cost "1.9" 
+- 
+  !record {model: hr.contract.wage.type, id: hr_contract_wage_type_monthlygrosswage0}:
+    factor_type: 1.9
+    name: Monthly Gross Wage
+    period_id: 'hr_contract_wage_type_period_monthly0'
+    type: gross
+       
+- |
+  Now I start by create contract for "Mark Johnson".
+  Select wage type "Monthly Gross Wage" and Wage period "monthly" 
+  which I have given.
+- 
+  !record {model: hr.contract, id: hr_contract_contract0}:
+    advantages_gross: 0.0
+    employee_id: 'hr_employee_employee0'
+    advantages_net: 0.0
+    date_end: '2011-05-18'
+    date_start: '2010-05-18'
+    name: contract1
+    wage: 1.0
+    wage_type_id: hr_contract_wage_type_monthlygrosswage0
+    working_hours: resource.timesheet_group1
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index be1ce233718..36b54b63d0b 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -28,7 +28,7 @@
     "depends" : ["hr",'hr_recruitment','survey'],
     "description": """
                       Ability to create employees evaluation.
-                      An evaluation can be created by employee for subordinates
+                      An evaluation can be created by employee for subordinates,
                       juniors as well as his manager.The evaluation is done under a plan
                       in which various surveys can be created and it can be defined which
                       level of employee hierarchy fills what and final review and evaluation
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index fe25cd7ab23..d02c76bc44c 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -10,10 +10,10 @@
                 <search string="Search Evaluation Plan">
                    <group col='15' colspan='4'>
                        <field name="name"/>
-                       <field name="company_id" widget="selection"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
+                   <group expand="1" string="Group By..." groups="base.group_multi_company">
                         <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
                     </group>
                </search>
@@ -28,7 +28,7 @@
                 <form string="Evaluation Plan">
                     <group col="6" colspan="4">
                         <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"/>
                         <field name="active"/>
                         <field name="month_first"/>
                         <field name="month_next"/>
@@ -51,7 +51,7 @@
                     <field name="name"/>
                     <field name="month_first"/>
                     <field name="month_next"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 0dacc90c53c..921d8b43a2b 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -71,7 +71,19 @@
 	                <field name="employee_id" widget="selection"/>
                 </group>
                 <newline/>
-				<group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Plan" icon="terp-hr" context="{'group_by':'plan_id'}"/>
+                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'create_date'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
+                 <newline/>
+				<group expand="0" string="Extended options..." groups="base.group_extended">
                 	<filter icon="terp-hr"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -87,18 +99,6 @@
                     <field name="create_date"/>
                     <field name="closed"/>
                 </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Rating" icon="terp-hr" context="{'group_by':'rating'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Plan" icon="terp-hr" context="{'group_by':'plan_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'create_date'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index d8d6e23ac51..ae13b0ce67b 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -34,7 +34,7 @@
     * Validation by the accountant and invoice creation
     * Payment of the invoice to the employee
 
-    This module also use the analytic accounting and is compatible with
+    This module also uses the analytic accounting and is compatible with
     the invoice on timesheet module so that you will be able to automatically
     re-invoice your customer's expenses if your work by project.
     """,
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 14bc05b6454..abce10e80f3 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -153,7 +153,7 @@
                       <field name="department_id" widget="selection" groups="base.group_extended"/>
                 </group>
                 <newline />
-                <group expand="1" string="Group By..." colspan="11" col="11">
+                <group expand="1" string="Group By...">
                     <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 7a50cb71140..1d1b1dc6e0f 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -87,7 +87,25 @@
                     <field name="employee_id" widget="selection"/>
 				</group>
 				<newline/>
-				<group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
+                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
+                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/>
+                    <filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/>
+                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+                    <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
+                </group>
+				<newline/>
+				<group expand="0" string="Extended filters..." groups="base.group_extended">
 					<filter string="Invoiced"
 	                   		icon="terp-hr"
 	                   		domain="[('state','=','invoiced')]"
@@ -109,24 +127,6 @@
                     <field name="date_confirm"/>
                     <field name="date_valid"/>
                 </group>
-                <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-                    <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic account" icon="terp-hr" context="{'group_by':'analytic_account'}"/>
-                    <filter string="Currency" icon="terp-hr" context="{'group_by':'currency_id'}"/>
-                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-                    <filter string="Force Journal" icon="terp-hr" context="{'group_by':'journal_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 3f0cd36ce4e..f00fa4d36b6 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -62,6 +62,7 @@
         #'process/hr_holidays_process.xml'
     ],
     'demo_xml': ['hr_holidays_demo.xml',],
+    'test': ['test/test_hr_holiday.yml'],
     'installable': True,
     'active': False,
     'certificate': '0086579209325',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 77dd0984cf5..d564903ffee 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -31,7 +31,7 @@ class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
     _description = "Leave Type"
 
-    def get_days_cat(self, cr, uid, ids, category_id, return_false, context={}):
+    def get_days_cat(self, cr, uid, ids, category_id, return_false, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context):
             res[record.id] = {}
@@ -48,7 +48,7 @@ class hr_holidays_status(osv.osv):
             res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
         return res
 
-    def get_days(self, cr, uid, ids, employee_id, return_false, context={}):
+    def get_days(self, cr, uid, ids, employee_id, return_false, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             res[record.id] = {}
@@ -65,7 +65,7 @@ class hr_holidays_status(osv.osv):
             res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
         return res
 
-    def _user_left_days(self, cr, uid, ids, name, args, context={}):
+    def _user_left_days(self, cr, uid, ids, name, args, context=None):
         return_false = False
         employee_id = False
         res = {}
@@ -122,7 +122,7 @@ class hr_holidays(osv.osv):
         '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)]}),
-        'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
+        'holiday_status_id' : fields.many2one("hr.holidays.status", " Leave  Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id' : fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
         'manager_id' : fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
         'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
@@ -134,7 +134,7 @@ class hr_holidays(osv.osv):
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
-        'category_id': fields.many2one('hr.employee.category', "Employee Category", help='Category Of employee'),
+        'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Holiday Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category'),
         'manager_id2': fields.many2one('hr.employee', 'Second Validator', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
             }
@@ -148,6 +148,17 @@ class hr_holidays(osv.osv):
         'holiday_type': 'employee'
     }
 
+    def _create_resource_leave(self, cr, uid, vals, context=None):
+        '''This method will create entry in resource calendar leave object at the time of holidays validated '''
+        obj_res_leave = self.pool.get('resource.calendar.leaves')
+        return obj_res_leave.create(cr, uid, vals)
+
+    def _remove_resouce_leave(self, cr, uid, ids, context=None):
+        '''This method will create entry in resource calendar leave object at the time of holidays cancel/removed'''
+        obj_res_leave = self.pool.get('resource.calendar.leaves')
+        leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)])
+        return obj_res_leave.unlink(cr, uid, leave_ids)
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
@@ -204,9 +215,11 @@ class hr_holidays(osv.osv):
                     self.unlink(cr, uid, list_ids)
 
     def _check_date(self, cr, uid, ids):
-        for rec in self.read(cr, uid, ids, ['number_of_days_temp','date_from','date_to']):
+        for rec in self.read(cr, uid, ids, ['number_of_days_temp','date_from','date_to', 'type']):
             if rec['number_of_days_temp'] < 0:
                 return False
+            if rec['type']=='add':
+                continue
             date_from = time.strptime(rec['date_from'], '%Y-%m-%d %H:%M:%S')
             date_to = time.strptime(rec['date_to'], '%Y-%m-%d %H:%M:%S')
             if date_from > date_to:
@@ -215,14 +228,11 @@ class hr_holidays(osv.osv):
 
     _constraints = [(_check_date, 'Start date should not be larger than end date!\nNumber of Days should be greater than 1!', ['number_of_days_temp'])]
 
-    def unlink(self, cr, uid, ids, context={}):
-        leave_obj = self.pool.get('resource.calendar.leaves')
+    def unlink(self, cr, uid, ids, context=None):
         self._update_user_holidays(cr, uid, ids)
-        leave_ids = leave_obj.search(cr, uid, [('holiday_id', 'in', ids)])
-        leave_obj.unlink(cr, uid, leave_ids)
+        self._remove_resouce_leave(cr, uid, ids, context=context)
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
-
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):
         result = {}
         if date_to and date_from:
@@ -251,14 +261,14 @@ class hr_holidays(osv.osv):
         return {'warning': warning}
 
     def set_to_draft(self, cr, uid, ids, *args):
+        wf_service = netsvc.LocalService("workflow")
         self.write(cr, uid, ids, {
             'state':'draft',
             'manager_id': False,
             'number_of_days': 0,
         })
-        wf_service = netsvc.LocalService("workflow")
-        for holiday_id in ids:
-            wf_service.trg_create(uid, 'hr.holidays', holiday_id, cr)
+        for id in ids:
+            wf_service.trg_create(uid, 'hr.holidays', id, cr)
         return True
 
     def holidays_validate2(self, cr, uid, ids, *args):
@@ -273,7 +283,6 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_validate(self, cr, uid, ids, *args):
-        obj_res_leave = self.pool.get('resource.calendar.leaves')
         obj_emp = self.pool.get('hr.employee')
         data_holiday = self.browse(cr, uid, ids)
         self.check_holidays(cr, uid, ids)
@@ -298,7 +307,7 @@ class hr_holidays(osv.osv):
                    'resource_id': record.employee_id.resource_id.id,
                    'holiday_id': record.id
                      }
-                obj_res_leave.create(cr, uid, vals)
+                self._create_resource_leave(cr, uid, vals)
             elif record.holiday_type=='category' and record.type=='remove':
                 emp_ids = obj_emp.search(cr, uid, [('category_id', '=', record.category_id.id)])
                 for emp in obj_emp.browse(cr, uid, emp_ids):
@@ -311,7 +320,7 @@ class hr_holidays(osv.osv):
                        'resource_id': emp.resource_id.id,
                        'holiday_id':record.id
                          }
-                    obj_res_leave.create(cr, uid, vals)
+                    self._create_resource_leave(cr, uid, vals)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
@@ -354,20 +363,17 @@ class hr_holidays(osv.osv):
         return True
 
     def holidays_cancel(self, cr, uid, ids, *args):
-        leave_obj = self.pool.get('resource.calendar.leaves')
         self._update_user_holidays(cr, uid, ids)
         self.write(cr, uid, ids, {
             'state':'cancel'
             })
-        leave_ids = leave_obj.search(cr, uid, [('holiday_id', 'in', ids)])
-        leave_obj.unlink(cr, uid, leave_ids)
+        self._remove_resouce_leave(cr, uid, ids)
         return True
 
     def holidays_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
             'state':'draft'
         })
-        self.pool.get('resource.calendar.leaves')
         return True
 
     def check_holidays(self, cr, uid, ids):
@@ -439,7 +445,9 @@ class hr_holidays(osv.osv):
                 }
                 case_id = self.pool.get('crm.meeting').create(cr,uid,vals)
                 self.write(cr, uid, ids, {'case_id':case_id})
+
         return True
+
 hr_holidays()
 
 class resource_calendar_leaves(osv.osv):
@@ -447,7 +455,8 @@ class resource_calendar_leaves(osv.osv):
     _description = "Leave Detail"
     _columns = {
         'holiday_id': fields.many2one("hr.holidays", "Holiday"),
-    }
+                }
 
 resource_calendar_leaves()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index c27abb6f609..db500646f00 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -5,41 +5,40 @@
 		<!-- Casual leave -->
 		<record model="hr.holidays.status" id="holiday_status_cl">
 			<field name="name">Casual Leave</field>
+			<field name="double_validation">True</field>
 			<field name="color_name">black</field>
 		</record>
 
         <record model="hr.holidays" id="hr_holidays_employee1_allocation_cl">
-            <field name="name">Trip with Family</field>
+            <field name="name">Casual Leave for Fabien Pinckaers</field>
             <field name="holiday_status_id" ref="holiday_status_cl"/>
             <field name="type">add</field>
-            <field name="date_from">2010-01-01 08:00</field>
-            <field name="date_to">2010-01-03 18:00</field>
-            <field name="number_of_days_temp">1</field>
+            <field name="number_of_days_temp">12</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
 
 		<record model="hr.holidays" id="hr_holidays_employee1_cl">
 			<field name="name">Trip with Family</field>
 			<field name="holiday_status_id" ref="holiday_status_cl"/>
-			<field name="date_from">2010-01-01 08:00</field>
-			<field name="date_to">2010-01-03 18:00</field>
-			<field name="number_of_days_temp">1</field>
+			<field name="date_from">2010-01-04 08:00</field>
+			<field name="date_to">2010-01-06 18:00</field>
+			<field name="type">remove</field>
+			<field name="number_of_days_temp">3</field>
 			<field name="employee_id" ref="hr.employee1"/>
 		</record>
 
 		<!-- Sick leave -->
 		<record model="hr.holidays.status" id="holiday_status_sl">
 			<field name="name">Sick Leave</field>
+			<field name="limit">True</field>
 			<field name="color_name">red</field>
 		</record>
 
         <record model="hr.holidays" id="hr_holidays_employee1_allocation_sl">
-            <field name="name">Doctor Appointment</field>
+            <field name="name">Sick Leave for Fabien Pinckaers</field>
             <field name="holiday_status_id" ref="holiday_status_sl"/>
             <field name="type">add</field>
-            <field name="date_from">2010-02-01 00:00</field>
-            <field name="date_to">2010-02-03 08:00</field>
-            <field name="number_of_days_temp">3</field>
+            <field name="number_of_days_temp">7</field>
             <field name="employee_id" ref="hr.employee1"/>
         </record>
 
@@ -48,6 +47,7 @@
 			<field name="holiday_status_id" ref="holiday_status_sl"/>
 			<field name="date_from">2010-02-01 00:00</field>
 			<field name="date_to">2010-02-03 08:00</field>
+			<field name="type">remove</field>
 			<field name="number_of_days_temp">3</field>
 			<field name="employee_id" ref="hr.employee1"/>
 		</record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 062e0f500a2..74546ff1388 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -15,14 +15,14 @@
                         <separator orientation="vertical"/>
                         <field name="user_id" widget="selection"/>
                         <field name="department_id" widget="selection">
-                            <filter icon="terp-hr"
+                            <filter icon="terp-hr" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]"
                                 />
                         </field>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline />
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By...">
                         <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
@@ -43,26 +43,28 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Leave Request">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}"/>
+                        <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130"/>
+                        <group attrs="{'invisible':[('holiday_type','=','employee')]}">
+                            <field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+                        </group>
+                        <group attrs="{'invisible':[('holiday_type','=','category')]}">
+                            <field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-	                        <group colspan="4" attrs="{'invisible':[('holiday_type','=','employee')]}">
-	   	                    	<field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
-	   	                    </group>
-	   	                    <group colspan="4" attrs="{'invisible':[('holiday_type','=','category')]}">
-	                        	<field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
-	                        </group>
 	                        <field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-	                        <newline/>
+                            <field name="department_id"/>
 	                        <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
 	                        <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
 	                        <field name="number_of_days_temp"/>
+                            <newline/>
                             <field name="manager_id"/>
-                            <field name="department_id"/>
-                            <field name="notes" colspan="4"/>
+                            <field name="manager_id2"/>
+                            <separator string="Notes" colspan="4"/>
+                            <field name="notes" nolabel="1" colspan="4"/>
                             <newline/>
                             <field name="state" select="1" colspan="2"/>
                             <group colspan="2">
@@ -74,52 +76,71 @@
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="Extra Information">
-							<field name="manager_id2"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
         </record>
 
         <!-- Holidays: Allocation Request -->
-        <record model="ir.ui.view" id="allocation_leave_new">
-            <field name="name">Allocation Request</field>
+		<record model="ir.ui.view" id="allocation_leave_new">
+			<field name="name">Allocation Request</field>
+			<field name="model">hr.holidays</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+			<form string="Allocation Request">
+				<group col="4" colspan="4">
+					<field name="name" select="1"/>
+					<field name="holiday_status_id" select="1"/>
+					<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
+					<group col="2" colspan="2">
+						<group attrs="{'invisible':[('holiday_type','=','category')]}">
+    						<field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
+						</group>
+						<group attrs="{'invisible':[('holiday_type','=','employee')]}">
+    	   					<field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
+						</group>
+					</group>
+				</group>
+				<notebook colspan="4">
+					<page string="General">
+						<field name="number_of_days_temp"/>
+						<field name="department_id"/>
+						<field name="manager_id"/>
+						<field name="manager_id2"/>
+						<separator string="Notes" colspan="4"/>
+						<field name="notes" nolabel="1" colspan="4" />
+						<newline/>
+						<field name="state" select="1" colspan="2"/>
+						<group colspan="2">
+							<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+							<button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+							<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
+							<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
+							<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+							<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+						</group>
+					</page>
+				</notebook>
+			</form>
+			</field>
+		</record>
+
+        <record model="ir.ui.view" id="view_holiday_allocation_tree">
+            <field name="name">hr.holidays.allocation.tree</field>
             <field name="model">hr.holidays</field>
-            <field name="type">form</field>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <form string="Allocation Request">
-                    <field name="name" select="1"/>
-                    <field name="holiday_status_id" select="1" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type"/>
-                    <notebook colspan="4">
-                        <page string="General">
-		                    <group colspan="4" attrs="{'invisible':[('holiday_type','=','employee')]}">
-		   	                    	<field name="category_id" select="1" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
-		   	                    </group>
-		   	                <group colspan="4" attrs="{'invisible':[('holiday_type','=','category')]}">
-		                    	<field name="employee_id" select="1" attrs="{'required':[('holiday_type','=','employee')]}"/>
-		                    </group>
-		                    <field name="department_id"/>
-		                    <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">
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-								<button string="Approve" name="second_validate" states="validate1" type="workflow" icon="gtk-apply"/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no"/>
-                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
-	                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
-                            </group>
-                        </page>
-                        <page string="Extra Information">
-							<field name="manager_id2"/>
-                        </page>
-                    </notebook>
-                </form>
+                <tree string="Leaves"
+                    colors="red:state == 'refuse';grey:state == 'cancel'">
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
+                    <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
+                    <field name="name"/>
+                    <field name="holiday_status_id"/>
+                    <field name="manager_id" invisible="1"/>
+                    <field name="type"/>
+                    <field name="state"/>
+                </tree>
             </field>
         </record>
 
@@ -165,14 +186,15 @@
             <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree string="Holidays Report">
-                    <field name="employee_id" invisible="1"/>
+                <tree string="Leaves Summary">
+                    <field name="employee_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from" invisible="1"/>
                     <field name="date_to" invisible="1"/>
                     <field name="name" invisible="1"/>
-                    <field name="holiday_status_id" invisible="1"/>
+                    <field name="holiday_status_id"/>
+                    <field name="manager_id" invisible="1"/>
                     <field name="type" invisible="1"/>
                     <field name="state" invisible="1"/>
                 </tree>
@@ -194,6 +216,7 @@
                     <field name="date_to"/>
                     <field name="name"/>
                     <field name="holiday_status_id"/>
+                    <field name="manager_id" invisible="1"/>
                     <field name="type"/>
                     <field name="state"/>
                 </tree>
@@ -268,7 +291,7 @@
     <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="view_id" ref="view_holiday_allocation_tree"/>
         <field name="act_window_id" ref="open_allocation_holidays"/>
     </record>
 
@@ -332,7 +355,7 @@
             </field>
         </record>
         <record id="open_view_holiday_status" model="ir.actions.act_window">
-            <field name="name">Leaves Type</field>
+            <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
@@ -340,7 +363,7 @@
         </record>
 
         <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leaves Statuses"
+        <menuitem name="Leave Status"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
             parent="hr.menu_open_view_attendance_reason_config"/>
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index e9832c7e1e4..5949e527f6a 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -31,7 +31,7 @@ class available_holidays_report(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'employee_id': fields.many2one ('hr.employee', 'Employee', readonly=True),
+        'employee_id': fields.many2one ('hr.employee', "Employee's Name", readonly=True),
         'category_id' : fields.many2one('hr.employee.category', "Category's Name", readonly=True),
         'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True),
         'max_leave': fields.float('Allocated Leaves', readonly=True),
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index ef40b42331c..34f14271758 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -10,9 +10,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Available Holidays">
-                    <field name="employee_id" invisible="1"/>
-                    <field name="category_id" invisible="1"/>
-                    <field name="holiday_status_id" invisible="1"/>
+                    <field name="employee_id"/>
+                    <field name="category_id"/>
+                    <field name="holiday_status_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="max_leave" sum="Allocated Leaves"/>
                     <field name="taken_leaves" sum="Taken Leaves"/>
@@ -48,6 +48,13 @@
 	        <field name="arch" type="xml">
 	            <search string="Leaves">
 	            	<group>
+	                    <filter icon="terp-hr" string="Employee"
+	                            domain="[('category_id', '=', False)]"
+	                            help="Leaves by empolyee"/>
+	                    <filter icon="terp-hr" string="Category"
+	                            domain="[('employee_id', '=', False)]"
+	                            help="Leaves by category"/>
+                        <separator orientation="vertical"/>
 		            	<filter icon="terp-hr" string="This Year"
 			                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 			                    help="Leaves in this year"/>
@@ -61,13 +68,21 @@
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Leaves during last 7 days"/>
 		                <separator orientation="vertical"/>
-		                <field name="employee_id"/>
-		                <field name="user_id" widget="selection"/>
+
+						<field name="employee_id"/>
+		                <field name="user_id" widget="selection">
+		                    <filter icon="terp-hr"
+		                        string="My Leaves"
+		                        domain="[('user_id','=',uid)]"/>
+		                </field>
+		            </group>
+		            <newline/>
+	                <group expand="0" string="Extended options..." colspan="10" col="12">
+	                    <field name="holiday_status_id" widget="selection"/>
+	                	<field name="department_id" widget="selection"/>
 	                </group>
 	                <newline/>
 	                <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="Employee" icon="terp-hr" domain="[('category_id', '=', 'False')]" context="{'group_by':'employee_id'}"/>
-	                    <filter string="Category" icon="terp-hr" domain="[('employee_id', '=', 'False')]" context="{'group_by':'category_id'}"/>
 	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
@@ -88,9 +103,8 @@
             <field name="res_model">available.holidays.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[], "search_default_user_id": uid}</field>
+            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by':[], "search_default_user_id": uid}</field>
             <field name="view_id" ref="view_hr_available_holidays_report_search"/>
-
         </record>
 
         <record model="ir.actions.act_window.view" id="action_hr_available_holidays_report_tree">
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 551259fae59..b6afe32fb25 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+	<data>
+
     <record id="view_hr_holidays_report_tree" model="ir.ui.view">
         <field name="name">hr.holidays.report.tree</field>
         <field name="model">hr.holidays.report</field>
@@ -8,8 +9,8 @@
         <field name="arch" type="xml">
             <tree string="Leaves Statistics">
                 <field name="date" invisible="1"/>
-                <field name="employee_id" invisible="1"/>
-                <field name="category_id" invisible="1"/>
+                <field name="employee_id"/>
+                <field name="category_id"/>
                 <field name="user_id" invisible="1"/>
                 <field name="date_from" invisible="1"/>
                 <field name="date_to" invisible="1"/>
@@ -44,6 +45,13 @@
         <field name="arch" type="xml">
             <search string="Leaves">
             	<group>
+                    <filter icon="terp-hr" string="Employee"
+                            domain="[('category_id', '=', False)]"
+                            help="Leaves by empolyee"/>
+                    <filter icon="terp-hr" string="Category"
+                            domain="[('employee_id', '=', False)]"
+                            help="Leaves by category"/>
+	            	<separator orientation="vertical"/>
 	            	<filter icon="terp-hr" string="This Year"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Leaves in this year"/>
@@ -70,36 +78,12 @@
 	               		domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
 					<separator orientation="vertical"/>
-					<field name="employee_id"/>
+					<field name="employee_id" widget="selection"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-hr"
-	                        string="My Leaves"
-	                        domain="[('user_id','=',uid)]"/>
 	                </field>
 	            </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-hr"
-                    		string="Refused"
-                        name="done"
-                    		domain="[('state','=','refuse')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_from"/>
-                    <separator orientation="vertical"/>
-                    <field name="holiday_status_id" widget="selection"/>
-                    <newline/>
-                    <filter icon="terp-hr"
-                    		string="Cancelled"
-                    		domain="[('state','=','cancel')]"/>
-                    <separator orientation="vertical"/>
-                	<field name="date_to"/>
-                	<separator orientation="vertical"/>
-                	<field name="department_id" widget="selection"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Employee" name="Employee" domain="[('category_id', '=', 'False')]" icon="terp-hr" context="{'group_by':'employee_id'}"/>
-                    <filter string="Category" name="category" domain="[('employee_id', '=', 'False')]" icon="terp-hr" context="{'group_by':'category_id'}"/>
                     <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Type" icon="terp-hr" context="{'group_by':'holiday_status_id'}"/>
@@ -110,6 +94,25 @@
                     <filter string="Month" icon="terp-hr" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <filter icon="terp-hr"
+                            string="Refused"
+                        name="done"
+                            domain="[('state','=','refuse')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_from"/>
+                    <separator orientation="vertical"/>
+                    <field name="holiday_status_id" widget="selection"/>
+                    <newline/>
+                    <filter icon="terp-hr"
+                            string="Cancelled"
+                            domain="[('state','=','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_to"/>
+                    <separator orientation="vertical"/>
+                    <field name="department_id" widget="selection"/>
+                </group>
             </search>
         </field>
     </record>
@@ -119,7 +122,7 @@
         <field name="res_model">hr.holidays.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{"search_default_user_id": uid, 'search_default_month':1,'search_default_Employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{"search_default_user_id": uid, 'search_default_month':1,'search_default_Employee':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_holidays_report_search"/>
     </record>
 
@@ -150,5 +153,6 @@
             </graph>
         </field>
     </record>
-            </data>
+
+    </data>
 </openerp>
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
new file mode 100644
index 00000000000..960d12f23bd
--- /dev/null
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -0,0 +1,112 @@
+- |
+  In order to test the hr_holiday in OpenERP, I will  Manage leaves for employee,
+  Leave requests.
+- |
+  For that First I create new user "user1" to make leave request.
+- 
+  !record {model: res.users, id: res_users_user0}:
+    company_id: base.main_company
+    context_lang: en_US
+    groups_id:
+      - base.group_user
+      - hr.group_hr_manager
+      - hr.group_hr_user
+    login: user1
+    name: user1
+    password: user1
+- |
+  Now, I create a new employee “Mark Johnshon” as Manager to validate employee leave.
+-
+  !record {model: hr.employee, id: hr_employee_employee0}:
+    address_home_id: base.res_partner_address_1
+    company_id: base.main_company
+    gender: male
+    name: Mark Johnson
+    user_id: base.user_root
+- |
+  create another employee "Brijesh Patel" as "user1" who make leave request.
+- 
+  !record {model: hr.employee, id: hr_employee_brijeshpatel0}:
+    address_home_id: base.res_partner_address_8
+    name: Brijesh Patel
+    parent_id: 'hr_employee_employee0'
+    user_id: 'res_users_user0'
+- |
+  Given that I have  Leave type for employee.
+- 
+  !record {model: hr.holidays.status, id: hr_holidays_status_fullleave0}:
+    color_name: red
+    name: Full Leave.
+    limit: 1
+
+- |
+  After that I allocate leave request for employee "Brijesh Patel".
+- 
+  !record {model: hr.holidays, id: hr_holidays_allocateleaveforuser0}:
+    allocation_type: employee
+    employee_id: 'hr_employee_brijeshpatel0'
+    holiday_status_id: hr_holidays_status_fullleave0
+    name: Allocate leave for user1
+    number_of_days_temp: 12.0
+    date_from: '05/20/2010 13:59:00'
+    date_to: '05/22/2010 13:59:00'
+    type: add
+- | 
+  I click on "Confirm" button to confirm allocate leave for employee.
+- 
+  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_allocateleaveforuser0}
+       
+- |
+  I click on "Validate" button to validate leave for employee.
+-
+  !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_allocateleaveforuser0}  
+
+- |
+  Now employee "Brijesh Patel" want to leave. so, I connect as user1 which is username of this employee and want to make leave request.     
+- 
+  !record {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
+    allocation_type: employee
+    date_from: '2010-05-20 11:48:00'
+    date_to: '2010-05-21 11:48:00'
+    employee_id: 'hr_employee_brijeshpatel0'
+    holiday_status_id: 'hr_holidays_status_fullleave0'
+    name: I want to leave for go to hospital
+    notes: I want to leave for go to hospital. so please accept my leave.
+    number_of_days_temp: 2.0
+    type: remove
+    user_id: 'res_users_user0'
+- |
+  I check that Leave Request is on "Draft" state.
+-
+  !assert {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
+    - state == 'draft'  
+       
+- |
+  Now I confirm my leave Request by click on "Confirm" button.
+- 
+  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_iwanttoleaveforgotohospital0}
+  
+- |
+  Now I connect as Admin user and Open Leave request of "Brijesh Patel".
+  and "validate" it by click on "validate" button.
+- 
+  !workflow {model: hr.holidays, action: validate,  ref: hr_holidays_iwanttoleaveforgotohospital0}
+  
+- |
+  I check that "Leave Manager" field is automaticly filled by the user who validate the leave'.
+-
+  !python {model: hr.holidays}: |
+     ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+     obj = self.browse(cr, uid, ref('hr_holidays_iwanttoleaveforgotohospital0'))
+     assert ids2[0] == obj.manager_id.id
+  
+- | 
+  I check that Leave request state is "Validated".
+- 
+  !assert {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
+    - state == "validate" 
+  
+- |
+  I can also see Summary of Employee's holiday by using 'Print Summary of Employee's Holidays'.
+  This will allow you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. 
+               
\ No newline at end of file
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index ce87b1172b1..980ad38c855 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -18,7 +18,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 1e0af949825..0d10ba0f248 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Human Resources',
     'description': """
 Manages job positions and the recruitement process. It's integrated with the
-survey module to allows you to define interview for different jobs.
+survey module to allow you to define interview for different jobs.
 
 This module is integrated with the mail gateway to automatically tracks email
 sent to jobs@YOURCOMPANY.com. It's also integrated with the document management
@@ -49,8 +49,9 @@ system to store and search in your CV base.
         'hr_recruitment_data.xml'
     ],
     'demo_xml': [
-        'hr_recruitment_demo.xml'
+        'hr_recruitment_demo.xml',
     ],
+    'test':['test/test_hr_recruitment.yml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a3bf7a08ab9..ab383748fe0 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -79,7 +79,7 @@
                     <group colspan="3" col="6">
 	                  	<field name="partner_name"/>
 	                   	<field name="job_id" on_change="onchange_job(job_id)"/>
-	                   	<button string="Schedule a Phone Call" name="223" icon="gtk-redo" type="action"/>
+	                   	<button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
                      </group>
                     <newline/>
                     <group colspan="3" col="6">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 2315e707911..5913684eb80 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -92,8 +92,26 @@
                         domain="[('user_id','=',False)]"/>
                 </field>
                 </group>
+                 <newline/>
+                <group expand="1" string="Group By ...">
+                   <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
+                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
+                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
+                   <separator orientation="vertical"/>
+                   <filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
+                   <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
+            	   <separator orientation="vertical"/>
+            	   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
+            	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
+            	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
+            	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
+                </group>
+
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
+                <group expand="0" string="Extended options..." groups="base.group_extended">
                     <filter icon="terp-hr"
                     		string="Hired"
                         name="done"
@@ -114,25 +132,8 @@
                   	<field name="type_id" widget="selection"/>
                   	<field name="partner_id"/>
                   	<field name="partner_address_id"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Group By ..." colspan="10" col="12">
-                   <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
-                   <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
-                   <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
-            	   <separator orientation="vertical"/>
-            	   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
-            	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
-            	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
-            	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
-                </group>
-            </search>
+                </group>             
+                </search>
         </field>
     </record>
 
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
new file mode 100644
index 00000000000..bf5da78c69a
--- /dev/null
+++ b/addons/hr_recruitment/test/test_hr_recruitment.yml
@@ -0,0 +1,115 @@
+- |
+  In order to test hr_recruitment module for OpenERP object, I create applicants form and  Manages job positions and the recruitement process.
+- |
+  I create job possition for employee to manage job position.
+-
+  |
+  First I create Department  "R & D" in Department form for which I make recruitment.
+- 
+  !record {model: hr.department, id: hr_department_rd0}:
+    manager_id: base.user_root
+    name: 'R & D '
+    
+- |
+  Now I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
+- 
+  !record {model: hr.job, id: hr_job_jea0}:
+    department_id: 'hr_department_rd0'
+    description: 'Position of Junier Application Engineer '
+    expected_employees: 5
+    name: 'JEA '
+- |
+  Given that I have stage "Initial Jobs Demand".
+- 
+  !record {model: hr.recruitment.stage, id: hr_recrutiment_stage_first0}:
+    name: 'Initial Jobs Demand'
+    sequence: 1    
+- |
+  I create applicants for "Fresher" and specify  job information for that applicant.
+- 
+  !record {model: hr.applicant, id: hr_applicant_fresher0}:
+    availability: 0.0
+    department_id: hr.dep_it
+    name: Fresher
+    partner_address_id: base.res_partner_address_tang
+    partner_id: base.res_partner_asus
+    partner_name: Jose
+    partner_phone: '999666735'
+    response: 0.0
+    salary_expected: 0.0
+    salary_proposed: 0.0
+    stage_id: crm.stage_lead3
+    type_id: hr_recruitment.type_job2
+    stage_id:  hr_recrutiment_stage_first0
+    
+- |
+  I check that applicant  is on "draft" state.
+-
+  !assert {model: hr.applicant, id:  hr_applicant_fresher0}:
+    - state == 'draft'  
+    
+- |
+  I  start progress by click on "In Progress" button.
+- 
+  !python {model: hr.applicant}: |
+    self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")],
+      }) 
+
+- |
+  Given that I have case category "Employee".
+-
+  !record {model: crm.case.categ, id: crm_case_categ_employee0}:
+    name: 'Employee'
+      
+- |
+  I make  phonecall for this applicant by click on "Schedule a Phone Call" button.
+-
+  !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}: 
+    user_id: base.user_root
+    deadline: '05/28/2010 11:51:00'
+    note: 'For interview.'
+    category_id: 'crm_case_categ_employee0'
+      
+- |
+  I click on "Schedule phonecall" button of this wizard.
+-
+  !python {model: hr.recruitment.job2phonecall}: |
+     self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})  
+  
+- |
+  I schedule meeting for interview of this applicant by click on "Schdule Meeting" button.
+- 
+  !python {model: hr.applicant}: |
+     self.action_makeMeeting(cr, uid, [ref('hr_recruitment_forinterview0')])
+-  |
+   I can see that Meeting's calendar view is shown.
+   then I click on the date on which I want schedule meeting.
+   I fill proper data for that meeting and save it.
+- 
+  !record {model: crm.meeting, id: crm_meeting_fresher0}:
+    alarm_id: base_calendar.alarm1
+    count: 0.0
+    date: '2010-05-27 00:00:00'
+    date_deadline: '2010-05-27 08:00:00'
+    day: 0.0
+    duration: 8.0
+    name: Fresher
+    opportunity_id: crm.crm_case_construstazunits0
+    partner_address_id: base.res_partner_address_tang
+    partner_id: base.res_partner_asus
+    recurrent_uid: 0.0
+    rrule_type: none
+    state: open
+    user_id: base.user_root
+    
+- |
+  After Meeting of this applicant , I hired employee by click on "Hired" button of this form.
+- 
+  !python {model: hr.applicant}: |
+     self.case_close(cr, uid, [ref('hr_applicant_fresher0')])
+- |
+  I check that applicant state is "done".
+-
+  !assert {model: hr.applicant, id: hr_applicant_fresher0}:
+    - state == 'done'
+  
\ No newline at end of file
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 4bd6d3525fc..312f17b44b3 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -25,9 +25,9 @@
     'version': '1.0',
     'category': 'Generic Modules/Human Resources',
     'description': """
-This module implement a timesheet system. Each employee can encode and
+This module implements a timesheet system. Each employee can encode and
 track their time spent on the different projects. A project is an
-analytic account and the time spent on a project generate costs on
+analytic account and the time spent on a project generates costs on
 the analytic account.
 
 Lots of reporting on time and employee tracking are provided.
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 75c54357a0a..cfe61e91dc5 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -69,6 +69,17 @@
 	                    <field name="account_id"/>
                         <field name="product_id"/>
                     </group>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
+                        <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+                        <filter string="Invoice" icon="terp-hr" context="{'group_by':'invoice_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-hr" context="{'group_by':'name'}"/>
+                    </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
                         <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
@@ -450,7 +461,7 @@
                     	<field name="product_id" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
+                   <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/>
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 44058d048cb..997b9f74898 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -25,21 +25,21 @@
     'version': '1.0',
     'category': 'Generic Modules/Human Resources',
     'description': """
-This module help you easily encode and validate timesheet and attendances
+This module helps you to easily encode and validate timesheet and attendances
 within the same view. The upper part of the view is for attendances and
 track (sign in/sign out) events. The lower part is for timesheet.
 
-Others tabs contains statistics views to help you analyse your
+Other tabs contains statistics views to help you analyse your
 time or the time of your team:
 * Time spent by day (with attendances)
 * Time spent by project
 
-This module also implement a complete timesheet validation process:
+This module also implements a complete timesheet validation process:
 * Draft sheet
 * Confirmation at the end of the period by the employee
 * Validation by the project manager
 
-The validation can be configured in te company:
+The validation can be configured in the company:
 * Period size (day, week, month, year)
 * Maximal difference between timesheet and attendances
     """,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f4bd524f150..61eaf4cc843 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -205,7 +205,7 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By...">
                         <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 517937848ff..c7cf7b0495e 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -74,9 +74,26 @@
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
 	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>      
+                    <newline/>                        
+                    <group expand="1" string="Group By...">
+	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
+	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
+	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
+	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+	                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
+	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
+                    <group expand="0" string="Extended options..." groups="base.group_extended">
 	                	<filter icon="terp-hr"
 	                    		string="New"
 	                    		domain="[('state','=','new')]"/>
@@ -94,24 +111,7 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="general_account_id"/>
 	                    <field name="to_invoice" widget="selection"/>
-	                </group>
-                    <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
-	                    <filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
-	                    <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
-	                    <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
-	                    <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-	                    <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
-	                    <filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
-	                    <separator orientation="vertical"/>
-	                    <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
-	                    <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
-	                    <filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
-                    </group>
+	                </group>                    
                 </search>
             </field>
         </record>
diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index 0cd3b1c090c..4c285a7a0a7 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -21,6 +21,5 @@
 
 import idea
 import wizard
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 0db86965870..f10a00c75e2 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -27,8 +27,8 @@
     'description': """
     This module allows your user to easily and efficiently participate in the innovation of the enterprise.
     It allows everybody to express ideas about different subjects.
-    Then, others users can comment these ideas and vote for particular ideas.
-    Each idea as a score based on the different votes.
+    Then, other users can comment on these ideas and vote for particular ideas.
+    Each idea has a score based on the different votes.
     The managers can obtain an easy view on best ideas from all the users.
     Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
     'author': 'Tiny',
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index c8fdb530a45..e5d8e1255a6 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -26,7 +26,7 @@
 
     After Installing this module,The Configuration wizard for accounting is launched.
     * We have the account templates which can be helpful to generate Charts of Accounts.
-    * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency  to create Journals.
+    * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency to create Journals.
         Thus,the pure copy of Chart Template is generated.
     * This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
 
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index ba10ab52212..9d0b2852abd 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -34,7 +34,7 @@
     "name" : "Switzerland localisation corrected by Camptocamp",
     "description" : """
 Swiss localisation :
- - DTA generation for a lot of paiment types
+ - DTA generation for a lot of payment types
  - BVR management (number generation, report, etc..)
  - Import account move from the bank file (like v11 etc..)
  - Simplify the way you handle the bank statement for reconciliation
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index efde2f16e61..831bc45d122 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Lunch Module",
     "author": "Tiny",
     "Description": """
-    The lunch module is for keeping record of the order placing and payment of the orders.
+    The lunch module is for keeping record of the order placed and payment of the orders.
     The products are defined under categories and the payment records are maintained user wise
     Every user has a cashbox which keeps track of the amount paid for a particular order.
 
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 3363dd87144..9a10fdbaa3d 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -37,10 +37,12 @@
     'update_xml': [
         'marketing_campaign_view.xml',
         'marketing_campaign_data.xml',    
-         'marketing_campaign_workflow.xml',    
+        'marketing_campaign_workflow.xml',    
         'report/campaign_analysis_view.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': [
+        'marketing_campaign_demo.xml',
+            ],
     'installable': True,
     'active': False,
 }
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 52733fad159..398e0e805be 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -25,6 +25,7 @@ from dateutil.relativedelta import relativedelta
 
 from osv import fields, osv
 import netsvc
+import tools 
 
 _intervalTypes = {
     'hours': lambda interval: relativedelta(hours=interval),
@@ -39,12 +40,14 @@ class marketing_campaign(osv.osv): #{{{
     
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'object_id': fields.many2one('ir.model', 'Objects', required=True),
+        'object_id': fields.many2one('ir.model', 'Objects', required=True,
+                                      help="Choose the Object on which you want \
+                                                      this campaign to be run"),
         'mode':fields.selection([('test', 'Test'),
-                                ('test_realtime', 'Realtime Time'),
+                                ('test_realtime', 'Realtime'),
                                 ('manual', 'Manual'),
                                 ('active', 'Active')],
-                                 'Mode'),
+                                 'Mode', required=True),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -52,14 +55,16 @@ class marketing_campaign(osv.osv): #{{{
                                    'State',), 
         'activity_ids': fields.one2many('marketing.campaign.activity', 
                                        'campaign_id', 'Activities'),
-        'fixed_cost': fields.float('Fixed Cost'),                                       
+        'fixed_cost': fields.float('Fixed Cost', help="The fixed cost is cost\
+                                                you required for the campaign"),                                       
         
     }
     
     _defaults = {
         'state': lambda *a: 'draft',
+        'mode': lambda *a: 'test',        
     }
-    
+
     def state_running_set(self, cr, uid, ids, *args):
         campaign = self.browse(cr, uid, ids[0])
         if not campaign.activity_ids :
@@ -72,8 +77,6 @@ class marketing_campaign(osv.osv): #{{{
         segment_ids = self.pool.get('marketing.campaign.segment').search(cr, uid,
                                             [('campaign_id', '=', campaign.id),
                                             ('state', '=', 'draft')])
-        if not segment_ids :
-            raise osv.except_osv("Error", "There is no associate semgnet for the campaign")
         self.write(cr, uid, ids, {'state': 'running'})
         return True
         
@@ -102,7 +105,7 @@ class marketing_campaign_segment(osv.osv): #{{{
         'object_id': fields.related('campaign_id','object_id',
                                       type='many2one', relation='ir.model',
                                       string='Object'),
-        'ir_filter_id': fields.many2one('ir.filters', 'Filter'),
+        'ir_filter_id': fields.many2one('ir.filters', 'Filter', help=""),
         'sync_last_date': fields.datetime('Date'),
         'sync_mode': fields.selection([('create_date', 'Create'),
                                       ('write_date', 'Write')],
@@ -124,15 +127,17 @@ class marketing_campaign_segment(osv.osv): #{{{
     def state_running_set(self, cr, uid, ids, *args):
         segment = self.browse(cr, uid, ids[0])
         curr_date = time.strftime('%Y-%m-%d %H:%M:%S')
+        vals = {'state': 'running'}
         if not segment.date_run:
-            raise osv.except_osv("Error", "Segment can't be start before giving running date")
-        if segment.campaign_id.state != 'running' :
-            raise osv.except_osv("Error", "You have to start campaign first")
-        if (segment.date_run >= curr_date):
-                raise osv.except_osv("Error", "Segment cannot start before run date")
+            vals['date_run'] = segment.campaign_id.date_run and \
+                                segment.campaign_id.date_run or \
+                                time.strftime('%Y-%m-%d %H:%M:%S')                
         if not segment.sync_last_date:
-            self.write(cr, uid, ids, {'sync_last_date':curr_date})
-        self.write(cr, uid, ids, {'state': 'running','date_done': curr_date})
+            vals['sync_last_date']=curr_date
+        if not segment.date_done:
+            vals['date_done']= (datetime.now() + _intervalTypes['years'](1) \
+                                            ).strftime('%Y-%m-%d %H:%M:%S')
+        self.write(cr, uid, ids, vals)
         return True
         
     def state_done_set(self, cr, uid, ids, *args):
@@ -191,27 +196,34 @@ class marketing_campaign_activity(osv.osv): #{{{
     _description = "Campaign Activity"
 
     _columns = {
-        'name': fields.char('Name', size=64),
-        'campaign_id': fields.many2one('marketing.campaign', 'Campaign'),
+        'name': fields.char('Name', size=64, required=True),
+        'campaign_id': fields.many2one('marketing.campaign', 'Campaign', 
+                                            required = True, ondelete='cascade'),
         'object_id': fields.related('campaign_id','object_id',
                                       type='many2one', relation='ir.model',
                                       string='Object'),
-        'start': fields.boolean('Start'),
-        'condition': fields.text('Condition'),
+        'start': fields.boolean('Start',help= "Its necessary to start activity \
+                                                        before running campaign"),
+        'condition': fields.char('Condition', size=256, required=True, 
+                                 help="Condition that is to be tested before \
+                                                           action is executed"), 
         'type': fields.selection([('email', 'E-mail'),
                                   ('paper', 'Paper'),
                                   ('action', 'Action'),
                                   ('subcampaign', 'Sub-Campaign')],
                                   'Type', required=True),
         'email_template_id': fields.many2one('poweremail.templates','Email Template'),
-        'report_id': fields.many2one('ir.actions.report.xml', 'Reports'),         
-        'report_directory_id': fields.many2one('document.directory', 'Directory'),
-        'server_action_id': fields.many2one('ir.actions.server', string='Action'),
+        'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),         
+        'report_directory_id': fields.many2one('document.directory','Directory',
+                                help="Folder is used to store the generated reports"),
+        'server_action_id': fields.many2one('ir.actions.server', string='Action',
+                                help= "Describes the action name.\n"
+                                "eg:On which object which action to be taken on basis of which condition"),
         'to_ids': fields.one2many('marketing.campaign.transition',
-                                            'activity_to_id',
+                                            'activity_from_id',
                                             'Next Activities'),
         'from_ids': fields.one2many('marketing.campaign.transition',
-                                            'activity_from_id',
+                                            'activity_to_id',
                                             'Previous Activities'), 
         'subcampaign_id': fields.many2one('marketing.campaign', 'Sub-Campaign'),
         'subcampaign_segment_id': fields.many2one('marketing.campaign.segment',
@@ -220,7 +232,12 @@ class marketing_campaign_activity(osv.osv): #{{{
         'revenue': fields.float('Revenue')
         }
 
-   
+    _defaults = {
+        'type': lambda *a: 'email',
+        'condition': lambda *a: 'True',
+        'object_id' : lambda obj, cr, uid, context  : context.get('object_id',False),
+    }
+
     def search(self, cr, uid, args, offset=0, limit=None, order=None, 
                                         context=None, count=False):
         if context == None:
@@ -237,10 +254,11 @@ class marketing_campaign_activity(osv.osv): #{{{
 
     def process(self, cr, uid, act_id, wi_id, context={}):
         activity = self.browse(cr, uid, act_id)
-        workitem = self.pool.get('marketing.campaign.workitem').browse(cr, uid, wi_id)
+        workitem_obj = self.pool.get('marketing.campaign.workitem')        
+        workitem = workitem_obj.browse(cr, uid, wi_id)
         if activity.type == 'paper' :
             service = netsvc.LocalService('report.%s'%activity.report_id.report_name)
-            (report_data, format) = service.create(cr, uid, [activity.report_id.id], {}, {})
+            (report_data, format) = service.create(cr, uid, [], {}, {})
             attach_vals = {
                     'name': '%s_%s_%s'%(activity.report_id.report_name,
                                         activity.name,workitem.partner_id.name),
@@ -251,7 +269,36 @@ class marketing_campaign_activity(osv.osv): #{{{
                     'file_type': format
                     }
             self.pool.get('ir.attachment').create(cr, uid, attach_vals)
-#        elif activity.type == 'email' :
+        elif activity.type == 'email' :
+            context = {}
+            template = activity.email_template_id
+            accounts = template.enforce_from_account
+            if not template.enforce_from_account:
+                return {'error_msg'  : "There is no account defined for the email"}
+            if not workitem.partner_id.email:
+                return {'error_msg'  : "There is no email defined for the partner"}
+            vals = {
+                'pem_from': tools.ustr(accounts.name) + "<" + tools.ustr(accounts.email_id) + ">",
+                'pem_to': workitem.partner_id.email,
+                'pem_subject': template.def_subject,
+                'pem_body_text': template.def_body_text,
+                'pem_body_html': template.def_body_html,
+                'pem_account_id':accounts.id,
+                'state':'na',
+                'mail_type':'multipart/alternative' #Options:'multipart/mixed','multipart/alternative','text/plain','text/html'
+            }
+#            if accounts.use_sign:
+#                signature = self.pool.get('res.users').read(cr, uid, uid, ['signature'], context)['signature']
+#                if signature:
+#                    vals['pem_body_text'] = tools.ustr(vals['pem_body_text'] or '') + signature
+#                    vals['pem_body_html'] = tools.ustr(vals['pem_body_html'] or '') + signature
+
+            #Create partly the mail and later update attachments
+            mail_id = self.pool.get('poweremail.mailbox').create(cr, uid, vals, context)
+        elif activity.type == 'action' :
+            server_obj = self.pool.get('ir.actions.server')
+            server_obj.run(cr, uid, [activity.server_action_id.id], context)
+            #???
 
         return True    
 marketing_campaign_activity()#}}}
@@ -259,6 +306,7 @@ marketing_campaign_activity()#}}}
 class marketing_campaign_transition(osv.osv): #{{{
     _name = "marketing.campaign.transition"
     _description = "Campaign Transition"
+    _rec_name = "interval_type"
 
     _columns = {
         'activity_from_id': fields.many2one('marketing.campaign.activity',
@@ -297,7 +345,9 @@ class marketing_campaign_workitem(osv.osv): #{{{
         'partner_id': fields.many2one('res.partner', 'Partner',required=True),
         'state': fields.selection([('todo', 'ToDo'), ('inprogress', 'In Progress'), 
                                    ('exception', 'Exception'), ('done', 'Done'),
-                                   ('cancelled', 'Cancelled')], 'State')
+                                   ('cancelled', 'Cancelled')], 'State'),
+
+        'error_msg' : fields.text('Error Message')
         }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -324,7 +374,7 @@ class marketing_campaign_workitem(osv.osv): #{{{
             
     def process(self, cr, uid, workitem_ids, context={}):
         for wi in self.browse(cr, uid, workitem_ids):
-            if wi.state == 'todo' :# we searched the wi which are in todo state 
+            if wi.state == 'todo':# we searched the wi which are in todo state 
                     #then y v keep this filter again 
                 eval_context = {
                     'pool': self.pool,
@@ -332,21 +382,23 @@ class marketing_campaign_workitem(osv.osv): #{{{
                     'uid': uid,
                     'wi': wi,
                     'object': wi.activity_id,
-                    'transition' : wi.activity_id.to_ids
+                    'transition': wi.activity_id.to_ids
                 }
-                val = {}                    
-                exec wi.activity_id.condition.replace('\r','') in \
-                                                 eval_context, val
-                if 'action' in val and val['action']:
+                expr = eval(str(wi.activity_id.condition), eval_context)
+                if expr:
                     try :
-                        self.pool.get('marketing.campaign.activity').process(cr, 
-                                        uid, wi.activity_id.id, wi.id, context)
-                        self.write(cr, uid, wi.id, {'state':'done'})
-                        self.process_chain(cr, uid, wi.id, context)
+                        res = self.pool.get('marketing.campaign.activity').process(
+                                      cr, uid, wi.activity_id.id, wi.id, context)
+                        if res :
+                            self.write(cr, uid, wi.id, {'state': 'done'})
+                            self.process_chain(cr, uid, wi.id, context)
+                        else : 
+                            self.write(cr, uid, wi.id, {'state': 'exception',
+                                                'error_msg': res['error_msg']})
                     except Exception,e:
-                        self.write(cr, uid, wi.id, {'state':'exception'})
+                        self.write(cr, uid, wi.id, {'state': 'exception'})
                 else :
-                    self.write(cr, uid, wi.id, {'state':'cancelled'})
+                    self.write(cr, uid, wi.id, {'state': 'cancelled'})
                     
         return True
         
@@ -357,5 +409,28 @@ class marketing_campaign_workitem(osv.osv): #{{{
             self.process(cr, uid, workitem_ids, context)
     
 marketing_campaign_workitem() #}}}  
+
+class poweremail_templates(osv.osv):
+    _inherit = "poweremail.templates"
+    
+    _defaults = {
+        'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
+    }
+poweremail_templates() 
+
+class report_xml(osv.osv):
+
+    _inherit = 'ir.actions.report.xml'
+    
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if not context:
+            context = {}
+        if context and 'object_id' in context and context['object_id']:
+            model = self.pool.get('ir.model').browse(cr, uid, 
+                                                    context['object_id']).model
+            args.append(('model', '=', model))
+        return super(report_xml, self).search(cr, uid, args, offset, limit, order, context, count)
+    
+report_xml()    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
new file mode 100644
index 00000000000..9c2211903c5
--- /dev/null
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+<!-- Document directory -->
+        <record id="document_directory_marketingcampaign" model="document.directory">
+            <field eval="0" name="ressource_tree"/>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;&quot;&quot;Marketing Campaign&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;[]&quot;&quot;&quot;" name="domain"/>
+            <field eval="&quot;&quot;&quot;directory&quot;&quot;&quot;" name="type"/>
+        </record>
+        <record id="document_directory_campaign1" model="document.directory">
+            <field eval="0" name="ressource_tree"/>
+            <field eval="[(6,0,[])]" name="group_ids"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="&quot;&quot;&quot;OpenERP OnDemand Free Trial 2010&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;[]&quot;&quot;&quot;" name="domain"/>
+            <field name="parent_id" ref="document_directory_marketingcampaign"/>
+            <field eval="&quot;&quot;&quot;ressource&quot;&quot;&quot;" name="type"/>
+            <field name="ressource_type_id" ref="model_marketing_campaign"/>
+        </record>	
+<!-- Power email tempalte -->	
+		<record id="poweremail_templates_foropenerpondemandfreetrial0" model="poweremail.templates">
+			<field name="def_subject">Thanks for showing interest in OpenERP</field>
+			<field name="def_to">info@tinyerp.com</field>
+			<field eval="[(6,0,[])]" name="allowed_groups"/>
+			<field eval="0" name="auto_email"/>
+			<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+			<field eval="[(6,0,[])]" name="table_required_fields"/>
+			<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+			<field name="object_name" ref="crm.model_crm_lead"/>
+			<field eval="0" name="use_sign"/>
+			<field name="def_body_text">Hello, 
+Thanks for generous interest you have shown in the open ERP.
+Regards,
+OpenERP Team,</field>
+			<field name="template_language">mako</field>
+			<field eval="0" name="send_on_create"/>
+			<field name="name">For OpenERP OnDemand Free Trial 2010</field>
+			<field name="model_int_name">crm.lead</field>
+			<field eval="0" name="send_on_write"/>
+		</record>	
+<!-- Report -->	
+		<record id="mc_crm_lead_demo_report" model="ir.actions.report.xml">
+			<field name="name">Marketing campaign demo report</field>
+			<field name="type">ir.actions.report.xml</field>
+			<field name="model">crm.lead</field>
+			<field name="report_name">crm.lead.demo</field>
+			<field name="report_rml">marketing_campaign/report/crm_lead_mc_demo_report.rml</field>
+			<field name="report_type">pdf</field>
+		</record>
+<!-- Campaign -->			
+		<record id="marketing_campaign_openerpondemandfreetrial0" model="marketing.campaign">
+			<field name="name">OpenERP OnDemand Free Trial 2010</field>
+			<field name="object_id" ref="crm.model_crm_lead"/>
+		</record>
+<!-- Activity -->			
+		<record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
+			<field name="name">Propose a 1 month free trial for an OnDemand offer</field>
+			<field name="server_action_id" ref="base.action_start_configurator"/>
+			<field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+			<field name="report_directory_id" ref="document_directory_campaign1"/>
+			<field name="type">paper</field>
+			<field eval="1" name="start"/>
+			<field name="report_id" ref="mc_crm_lead_demo_report"/>
+		</record>
+		<record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
+			<field name="name">Thanks for showing interest</field>
+			<field name="server_action_id" ref="base.action_start_configurator"/>
+			<field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+		</record>
+<!-- Tranisition -->							
+		<record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
+			<field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
+			<field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+		</record>
+<!-- Segment -->					
+		<record id="marketing_campaign_segment_bosslistusassociationslist0" model="marketing.campaign.segment">
+			<field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
+			<field name="name">BossList US Associations List-0/90</field>
+			<field name="sync_mode">create_date</field>
+			<field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+			<field name="state">draft</field>
+		</record>
+		
+	</data>
+</openerp>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index f013f37e853..9c9d4e96c14 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -20,19 +20,20 @@
 		            <field name="mode"/>
 		            <field name="fixed_cost"/>
                 </group>
-                <field name="activity_ids" nolabel = "1" colspan="4">
+                <field name="activity_ids" nolabel = "1" colspan="4" default_get="{'object_id':object_id}">
                		<form string="Activities">
 			            <field name="name" select="1" />
-			            <field name="object_id" readonly="True"/>  
-			            <field name="start"/>              
+			            <field name="object_id" readonly="True"/>
+		                <field name="variable_cost" select="1"/>
+			            <field name="start"/>
 			            <field name="condition" colspan="4"/>
-		                <field name="variable_cost" select="1"/>	                
-			            <field name="type"/>
+			            <newline/>
+			            <field name="type" colspan="4"/>
 	                	<group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
 	                    	<field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
 	                	</group>
 	                	<group colspan="4" attrs="{'invisible':[('type','!=','paper')]}" >
-	                    	<field name="report_id" attrs="{'required':[('type','=','paper')]}" />
+	                    	<field name="report_id" attrs="{'required':[('type','=','paper')]}"/>
 	                    	<field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
 	                	</group>
 	                	<group colspan="4" attrs="{'invisible':[('type','!=','action')]}" >                
@@ -42,14 +43,34 @@
 	                        <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
 	                    	<field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
 	                	</group>                
-	                	<field name="to_ids" nolabel="1" colspan="4" mode="tree"  		default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
-	                    	<tree string="All Transitions" editable="bottom">
-	                        	<field name="activity_from_id"/>
-	                        	<field name="activity_to_id"/>
-	                        	<field name="interval_nbr"/>
-	                        	<field name="interval_type"/>
-	                    	</tree>
-                		</field>
+                        <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
+                             <form string="Out Transitions" >
+                                 <field name="activity_from_id" readonly="True"/>
+                                 <field name="activity_to_id"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </form>
+                             <tree string="Out Transitions" editable="bottom">
+                                 <field name="activity_from_id"/>
+                                 <field name="activity_to_id"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </tree>
+                         </field> 
+                         <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
+                             <form string="In Transitions" >
+                                 <field name="activity_from_id"/>
+                                 <field name="activity_to_id" readonly="True"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </form>
+                             <tree string="In Transitions" editable="bottom">
+                                 <field name="activity_from_id"/>
+                                 <field name="activity_to_id"/>
+                                 <field name="interval_nbr"/>
+                                 <field name="interval_type"/>
+                             </tree>
+                         </field>
             		</form>
 		    		<tree string="All Activities">
                 		<field name="name" select="1"/>
@@ -67,9 +88,9 @@
             	<separator string="Status" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
-                    <button name="state_running_set" string="Run" states="draft" />
-                    <button name="state_done_set" string="Done" states="running" />
-                    <button name="state_cancel_set" string="Cancelled" states="running"/>
+                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
+                    <button name="state_done_set" string="Done" states="running" icon="gtk-ok"/>
+                    <button name="state_cancel_set" string="Cancelled" states="running" icon="gtk-cancel"/>
                 </group>
           	</form>
         </field>
@@ -96,13 +117,13 @@
         <field name="type">diagram</field>
         <field name="arch" type="xml">
         	<diagram string="Campaign Editor">
-				<node object="marketing.campaign.activity" shape="rectangle:type!='subcampaign'" bgcolor="gray:start==True">
+				<node object="marketing.campaign.activity" shape="rectangle:type=='subcampaign'" bgcolor="gray:start==True">
 			    	<field name="name"/>
 			    	<field name="type"/>
                 	<field name="start" invisible="1"/>
                 	<field name="condition"/> 
 			  	</node>
-			  	<arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id">
+			  	<arrow object="marketing.campaign.transition" source="activity_from_id" destination="activity_to_id" label="['interval_type']">
 			    	<field name="activity_from_id"/>
 			    	<field name="activity_to_id"/>
 			    	<field name="interval_nbr"/>
@@ -112,6 +133,29 @@
         </field>
     </record>
 
+   <record id="view_marketing_campaign_search" model="ir.ui.view">
+       <field name="name">marketing.campaign.search</field>
+       <field name="model">marketing.campaign</field>
+       <field name="type">search</field>
+       <field name="arch" type="xml">
+           <search string="Campaigns">
+               <filter icon="terp-marketing" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
+               <filter icon="terp-marketing" string="Running" domain="[('state','=','running')]"/>
+               <separator orientation="vertical"/>
+               <filter icon="terp-marketing" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
+               <filter icon="terp-marketing" string="Manual Mode" domain="[('mode','=','manual')]"/>
+               <separator orientation="vertical"/>
+               <field name="name" select="1"/>
+               <field name="object_id" select="1"/>
+               <newline/>
+               <group expand="1" string="Group By..." colspan="10" col="12">
+                   <filter string="Object" name="Object" icon="terp-marketing" context="{'group_by':'object_id'}" />
+                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
+               </group>   
+           </search>
+       </field>
+   </record>
+
     <record model="ir.actions.act_window" id="action_marketing_campaign_form">
         <field name="name">All Campaigns</field>
         <field name="type">ir.actions.act_window</field>
@@ -119,9 +163,12 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,diagram</field>
         <field name="view_id" ref="view_marketing_campaign_tree"/>
+       <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_test': 1}</field>
+       <field name="search_view_id" ref="view_marketing_campaign_search"/>
+        
     </record>
 
-    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing" action="action_marketing_campaign_form" sequence="20" />
+    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing" action="action_marketing_campaign_form" sequence="10" />
 		
 	<!--
     ======================
@@ -143,7 +190,7 @@
                 	<newline/>
                 	<field name="ir_filter_id" select="1"/>
                 	<newline/>
-                	<field name="date_run" attrs="{'readonly':[('date_run','!=',False)]}"/>
+                	<field name="date_run" attrs="{'readonly':[('date_run','!=',False),('state','=','running')]}"/>
                 	<field name="date_done"/>
                 	<separator string="Synchronization" colspan="4" />
                		<field name="sync_last_date"/>
@@ -152,9 +199,9 @@
                 <separator string="Status" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
-                    <button name="state_running_set" string="Run" states="draft" />
-                    <button name="state_done_set" string="Done" states="running" />
-                    <button name="state_cancel_set" string="Cancelled" states="running" />
+                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
+                    <button name="state_done_set" string="Done" states="running" icon="gtk-ok"/>
+                    <button name="state_cancel_set" string="Cancelled" states="running" icon="gtk-cancel"/>
                 </group>
             </form>
         </field>
@@ -178,6 +225,32 @@
         </field>
     </record>
 
+   <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
+       <field name="name">marketing.campaign.segment.search</field>
+       <field name="model">marketing.campaign.segment</field>
+       <field name="type">search</field>
+       <field name="arch" type="xml">
+           <search string="Segments">
+               <filter icon="terp-marketing" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+               <filter icon="terp-marketing" string="Running" domain="[('state','=','running')]"/>
+               <separator orientation="vertical"/>
+               <filter icon="terp-marketing" string="Create Date" name="create_date" domain="[('sync_mode','=','create_date')]"/>
+               <filter icon="terp-marketing" string="Write Date" domain="[('sync_mode','=','write_date')]"/>
+               <separator orientation="vertical"/>
+               <field name="name" select="1"/>
+               <field name="object_id" select="1"/>
+               <field name="campaign_id" select="1"/>
+               <field name="date_run" select="1"/>
+               <newline/>
+               <group expand="1" string="Group By..." colspan="10" col="12">
+                   <filter string="Campaign" name="Campaign" icon="terp-marketing" context="{'group_by':'campaign_id'}" />
+                   <filter string="Date Run" name="Date Run" icon="terp-marketing" context="{'group_by':'date_run'}" />
+                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
+               </group> 
+           </search>
+       </field>
+   </record>
++
     <record model="ir.actions.act_window" id="action_marketing_campaign_segment_form">
         <field name="name">All Segments</field>
         <field name="type">ir.actions.act_window</field>
@@ -185,9 +258,11 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_segment_tree"/>
+       <field name="search_view_id" ref="view_marketing_campaign_segment_search"/>
+       <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_create_date': 1}</field>
     </record>
 
-    <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing" action="action_marketing_campaign_segment_form" sequence="10" />
+    <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing" action="action_marketing_campaign_segment_form" sequence="20" />
 		
 	<!--
     ======================
@@ -204,8 +279,7 @@
                 <field name="name" select="1" />
                 <field name="start"/>
                 <field name="campaign_id" select="1"/>
-                <field name="object_id" readonly="True"/>                
-                <field name="condition" colspan="4"/>
+                <field name="object_id" readonly="True"/>
                 <newline/>
                 <field name="type"/>
                 <group colspan="4" attrs="{'invisible':[('type','!=','email')]}" >                
@@ -222,14 +296,34 @@
                     <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
                     <field name="subcampaign_segment_id" attrs="{'required':[('type','=','subcampaign')]}" />
                 </group>                
-                <field name="to_ids" nolabel="1" colspan="4" mode="tree,form">
-                    <tree string="All Transitions" editable="bottom">
-                        <field name="activity_from_id" />
-                        <field name="activity_to_id" />
-                        <field name="interval_nbr" />
-                        <field name="interval_type"/>
-                    </tree>
-                </field>
+                <field name="to_ids" nolabel="1" colspan="4" mode="tree"                  default_get="{'type_id':'activity_from_id','activity_id':active_id or False}">
+                     <form string="Out Transitions" >
+                         <field name="activity_from_id" readonly="True"/>
+                         <field name="activity_to_id"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </form>
+                     <tree string="Out Transitions" editable="bottom">
+                         <field name="activity_from_id"/>
+                         <field name="activity_to_id"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </tree>
+                 </field> 
+                 <field name="from_ids" nolabel="1" colspan="4" mode="tree" default_get="{'type_id':'activity_to_id','activity_id':active_id or False}">
+                     <form string="In Transitions" >
+                         <field name="activity_from_id"/>
+                         <field name="activity_to_id" readonly="True"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </form>
+                     <tree string="In Transitions" editable="bottom">
+                         <field name="activity_from_id"/>
+                         <field name="activity_to_id"/>
+                         <field name="interval_nbr"/>
+                         <field name="interval_type"/>
+                     </tree>
+                 </field>
             </form>
         </field>
     </record>
@@ -306,6 +400,32 @@
         </field>
     </record>
 
+   <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
+       <field name="name">marketing.campaign.workitem.search</field>
+       <field name="model">marketing.campaign.workitem</field>
+       <field name="type">search</field>
+       <field name="arch" type="xml">
+           <search string="Workitems">
+               <filter icon="terp-marketing" string="To Do" name = "todo" domain="[('state','=','todo')]"/>
+               <filter icon="terp-marketing" string="In Progress" domain="[('state','=','inprogress')]"/>
+               <filter icon="terp-marketing" string="Exception" domain="[('state','=','exception')]"/>
+               <separator orientation="vertical"/>
+               <field name="segment_id" select="1"/>
+               <field name="object_id" select="1"/>
+               <field name="partner_id" select="1"/>
+               <field name="date" select="1"/>
+               <newline/>
+               <group expand="1" string="Group By..." colspan="10" col="12">
+                   <filter string="Segment" name="Segment" icon="terp-marketing" context="{'group_by':'segment_id'}" />
+                   <filter string="Activity" name="Activity" icon="terp-marketing" context="{'group_by':'activity_id'}" />
+                   <separator orientation="vertical"/>
+                   <filter string="Date" name="Date" icon="terp-marketing" context="{'group_by':'date'}" />
+                   <filter string="State" name="State" icon="terp-marketing" context="{'group_by':'state'}" />
+               </group> 
+           </search>
+       </field>
+   </record>
+
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
         <field name="name">All Workitems</field>
         <field name="type">ir.actions.act_window</field>
@@ -313,6 +433,8 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_workitem_tree"/>
+        <field name="search_view_id" ref="view_marketing_campaign_workitem_search"/>
+        <field name="context">{'group_by': [], 'search_default_todo': 1}</field>        
     </record>
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index b66ec89ca6b..caedbc01cd9 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -30,14 +30,14 @@
         <field name="arch" type="xml">
             <search string="Marketing Reports">
            		<group>
-	            	<filter icon="terp-account"
+	            	<filter icon="terp-marketing"
 	                    	string="This Year"
 	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
-	                <filter icon="terp-account"
+	                <filter icon="terp-marketing"
 	                    	string="This Month"
 	                    	domain="[('month','=',time.strftime('%%m'))]"/>
 	                <separator orientation="vertical"/>
-		            <filter icon="terp-account" 
+		            <filter icon="terp-marketing" 
 		            		string="Date" 
 		            		domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
 	                <separator orientation="vertical"/>
@@ -49,12 +49,12 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Campaign" name="Campaign" icon="terp-sale" context="{'group_by':'campaign_id'}" />
-                    <filter string="Segment" name ="Segment" icon="terp-sale" context="{'group_by':'segment_id'}" />
-                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
+                    <filter string="Campaign" name="Campaign" icon="terp-marketing" context="{'group_by':'campaign_id'}" />
+                    <filter string="Segment" name ="Segment" icon="terp-marketing" context="{'group_by':'segment_id'}" />
+                    <filter string="Partner" icon="terp-marketing" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                    <filter string="Month" icon="terp-marketing" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-marketing" context="{'group_by':'year'}"/>
                 </group>                
             </search>
         </field>
diff --git a/addons/marketing_campaign/report/crm_lead_mc_demo_report.rml b/addons/marketing_campaign/report/crm_lead_mc_demo_report.rml
new file mode 100644
index 00000000000..34bc00da438
--- /dev/null
+++ b/addons/marketing_campaign/report/crm_lead_mc_demo_report.rml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="Standard">[[ repeatIn(objects,'lead') ]]</para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <para style="Text body">Partner : [[ lead.company_id.partner_id.name ]]</para>
+    <para style="Standard">Company : [[ lead.company_id.parent_id.name ]]</para>
+  </story>
+</document>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 966572f772c..685d289a194 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -117,7 +117,7 @@ class mrp_bom(osv.osv):
     """
     Defines bills of material for a product.
     """
-    _name = 'mrp.bom'
+    _name = 'mrp.bom'    
     _description = 'Bill of Material'
     
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
@@ -154,13 +154,13 @@ class mrp_bom(osv.osv):
                     result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
 
         return result
-    
+
     def _compute_type(self, cr, uid, ids, field_name, arg, context):
         """ Sets particular method for the selected bom type.
         @param field_name: Name of the field
         @param arg: User defined argument
         @return:  Dictionary of values
-        """  
+        """
         res = dict(map(lambda x: (x,''), ids))
         for line in self.browse(cr, uid, ids):
             if line.type == 'phantom' and not line.bom_id:
@@ -174,10 +174,10 @@ class mrp_bom(osv.osv):
                 else:
                     res[line.id] = 'order'
         return res
-    
+
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'code': fields.char('Code', size=16),
+        'code': fields.char('Reference', size=16),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the bills of material without removing it."),
         'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True,
                                  help= "If a sub-product is used in several products, it can be useful to create its own BoM."\
@@ -212,7 +212,7 @@ class mrp_bom(osv.osv):
         'product_rounding': lambda *a: 1.0,
         'type': lambda *a: 'normal',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c),
-        'multi_level_bom': lambda *a: 0, 
+        'multi_level_bom': lambda *a: 0,
     }
     _order = "sequence"
     _sql_constraints = [
@@ -247,7 +247,7 @@ class mrp_bom(osv.osv):
                 v['name'] = prod.name
             return {'value': v}
         return {}
-    
+
     def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
         """ Finds BoM for particular product and product uom.
         @param product_id: Selected product.
@@ -397,7 +397,7 @@ class one2many_domain(fields.one2many):
     def set(self, cr, obj, id, field, values, user=None, context=None):
         if not values:
             return
-        return super(one2many_domain, self).set(cr, obj, id, field, values, 
+        return super(one2many_domain, self).set(cr, obj, id, field, values,
                                             user=user, context=context)
 
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
@@ -424,7 +424,7 @@ class mrp_production(osv.osv):
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
         """ Calculates total hours and total no. of cycles for a production order.
         @param prop: Name of field.
-        @param unknow_none: 
+        @param unknow_none:
         @return: Dictionary of values.
         """
         result = {}
@@ -441,7 +441,7 @@ class mrp_production(osv.osv):
     def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
         """ Finds production end date.
         @param prop: Name of field.
-        @param unknow_none: 
+        @param unknow_none:
         @return: Dictionary of values.
         """
         result = {}
@@ -452,7 +452,7 @@ class mrp_production(osv.osv):
     def _production_date(self, cr, uid, ids, prop, unknow_none, context={}):
         """ Finds production planned date.
         @param prop: Name of field.
-        @param unknow_none:  
+        @param unknow_none:
         @return: Dictionary of values.
         """
         result = {}
@@ -525,7 +525,7 @@ class mrp_production(osv.osv):
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
     }
     _order = 'date_planned asc, priority desc';
-    
+
     def unlink(self, cr, uid, ids, context=None):
         productions = self.read(cr, uid, ids, ['state'])
         unlink_ids = []
@@ -585,7 +585,7 @@ class mrp_production(osv.osv):
 
     def action_picking_except(self, cr, uid, ids):
         """ Changes the state to Exception.
-        @return: True 
+        @return: True
         """
         self.write(cr, uid, ids, {'state': 'picking_except'})
         return True
@@ -671,12 +671,12 @@ class mrp_production(osv.osv):
         @return: True or False
         """
         res = True
-        for production in self.browse(cr, uid, ids):            
-            if production.move_lines:                
+        for production in self.browse(cr, uid, ids):
+            if production.move_lines:
                res = False
 
-            if production.move_created_ids:                
-               res = False        
+            if production.move_created_ids:
+               res = False
         return res
 
     def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
@@ -688,15 +688,15 @@ class mrp_production(osv.osv):
         @param production_qty: specify qty to produce
         @param production_mode: specify production mode (consume/consume&produce).
         @return: True
-        """              
+        """
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id)
-        
+
         raw_product_todo = []
-        final_product_todo = []        
-        
+        final_product_todo = []
+
         if production_mode in ['consume','consume_produce']:
-            # To consume remaining qty of raw materials 
+            # To consume remaining qty of raw materials
             consumed_products = {}
             produced_qty = 0
             for consumed_product in production.move_lines2:
@@ -705,18 +705,18 @@ class mrp_production(osv.osv):
                 if not consumed_products.get(consumed_product.product_id.id, False):
                     consumed_products[consumed_product.product_id.id] = 0
                 consumed_products[consumed_product.product_id.id] += consumed_product.product_qty
-            
+
             for produced_product in production.move_created_ids2:
                 if produced_product.scraped:
                     continue
                 produced_qty += produced_product.product_qty
 
-            for raw_product in production.move_lines:                
-                consumed_qty = consumed_products.get(raw_product.product_id.id, 0)                
-                consumed_qty -= produced_qty                            
-                rest_qty = production_qty - consumed_qty 
+            for raw_product in production.move_lines:
+                consumed_qty = consumed_products.get(raw_product.product_id.id, 0)
+                consumed_qty -= produced_qty
+                rest_qty = production_qty - consumed_qty
                 if rest_qty > production.product_qty:
-                   rest_qty = production.product_qty            
+                   rest_qty = production.product_qty
                 if rest_qty > 0:
                     stock_mov_obj.action_consume(cr, uid, [raw_product.id], rest_qty, production.location_src_id.id, context=context)
 
@@ -733,17 +733,17 @@ class mrp_production(osv.osv):
                     produced_products[produced_product.product_id.id] = 0
                 produced_products[produced_product.product_id.id] += produced_product.product_qty
 
-            for produce_product in production.move_created_ids:                
-                produced_qty = produced_products.get(produce_product.product_id.id, 0)                            
+            for produce_product in production.move_created_ids:
+                produced_qty = produced_products.get(produce_product.product_id.id, 0)
                 rest_qty = production.product_qty - produced_qty
                 if rest_qty <= production_qty:
-                   production_qty = rest_qty 
+                   production_qty = rest_qty
                 if rest_qty > 0 :
-                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, production.location_dest_id.id, context=context)            
-        
-        
-        for raw_product in production.move_lines2: 
-            new_parent_ids = []           
+                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, production.location_dest_id.id, context=context)
+
+
+        for raw_product in production.move_lines2:
+            new_parent_ids = []
             parent_move_ids = [x.id for x in raw_product.move_history_ids]
             for final_product in production.move_created_ids2:
                 if final_product.id not in parent_move_ids:
@@ -794,9 +794,9 @@ class mrp_production(osv.osv):
 
     def action_in_production(self, cr, uid, ids):
         """ Changes state to In Production and writes starting date.
-        @return: True 
+        @return: True
         """
-        move_ids = []        
+        move_ids = []
         self.write(cr, uid, ids, {'state': 'in_production', 'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
@@ -938,7 +938,7 @@ class mrp_production_workcenter_line(osv.osv):
     _name = 'mrp.production.workcenter.line'
     _description = 'Work Order'
     _order = 'sequence'
-    
+
     _columns = {
         'name': fields.char('Work Order', size=64, required=True),
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 02841b64b03..15ed872391f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -7,7 +7,7 @@
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
-        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />
+<!--        <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root"  sequence="3" />-->
         <menuitem name="Master Data"
                   id="menu_mrp_bom"
                   parent="base.menu_mrp_root"
@@ -23,9 +23,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties categories">
-                    <separator colspan="4" string="General Information"/>
-                    <field colspan="4" name="name" select="1"/>
-                    <field colspan="4" name="description"/>
+                    <separator colspan="4" string="Property Group"/>
+                    <field colspan="4" name="name" select="1" nolabel="1"/>
+                    <separator colspan="4" string="Description"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -122,7 +123,7 @@
                     <notebook colspan="4">
                         <page string="Work Center">
                             <field name="resource_type"/>
-                            <field name="calendar_id"/>
+                            <field name="calendar_id" widget="selection"/>
                             <separator colspan="4" string="Description"/>
                             <field colspan="4" name="note" nolabel="1"/>
                             <separator colspan="4" string="Capacity Information"/>
@@ -245,21 +246,21 @@
                     <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" groups="base.group_extended"/>
+                        <field name="code" select="1" string="Reference" groups="base.group_extended"/>
                         <newline/>
-                        <field name="product_uom"/>
+                        <field name="product_uom" widget="selection"/>
                         <field name="product_qty"/>
-                        <field name="routing_id" groups="base.group_extended" select="1"/>
+                        <field name="routing_id" widget="selection" groups="base.group_extended"/>
                         <newline/>
-                        <field name="product_uos" groups="product.group_uos"/>
-                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <field name="product_uos" groups="product.group_uos,base.group_extended" widget="selection"/>
+                        <field name="product_uos_qty" groups="product.group_uos,base.group_extended" />
                         <newline/>
                         <field name="multi_level_bom" />
                         <field name="type" groups="base.group_extended"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4" >
-                        <page string="General Information" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
+                        <page string="Components" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list" />
                         </page>
                         <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False),('multi_level_bom','=',False)]}">
@@ -274,7 +275,7 @@
                             <field name="date_start"/>
                             <field name="date_stop"/>
                             <field name="product_rounding"/>
-                            <field name="product_efficiency"/>
+                            <field name="product_efficiency" groups="base.group_extended"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
                     </notebook>
@@ -282,6 +283,27 @@
             </field>
         </record>
 
+		<record id="view_mrp_bom_filter" model="ir.ui.view">
+            <field name="name">mrp.bom.select</field>
+            <field name="model">mrp.bom</field>
+           <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Bill Of Material">
+                    <group col='4' colspan='4'>
+                      <field name="name"/>
+	                    <field name="code" string="Reference"/>
+	                    <field name="product_id"/>
+	                    <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
        <record id="mrp_bom_tree_view" model="ir.ui.view">
             <field name="name">mrp.bom.tree</field>
             <field name="model">mrp.bom</field>
@@ -308,7 +330,7 @@
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
-            <field name="view_id" ref="mrp_bom_tree_view"/>
+            <field name="search_view_id" ref="view_mrp_bom_filter"/>
         </record>
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
             <field name="name">Bill of Material Components</field>
@@ -386,8 +408,8 @@
 
 		<menuitem action="mrp_procurement.mrp_procurement_action" id="menu_mrp_procurement_action"
         		  parent="mrp.menu_mrp_manufacturing" sequence="2" />
-        <menuitem action="mrp_procurement.mrp_procurement_action5" id="menu_mrp_procurement_exception_action"
-        		  parent="mrp.menu_mrp_control" sequence="1" />
+<!--        <menuitem action="mrp_procurement.mrp_procurement_action5" id="menu_mrp_procurement_exception_action"-->
+<!--        		  parent="mrp.menu_mrp_control" sequence="1" />-->
 
      	<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
         <menuitem action="mrp_procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
@@ -406,7 +428,7 @@
             <field name="model">mrp.production</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date and state in ('done','cancel') " string="Manufacturing Orders">
+                <tree colors="blue:state in ('confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty" sum="Total Qty"/>
@@ -477,25 +499,25 @@
                         <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
                         <group colspan="2" col="3">
-                        <field name="product_uom"/>
+                        <field name="product_uom" widget="selection"/>
                         <button type="action"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
                         </group>
                         <label string="" colspan="2"/>
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <group colspan="2" col="3" groups="product.group_uos">
-                            <field name="product_uos"/>
+                        <field name="product_uos_qty" groups="product.group_uos,base.group_extended"/>
+                        <group colspan="2" col="3" groups="product.group_uos,base.group_extended">
+                            <field name="product_uos" widget="selection"/>
                             <label string=""/>
                         </group>
                     </group>
 
                     <notebook colspan="4">
                         <page string="Consumed Products">
-                            <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
-                            <field name="routing_id" groups="base.group_extended"/>
-                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                            <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" />
+                            <field name="routing_id" groups="base.group_extended" select="1" widget="selection"/>
+                            <field name="location_src_id" domain="[('usage','=','internal')]" widget="selection" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
                             <separator string="" colspan="4"/>
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
@@ -636,8 +658,9 @@
                        <filter icon="terp-mrp" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" name="current" string="Current"
-                           domain="[('state','in',('confirmed','ready'))]"
+                       <filter icon="terp-mrp" string="Current" name="Current"
+                           default="1"
+                           domain="[('state','in',('confirmed','ready','exception'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
                        <filter icon="terp-mrp" string="Ready"
                            domain="[('state','=','ready')]"
@@ -676,6 +699,7 @@
              <field name="context">{'search_default_current':1}</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
+            <field name="context">{'search_default_Current':1}</field>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
 
@@ -778,8 +802,8 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="product_uos" groups="product.group_uos"/>
+                    <field name="product_uos_qty" groups="product.group_uos,base.group_extended"/>
+                    <field name="product_uos" groups="product.group_uos,base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -823,7 +847,7 @@
             groups="base.group_extended"
             sequence="2"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
-        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
 
     </data>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index c9c7a3d4400..5663ef93210 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -57,7 +57,22 @@
 						<field name="date_planned"/>
                    </group>
                    <newline/>
-	                <group expand="1" string="Extended options..." colspan="10" col="12">
+
+                   <group expand="1" string="Group By...">
+                    	<filter string="Source Location" icon="terp-mrp" context="{'group_by':'location_src_id'}"/>
+                    	<filter string="Destination Location" icon="terp-mrp" context="{'group_by':'location_dest_id'}"/>
+                    	<filter string="Picking" icon="terp-mrp" context="{'group_by':'picking_id'}"/>
+                    	<separator orientation="vertical"/>
+                        <filter string="Routing" icon="terp-mrp" context="{'group_by':'routing_id'}"/>
+                        <filter string="Product" name="Product" icon="terp-mrp" context="{'group_by':'product_id'}" />
+                        <filter string="State" icon="terp-mrp" context="{'group_by':'state'}"/>
+                    	<separator orientation="vertical"/>
+                    	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
+                    	<filter string="Month" icon="terp-mrp" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
+                   </group>
+                    <newline/>
+	                <group expand="0" string="Extended options..." groups="base.group_extended">
 	                    <filter icon="terp-mrp" string="Draft" domain="[('state','=','draft')]"/>
 	                    <filter icon="terp-mrp" string="Picking Exception" domain="[('state','=','picking_except')]"/>
 	                    <separator orientation="vertical"/>
@@ -76,22 +91,8 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="date_start"/>
 						<field name="date_finnished"/>
-	                </group>
-                   <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="6">
-                    	<filter string="Source Location" icon="terp-mrp" context="{'group_by':'location_src_id'}"/>
-                    	<filter string="Destination Location" icon="terp-mrp" context="{'group_by':'location_dest_id'}"/>
-                    	<filter string="Picking" icon="terp-mrp" context="{'group_by':'picking_id'}"/>
-                    	<separator orientation="vertical"/>
-                        <filter string="Routing" icon="terp-mrp" context="{'group_by':'routing_id'}"/>
-                        <filter string="Product" name="Product" icon="terp-mrp" context="{'group_by':'product_id'}" />
-                        <filter string="State" icon="terp-mrp" context="{'group_by':'state'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
-                    	<filter string="Month" icon="terp-mrp" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
-                   </group>
-               </search>
+	                </group>                   
+                  </search>
             </field>
         </record>
         <record id="action_report_mrp_production_order" model="ir.actions.act_window">
diff --git a/addons/mrp_operations/mrp_operations_report.xml b/addons/mrp_operations/mrp_operations_report.xml
index 52122bfd041..826a587de51 100644
--- a/addons/mrp_operations/mrp_operations_report.xml
+++ b/addons/mrp_operations/mrp_operations_report.xml
@@ -8,7 +8,7 @@
 			model="mrp.workcenter"
 			name="mrp.wc.barcode"
 			rml="mrp_operations/report/mrp_wc_barcode.rml"
-			header="False"/>
+			header="False" />
 
 		<report
 			id="report_code_barcode"
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index fccc62edab7..37e90a995b4 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -71,12 +71,12 @@
                     <separator string="Status" colspan="4"/>
                     <group colspan="8" col="8">
                         <field name="state"/>
-                        <button name="button_draft" string="Set Draft" states="cancel"/>
-                        <button name="button_start_working" string="Start" states="draft"/>
-                        <button name="button_resume" string="Resume" states="pause"/>
-                        <button name="button_cancel" string="Cancel" states="draft,startworking"/>
-                        <button name="button_pause" string="Pause" states="startworking"/>
-                        <button name="button_done" string="Finished" states="startworking"/>
+                        <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
+                        <button name="button_start_working" string="Start" states="draft" icon="gtk-execute"/>
+                        <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
+                        <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-cancel"/>
+                        <button name="button_pause" string="Pause" states="startworking" icon="gtk-execute"/>
+                        <button name="button_done" string="Finished" states="startworking" icon="gtk-ok"/>
                     </group>
                 </page>
                 </notebook>
@@ -84,6 +84,27 @@
         </field>
     </record>
 
+    <record id="view_mrp_production_workcenter_form_view_filter" model="ir.ui.view">
+            <field name="name">mrp.production.workcenter.line.select</field>
+            <field name="model">mrp.production.workcenter.line</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Work Orders">
+                	<group col='6' colspan='4'>
+                		<field name="name"/>
+                		<field name="workcenter_id"/>
+                		<field name="production_id"/>
+                	</group>
+                	<newline/>
+                    <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product'}"/>
+                        <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                    </group>
+               </search>
+            </field>
+    </record>
+
     <record id="workcenter_line_calendar" model="ir.ui.view">
         <field name="name">mrp.production.workcenter.line.calendar</field>
         <field name="model">mrp.production.workcenter.line</field>
@@ -121,6 +142,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,gantt,calendar,graph</field>
         <field name="domain">[('id','=',active_id)]</field>
+        <field name="search_view_id" ref="view_mrp_production_workcenter_form_view_filter"/>
     </record>
 
     <!-- Action for All Operations   -->
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
index cb20f1561fd..ceaefb4c4db 100644
--- a/addons/mrp_procurement/mrp_procurement.py
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -91,7 +91,7 @@ class mrp_procurement(osv.osv):
             " a make to order method."),
 
         'note': fields.text('Note'),
-        
+
         'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
 
         'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
@@ -144,7 +144,7 @@ class mrp_procurement(osv.osv):
 
     def check_product(self, cr, uid, ids):
         """ Checks product type.
-        @return: True or False 
+        @return: True or False
         """
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_id.type in ('product', 'consu'):
@@ -153,7 +153,7 @@ class mrp_procurement(osv.osv):
 
     def check_move_cancel(self, cr, uid, ids, context={}):
         """ Checks if move is cancelled or not.
-        @return: True or False. 
+        @return: True or False.
         """
         res = True
         ok = False
@@ -166,7 +166,7 @@ class mrp_procurement(osv.osv):
 
     def check_move_done(self, cr, uid, ids, context={}):
         """ Checks if move is done or not.
-        @return: True or False. 
+        @return: True or False.
         """
         res = True
         for proc in self.browse(cr, uid, ids, context):
@@ -190,7 +190,7 @@ class mrp_procurement(osv.osv):
         return False
 
     def _uom_compute_get(self, cr, uid, proc, context={}):
-        """ Finds UoS if product is Stockable Product. 
+        """ Finds UoS if product is Stockable Product.
         @param proc: Current procurement.
         @return: UoS or False.
         """
@@ -205,7 +205,7 @@ class mrp_procurement(osv.osv):
     #
     def quantity_get(self, cr, uid, id, context={}):
         """ Finds quantity of product used in procurement.
-        @return: Quantity of product. 
+        @return: Quantity of product.
         """
         proc = self.browse(cr, uid, id, context)
         result = self._quantity_compute_get(cr, uid, proc, context)
@@ -215,7 +215,7 @@ class mrp_procurement(osv.osv):
 
     def uom_get(self, cr, uid, id, context=None):
         """ Finds UoM of product used in procurement.
-        @return: UoM of product. 
+        @return: UoM of product.
         """
         proc = self.browse(cr, uid, id, context)
         result = self._uom_compute_get(cr, uid, proc, context)
@@ -225,7 +225,7 @@ class mrp_procurement(osv.osv):
 
     def check_waiting(self, cr, uid, ids, context=[]):
         """ Checks state of move.
-        @return: True or False 
+        @return: True or False
         """
         for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.move_id and procurement.move_id.state == 'auto':
@@ -244,7 +244,7 @@ class mrp_procurement(osv.osv):
 
     def check_make_to_stock(self, cr, uid, ids, context={}):
         """ Checks product type.
-        @return: True or False 
+        @return: True or False
         """
         ok = True
         for procurement in self.browse(cr, uid, ids, context=context):
@@ -299,7 +299,7 @@ class mrp_procurement(osv.osv):
         return True
 
     def test_cancel(self, cr, uid, ids):
-        """ Tests whether state of move is cancelled or not. 
+        """ Tests whether state of move is cancelled or not.
         @return: True or False
         """
         for record in self.browse(cr, uid, ids):
@@ -338,7 +338,7 @@ class mrp_procurement(osv.osv):
 
     def action_move_assigned(self, cr, uid, ids, context={}):
         """ Changes procurement state to Running and writes message.
-        @return: True 
+        @return: True
         """
         self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')})
         return True
@@ -358,12 +358,12 @@ class mrp_procurement(osv.osv):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
                 cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
                 if not cr.fetchone()[0]:
-                    cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
+                    cr.execute('update mrp_procurement set message=%s where id=%s', (_('Stock is not enough and No minimum orderpoint rule defined'), procurement.id))
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context={}):
         """ Changes procurement state to Running.
-        @return: True 
+        @return: True
         """
         for procurement in self.browse(cr, uid, ids):
             self.write(cr, uid, [procurement.id], {'state': 'running'})
@@ -375,7 +375,7 @@ class mrp_procurement(osv.osv):
         """
         return 0
 
-    
+
     def action_po_assign(self, cr, uid, ids, context={}):
         """ This is action which call from workflow to assign purchase order to procurements
         @return: True
@@ -384,7 +384,7 @@ class mrp_procurement(osv.osv):
 
     def action_cancel(self, cr, uid, ids):
         """ Cancels procurement and writes move state to Assigned.
-        @return: True 
+        @return: True
         """
         todo = []
         todo2 = []
@@ -410,8 +410,8 @@ class mrp_procurement(osv.osv):
         return self.check_move_done(cr, uid, ids)
 
     def action_check(self, cr, uid, ids):
-        """ Checks procurement move state whether assigned or done. 
-        @return: True 
+        """ Checks procurement move state whether assigned or done.
+        @return: True
         """
         ok = False
         for procurement in self.browse(cr, uid, ids):
@@ -422,14 +422,14 @@ class mrp_procurement(osv.osv):
 
     def action_ready(self, cr, uid, ids):
         """ Changes procurement state to Ready.
-        @return: True 
+        @return: True
         """
         res = self.write(cr, uid, ids, {'state': 'ready'})
         return res
 
     def action_done(self, cr, uid, ids):
         """ Changes procurement state to Done and writes Closed date.
-        @return: True 
+        @return: True
         """
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
@@ -451,7 +451,7 @@ class mrp_procurement(osv.osv):
         self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
         self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
                 use_new_cursor=use_new_cursor, context=context)
-        
+
 mrp_procurement()
 
 
@@ -461,7 +461,7 @@ class stock_warehouse_orderpoint(osv.osv):
     """
     _name = "stock.warehouse.orderpoint"
     _description = "Orderpoint minimum rule"
-    
+
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
@@ -489,7 +489,7 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
     }
-    
+
     def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
         """ Finds location id for changed warehouse.
         @param warehouse_id: Changed id of warehouse.
@@ -500,7 +500,7 @@ class stock_warehouse_orderpoint(osv.osv):
             v = {'location_id': w.lot_stock_id.id}
             return {'value': v}
         return {}
-    
+
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
         """ Finds UoM for changed product.
         @param product_id: Changed id of product.
@@ -511,7 +511,7 @@ class stock_warehouse_orderpoint(osv.osv):
             v = {'product_uom': prod.uom_id.id}
             return {'value': v}
         return {}
-    
+
     def copy(self, cr, uid, id, default=None,context={}):
         if not default:
             default = {}
@@ -519,6 +519,6 @@ class stock_warehouse_orderpoint(osv.osv):
             'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
         })
         return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-    
+
 stock_warehouse_orderpoint()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 94ee009d7df..1defa214754 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>		
+	<data>
 		<!--
         Procurement
         -->
-        
+
         <record id="mrp_procurement_tree_view" model="ir.ui.view">
             <field name="name">mrp.procurement.tree</field>
             <field name="model">mrp.procurement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines" colors="red:state=='draft';black:state=='running';green:state=='confirmed';gray:state in ['done','cancel']">
+                <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state in ('exception');black:state=='running';green:state=='confirmed';gray:state in ['done','cancel'];blue:state in ('ready')">
                     <field name="date_planned" widget="date"/>
                     <field name="origin"/>
                     <field name="product_id"/>
@@ -18,6 +18,7 @@
                     <field name="product_uom" string="UOM"/>
                     <field name="procure_method"/>
                     <field name="state"/>
+                    <field name="message"/>
                 </tree>
             </field>
         </record>
@@ -45,10 +46,10 @@
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
                         <field name="location_id" domain="[('usage','=','internal')]"/>
                         <field name="product_qty"/>
-                        <field name="product_uom"/>
+                        <field name="product_uom" widget="selection"/>
 
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos" groups="product.group_uos"/>
+                        <field name="product_uos_qty" groups="product.group_uos,base.group_extended"/>
+                        <field name="product_uos" widget="selection" groups="product.group_uos,base.group_extended"/>
 
                         <separator colspan="4" string="Status"/>
                         <field colspan="4" name="message" readonly="1"/>
@@ -90,6 +91,7 @@
                        <filter icon="terp-mrp" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
+                       <filter icon="terp-mrp" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="origin"/>
@@ -98,10 +100,11 @@
                        <field name="state" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8">
+                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
                         <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                    	<filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -114,6 +117,7 @@
             <field name="view_id" eval="False"/>
             <field name="context">{'search_default_current':1}</field>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
+            <field name="context">{'search_default_Current':1}</field>
         </record>
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
@@ -154,7 +158,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
         </record>
-        
+
         <!-- Order Point -->
         <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
             <field name="name">stock.warehouse.orderpoint.tree</field>
@@ -183,7 +187,7 @@
                         <field name="name"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id"/>
-                        <field name="company_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
@@ -247,6 +251,21 @@
             name="Minimum Stock Rules"
             res_model="stock.warehouse.orderpoint"
             src_model="product.product"/>
-            
+
+        <act_window
+            context="{'product_uom': locals().has_key('uom_id') and uom_id}"
+            domain="[('product_id', '=', active_id)]"
+            id="act_mrp_procurement_2_stock_warehouse_orderpoint"
+            name="Minimum Stock Rules"
+            res_model="stock.warehouse.orderpoint"
+            src_model="mrp.procurement"/>
+
+        <act_window
+            domain="[('id', '=', product_id)]"
+            id="act_product_product_2_stock_warehouse_orderpoint"
+            name="Product"
+            res_model="product.product"
+            src_model="mrp.procurement"/>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp_procurement/wizard/make_procurement_view.xml b/addons/mrp_procurement/wizard/make_procurement_view.xml
index e98f1c013a0..2e9b44edb63 100644
--- a/addons/mrp_procurement/wizard/make_procurement_view.xml
+++ b/addons/mrp_procurement/wizard/make_procurement_view.xml
@@ -17,6 +17,7 @@
                     <field name="date_planned"/>
                     <field name="warehouse_id" colspan="4"/>
                     <newline/>
+                    <separator colspan="4"/>
                     <group col="2" colspan="4">
                         <button icon='gtk-cancel' special="cancel"
                             string="Cancel" />
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 667e9763827..47e80be3e31 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -2,174 +2,196 @@
 <openerp>
     <data>
 
-    <record id="view_repair_order_form" model="ir.ui.view">
-            <field name="name">mrp.repair.form</field>
-            <field name="model">mrp.repair</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Repairs order">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
-                        <field name="deliver_bool"/>
-                        <newline/>
-                        <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
-                        <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
-                        <field name="repaired"/>
-                        <newline/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
-                        <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
-                        <field name="invoiced"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Operations">
-                            <field name="guarantee_limit" />
-                            <newline/>
-                            <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
-                                <form string="Operations">
-                                    <notebook>
-                                        <page string="Repair Line">
-                                            <field name="name" colspan="4"/>
-                                            <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" 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="location_id"/>
-                                            <field name="location_dest_id"/>
-                                            <newline/>
-                                            <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
-                                            <group colspan="2">
-                                                <field name="to_invoice"/>
-                                                <field name="invoiced"/>
-                                            </group>
-                                            <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <separator colspan="4" string="States"/>
-                                            <field name="state"/>
-                                        </page>
-                                        <page string="History" groups="base.group_extended">
-                                            <field colspan="4" name="move_id" />
-                                            <field colspan="4" name="invoice_line_id"/>
-                                        </page>
-
-                                     </notebook>
-                                </form>
-                                <tree string="Operations" editable="bottom">
-                                    <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
-                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
-                                    <field name='name'/>
-                                    <field name="location_id"/>
-                                    <field name="location_dest_id"/>
-                                    <field name="product_uom_qty" string="Qty"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="price_unit"/>
-                                    <field name="tax_id"/>
-                                    <field name="to_invoice"/>
-                                    <field name="price_subtotal"/>
-                                </tree>
-                            </field>
-                            <newline/>
-                            <group col="7" colspan="4">
-                                <field name="amount_untaxed" sum="Untaxed amount"/>
-                                <field name="amount_tax"/>
-                                <field name="amount_total" sum="Total amount"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object"/>
-                            </group>
-                            <newline/>
-                            <group col="13" colspan="4">
-                                <field name="state"/>
-                                <button name="repair_confirm" states="draft" string="Confirm Repair"/>
-                                <button name="repair_ready" states="confirmed" string="Start Repair"/>
-                                <button name="action_repair_start" states="ready" string="Start Repair"/>
-                                <button name="action_repair_end" states="under_repair" string="End Repair"/>
-                                <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_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"/>
-                            </group>
-                        </page>
-                        <page string="Invoicing">
-                            <field name="invoice_method" colspan="4"/>
-                            <field
-                                name="pricelist_id" context="product_id=product_id"
-                                attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
-                            <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
-                            <!-- <field name="invoice_id"/> -->
-                            <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
-                                <form string="Fees">
-                                    <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"/>
-                                            <newline/>
-                                            <group colspan="2">
-                                                <field name="to_invoice"/>
-                                                <field name="invoiced"/>
-                                            </group>
-                                            <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                         </page>
-                                         <page string="History" groups="base.group_extended">
-                                            <field colspan="4" name="invoice_line_id" />
-                                        </page>
-                                      </notebook>
-                                </form>
-                                <tree string="Fees" editable="bottom">
-                                    <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)"/>
-                                    <field name='name'/>
-                                    <field name="product_uom_qty" string="Qty"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="price_unit"/>
-                                    <field name="to_invoice"/>
-                                    <field name="price_subtotal"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Quality">
-                            <separator colspan="4" string="Internal Notes"/>
-                            <field colspan="4" name="internal_notes" nolabel="1"/>
-                            <separator colspan="4" string="Quotation Notes"/>
-                            <field colspan="4" name="quotation_notes" nolabel="1"/>
-                        </page>
-                        <page string="Extra Info" groups="base.group_extended">
-                            <field name="invoice_id"/>
-                            <field name="picking_id"/>
-                            <field name="location_id"/>
-                            <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_repair_order_tree" model="ir.ui.view">
+	<record id="view_repair_order_tree" model="ir.ui.view">
             <field name="name">mrp.repair.tree</field>
             <field name="model">mrp.repair</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Repairs order">
                     <field name="name" select="1" />
-                        <field name="product_id" select="1" />
-                        <field name="prodlot_id"/>
-                        <field name="partner_id"/>
-                        <field name="address_id"/>
-                            <field name="location_id"/>
-                            <field name="state"/>
-                            <field name="move_id"/>
-                            <field name="location_dest_id"/>
-                            <field name="guarantee_limit"/>
+                     <field name="product_id" select="1" />
+                     <field name="prodlot_id"/>
+                     <field name="partner_id"/>
+                     <field name="address_id"/>
+                     <field name="location_id"/>
+                     <field name="move_id"/>
+                     <field name="location_dest_id"/>
+                     <field name="guarantee_limit"/>
+                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
+    <record id="view_repair_order_form" model="ir.ui.view">
+        <field name="name">mrp.repair.form</field>
+        <field name="model">mrp.repair</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Repairs order">
+                <group col="6" colspan="4">
+                    <field name="name"/>
+                    <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
+                    <field name="deliver_bool"/>
+                    <newline/>
+                    <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
+                    <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
+                    <field name="repaired"/>
+                    <newline/>
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
+                    <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
+                    <field name="invoiced"/>
+                </group>
+                <notebook colspan="4">
+                    <page string="Operations">
+                        <field name="guarantee_limit" />
+                        <newline/>
+                        <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
+                            <form string="Operations">
+                                <notebook>
+                                    <page string="Repair Line">
+                                        <field name="name" colspan="4"/>
+                                        <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" 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="location_id"/>
+                                        <field name="location_dest_id"/>
+                                        <newline/>
+                                        <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
+                                        <group colspan="2">
+                                            <field name="to_invoice"/>
+                                            <field name="invoiced"/>
+                                        </group>
+                                        <newline/>
+                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                        <separator colspan="4" string="States"/>
+                                        <field name="state"/>
+                                    </page>
+                                    <page string="History" groups="base.group_extended">
+                                        <field colspan="4" name="move_id" />
+                                        <field colspan="4" name="invoice_line_id"/>
+                                    </page>
+
+                                 </notebook>
+                            </form>
+                            <tree string="Operations" editable="bottom">
+                                <field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
+                                <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                <field name='name'/>
+                                <field name="location_id"/>
+                                <field name="location_dest_id"/>
+                                <field name="product_uom_qty" string="Qty"/>
+                                <field name="product_uom" string="UoM"/>
+                                <field name="price_unit"/>
+                                <field name="tax_id"/>
+                                <field name="to_invoice"/>
+                                <field name="price_subtotal"/>
+                            </tree>
+                        </field>
+                        <newline/>
+                        <group col="7" colspan="4">
+                            <field name="amount_untaxed" sum="Untaxed amount"/>
+                            <field name="amount_tax"/>
+                            <field name="amount_total" sum="Total amount"/>
+                            <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                        </group>
+                        <newline/>
+                        <group col="13" colspan="4">
+                            <field name="state"/>
+                            <button name="repair_confirm" states="draft" string="Confirm Repair" icon="gtk-apply"/>
+                            <button name="repair_ready" states="confirmed" string="Start Repair" icon="gtk-execute"/>
+                            <button name="action_repair_start" states="ready" string="Start Repair" icon="gtk-execute"/>
+                            <button name="action_repair_end" states="under_repair" string="End Repair" icon="gtk-ok"/>
+                            <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-convert"/>
+                            <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
+                            <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="gtk-ok"/>
+                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-cancel"/>
+                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                            <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-cancel"/>
+                            <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-cancel"/>
+                        </group>
+                    </page>
+                    <page string="Invoicing">
+                        <field name="invoice_method" colspan="4"/>
+                        <field
+                            name="pricelist_id" context="product_id=product_id"
+                            attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                        <field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
+                        <!-- <field name="invoice_id"/> -->
+                        <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
+                            <form string="Fees">
+                                <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"/>
+                                        <newline/>
+                                        <group colspan="2">
+                                            <field name="to_invoice"/>
+                                            <field name="invoiced"/>
+                                        </group>
+                                        <newline/>
+                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                     </page>
+                                     <page string="History" groups="base.group_extended">
+                                        <field colspan="4" name="invoice_line_id" />
+                                    </page>
+                                  </notebook>
+                            </form>
+                            <tree string="Fees" editable="bottom">
+                                <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)"/>
+                                <field name='name'/>
+                                <field name="product_uom_qty" string="Qty"/>
+                                <field name="product_uom" string="UoM"/>
+                                <field name="price_unit"/>
+                                <field name="to_invoice"/>
+                                <field name="price_subtotal"/>
+                            </tree>
+                        </field>
+                    </page>
+                    <page string="Quality">
+                        <separator colspan="4" string="Internal Notes"/>
+                        <field colspan="4" name="internal_notes" nolabel="1"/>
+                        <separator colspan="4" string="Quotation Notes"/>
+                        <field colspan="4" name="quotation_notes" nolabel="1"/>
+                    </page>
+                    <page string="Extra Info" groups="base.group_extended">
+                        <field name="invoice_id"/>
+                        <field name="picking_id"/>
+                        <field name="location_id"/>
+                        <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+
+
+
+    <record id="view_repair_order_form_filter" model="ir.ui.view">
+          <field name="name">mrp.repair.select</field>
+          <field name="model">mrp.repair</field>
+          <field name="type">search</field>
+          <field name="arch" type="xml">
+              <search string="Search Reair Orders">
+              	<group col='4' colspan='4'>
+              		<field name="name" />
+                    <field name="product_id" />
+              	</group>
+              	<newline/>
+                  <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
+                      <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
+                      <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
+                      <filter string="Partner" icon="terp-mrp" domain="[]" context="{'group_by':'partner_id'}"/>
+                  </group>
+             </search>
+          </field>
+	</record>
+
         <record id="action_repair_order_form" model="ir.actions.act_window">
             <field name="name">New Repair</field>
             <field name="type">ir.actions.act_window</field>
@@ -184,6 +206,7 @@
             <field name="res_model">mrp.repair</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_repair_order_form_filter"/>
         </record>
 
          <record id="action_repair_quotation_tree" model="ir.actions.act_window">
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index beb3453d224..5f677e7a8c6 100644
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -10,13 +10,14 @@
             multi="True"
             id="bi_conf_cube_query_builder"/>
 
-    <wizard
+
+   <!--   <wizard
             string="Load Tables"
             model="olap.schema"
             name="olap.load.table"
             menu= "False"
             multi="True"
-            id="bi_menu_olap_load_table"/>
+            id="bi_menu_olap_load_table"/>-->
 
 
         <wizard
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index d2cc102a047..ef8ae334810 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -12,15 +12,15 @@
 						<field name="user_salesman_id" />
 						<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
 						<field name="contract_number" groups="base.group_extended"/>
-                    
+
                 	</group>
                      <notebook colspan="4">
-                      <page string="Sale Order ">                    
+                      <page string="Sale Order ">
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)" width="275" />
                                     <field name="qty" />
-                                    <field name="qty_rfd" groups="base.group_extended"/> 
+                                    <field name="qty_rfd" groups="base.group_extended"/>
                                     <field name="discount" on_change="onchange_discount(discount,price_unit)" />
                                     <field name="price_ded" on_change="onchange_ded(price_ded, price_unit)" />
                                     <field name="price_unit" readonly="1"/>
@@ -73,7 +73,7 @@
                         <page string="Order and Payment">
                             <group colspan="2" col="2" name="Type">
                                 <separator string="Order Information" colspan="4"/>
-                                <field name="company_id"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"  />
                                 <field name="name"/>
                                 <field name="user_id" />
@@ -143,7 +143,7 @@
                     <field name="invoice_id"/>
                     <field name="state" />
                     <field name="amount_total" sum="Amount total"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -161,7 +161,7 @@
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
@@ -729,7 +729,7 @@
                                   <field name="expense_pdt"/>
                             <field name="am_out"/>
                           <field name="disc_controle"/>
-                                  <field name="company_id" groups="base.group_extended"/>
+                                  <field name="company_id" groups="base.group_extended,base.group_multi_company"/>
                               </group>
                               <group colspan="2" col="2" name="Prices">
                                   <separator string="Prices" colspan="2"/>
@@ -825,7 +825,7 @@
                     <field name="note" select="1" />
                     <field name="state" select="1"/>
                     <field name="amount_total" sum="Amount total"/>
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index cef2748b5e4..69c3232f1a0 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -46,7 +46,7 @@
                 <form string="Statement">
                     <field name="name" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash'),('auto_cash','=',False)]" select="1" />
                     <newline/>
                     <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -123,7 +123,7 @@
                 <form string="Statement">
                     <field name="name" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
                     <newline/>
                     <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -236,7 +236,7 @@
                 <form string="Statement">
                     <field name="name" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" readonly="1"/>
                     <newline/>
                     <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -417,7 +417,7 @@
 		<menuitem name="Cashboxes to Close" parent="menu_pos_bank_statment_tree"
 		 		action="action_cashboxes_to_close" id="menu_cashboxes_to_close_tree" groups="base.group_extended"/>
 
-	
+
 		<menuitem
             name="Open Registers" parent="point_of_sale.menu_point_config"
             string="Open Register"
@@ -434,11 +434,11 @@
             string="Close Register"
             action="action_pos_close_statement"
             id="menu_close_statement" sequence="2" />
-       
+
        <menuitem icon="STOCK_PRINT"
        			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
 				 parent="menu_point_report_register"/>
-            
+
 	</data>
 </openerp>
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index d8c039ef276..57b28e76311 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Base',
     'description': """
      This module shows the basic processes involved
-     in the selected modules and in the sequence these
+     in the selected modules and in the sequence they
      occur
 
      Note: This applies to the modules containing modulename_process_xml
diff --git a/addons/product/product.py b/addons/product/product.py
index f8f96ff69de..18c9e6ded8d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -262,7 +262,7 @@ class product_template(osv.osv):
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'rental': fields.boolean('Can be Rent'),
-        'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"),
+        'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
         'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
         'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Account'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price."),
         'volume': fields.float('Volume', help="The volume in m3."),
@@ -586,7 +586,7 @@ class product_packaging(osv.osv):
     _rec_name = 'ean'
     _columns = {
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of packaging."),
-        'name' : fields.char('Description', size=64),
+        'name' : fields.text('Description', size=64),
         'qty' : fields.float('Quantity by Package',
             help="The total number of products you can put by pallet or box."),
         'ul' : fields.many2one('product.ul', 'Type of Package', required=True),
@@ -645,9 +645,9 @@ class product_supplierinfo(osv.osv):
     _name = "product.supplierinfo"
     _description = "Information about a product supplier"
     _columns = {
-        'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"),
-        'product_name': fields.char('Partner Product Name', size=128, help="This partner's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
-        'product_code': fields.char('Partner Product Code', size=64, help="This partner's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
+        'name' : fields.many2one('res.partner', 'Supplier', required=True, ondelete='cascade', help="Supplier of this product"),
+        'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
+        'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
         'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
         'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 9bfcb33b050..aa2f9d2d509 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -18,17 +18,17 @@
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
-                   <group col='8' colspan='14' expand="1" string="Extended options...">
-                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
-                   </group>
-                   <newline/>
-                   <group col='8' colspan='15' expand='1' string='Group by...'>
+                   <group  expand='1' string='Group by...' groups="base.group_extended">
                        <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
                        <separator orientation="vertical"/>
                        <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
+                   <newline/>
+                   <group expand="0" string="Extended options..." groups="base.group_extended">
+                       <field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
+                   </group>
                 </search>
             </field>
         </record>
@@ -104,7 +104,7 @@
                             </group>
 
                             <group colspan="2" col="2" name="uom">
-                                <separator string="UOM" colspan="2"/>
+                                <separator string="Unit of Measure" colspan="2"/>
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" widget="selection"/>
                                 <field name="uom_po_id" widget="selection"/>
                             </group>
@@ -175,8 +175,8 @@
                                     <field name="height"/>
                                     <field name="width"/>
                                     <field name="length"/>
-                                    <separator colspan="4" string="Other Info"/>
-                                    <field colspan="4" name="name"/>
+                                    <separator colspan="4" string="Description"/>
+                                    <field colspan="4" name="name" nolabel="1"/>
                                 </form>
                             </field>
                         </page>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index 17d9010ed43..a253a0e00af 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -10,16 +10,17 @@
 		      <field name="type">form</field>
 		      <field name="arch" type="xml">
 				<form string="Price list">
-				    <field name="price_list" />
+				    <field name="price_list" widget="selection"/>
 				    <field name="qty1" colspan="2" />
 				    <field name="qty2" colspan="2" />
 				    <field name="qty3" colspan="2" />
 				    <field name="qty4" colspan="2" />
 				    <field name="qty5" colspan="2" />
-					<button icon='gtk-cancel' special="cancel"
-				                  string="Close" />
-					<button name="print_report" string="Print Report"
-				                  colspan="1" type="object" icon="gtk-print" />
+					<separator colspan="4"/>
+                    <group col="2" colspan="4">
+                         <button icon="gtk-cancel" special="cancel" string="Close"/>
+                         <button name="print_report" string="Print Report"  type="object"  icon="gtk-print"/>
+                    </group>
 				</form>
 		      </field>
     	</record>
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 9272287371a..7607c499add 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Custom',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins
-and others interesting indicators based on invoices. The wizard to launch
+and other interesting indicators based on invoices. The wizard to launch
 the report has several options to help you get the data you need.
 """,
     'author': 'Tiny',
diff --git a/addons/profile_accounting/i18n/pl.po b/addons/profile_accounting/i18n/pl.po
index 2322b2ce98e..be89ead2d63 100644
--- a/addons/profile_accounting/i18n/pl.po
+++ b/addons/profile_accounting/i18n/pl.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-09-08 12:59+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-25 16:49+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
@@ -23,6 +23,8 @@ msgid ""
 "Profile you selected. You will be able to install them based on our "
 "requirements."
 msgstr ""
+"Instaluj więcej modułów. Proponujemy moduły zalecane do profilu księgowego, "
+"który wybrałeś. Będziesz mógł je instalować według naszych wskazań."
 
 #. module: profile_accounting
 #: constraint:ir.model:0
@@ -35,7 +37,7 @@ msgstr ""
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Services Management"
-msgstr ""
+msgstr "Zarządzanie usługami"
 
 #. module: profile_accounting
 #: help:profile.accounting.config.install_modules_wizard,board_document:0
@@ -45,51 +47,55 @@ msgid ""
 "documents, printed reports, calendar system). It opens an FTP access for the "
 "users to easily browse association's document."
 msgstr ""
+"System zarządzania dokumentami w OpenERP pozwala przechowywać, przeglądać, "
+"automatycznie indeksować, przeszukiwać i podglądać wszystkie rodzaje "
+"dokumentów (dokumenty wewnętrzne, drukowane raporty, kalendarze). Otwiera on "
+"dla użytkowników dostęp FTP do łatwego przeglądania powiązanych dokumentów."
 
 #. module: profile_accounting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "Zarządzanie zasobami"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_payment:0
 msgid "Suppliers Payment Management"
-msgstr ""
+msgstr "Zarządzanie płatnościami dla dostawców"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_asset:0
 msgid "Asset Management"
-msgstr ""
+msgstr "Środki trwałe"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "Planowanie analityczne"
 
 #. module: profile_accounting
 #: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
 msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
+msgstr "Profil księgowy: Instaluj dodatkowe moduły"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
 msgid "Invoice on Analytic Entries"
-msgstr ""
+msgstr "Faktura z zapisów analitycznych"
 
 #. module: profile_accounting
 #: model:ir.module.module,description:profile_accounting.module_meta_information
 msgid "Profile for Accounting"
-msgstr ""
+msgstr "Profil dla księgowości"
 
 #. module: profile_accounting
 #: help:profile.accounting.config.install_modules_wizard,account_budget:0
 msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
+msgstr "Pomaga zarządzać budżetami finansowymi i analitycznymi."
 
 #. module: profile_accounting
 #: constraint:ir.ui.view:0
@@ -99,37 +105,37 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Budżety"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Install"
-msgstr ""
+msgstr "Instaluj"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Install Extra Module"
-msgstr ""
+msgstr "Instaluj dodatkowe moduły"
 
 #. module: profile_accounting
 #: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
 msgid "Accounting only profile"
-msgstr ""
+msgstr "Profil tylko księgowy"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Księgowość analityczna"
 
 #. module: profile_accounting
 #: field:profile.accounting.config.install_modules_wizard,board_document:0
 msgid "Document Management"
-msgstr ""
+msgstr "Zarządzanie dokumentami"
 
 #. module: profile_accounting
 #: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
@@ -139,4 +145,4 @@ msgstr ""
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
diff --git a/addons/profile_manufacturing/i18n/pl.po b/addons/profile_manufacturing/i18n/pl.po
index 4a7c7de9f7b..9b653d520b3 100644
--- a/addons/profile_manufacturing/i18n/pl.po
+++ b/addons/profile_manufacturing/i18n/pl.po
@@ -7,24 +7,24 @@ 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-09-08 13:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-25 16:49+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Operacje produkcyjne"
 
 #. module: profile_manufacturing
 #: model:ir.module.module,description:profile_manufacturing.module_meta_information
 msgid "Profile for manufacturing industries"
-msgstr ""
+msgstr "Profil dla firm produkcyjnych"
 
 #. module: profile_manufacturing
 #: constraint:ir.model:0
@@ -37,22 +37,22 @@ msgstr ""
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
 msgid "Just in Time Scheduling"
-msgstr ""
+msgstr "Planowanie natychmiastowe (JiT)"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0
 msgid "Manage by Journals"
-msgstr ""
+msgstr "Zarządzanie wg dzienników"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Relationship Management"
-msgstr ""
+msgstr "Zarządzanie relacjami"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,portal:0
 msgid "This module allows you to manage a Portal system."
-msgstr ""
+msgstr "Ten moduł pozwoli ci zarządzać systemem portalu."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,board_document:0
@@ -62,6 +62,10 @@ msgid ""
 "documents, printed reports, calendar system). It opens an FTP access for the "
 "users to easily browse association's document."
 msgstr ""
+"System zarządzania dokumentami w OpenERP pozwala przechowywać, przeglądać, "
+"automatycznie indeksować, przeszukiwać i podglądać wszystkie rodzaje "
+"dokumentów (dokumenty wewnętrzne, drukowane raporty, kalendarze). Otwiera on "
+"dla użytkowników dostęp FTP do łatwego przeglądania powiązanych dokumentów."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
@@ -70,17 +74,20 @@ msgid ""
 "journals. You can define journals for trucks, salesman, departments, "
 "invoicing date delivery period, etc."
 msgstr ""
+"Ten moduł pozwala zarządzać sprzedażą, fakturowaniem i pobieraniem produktów "
+"przez dzinniki. Możesz definiować dzienniki dla ciężarówek, sprzedawców, "
+"działów, dat fakturowania, okresów dostaw itp."
 
 #. module: profile_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: profile_manufacturing
 #: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Manufacturing Profile: Install Extra Modules"
-msgstr ""
+msgstr "Profil produkcyjny: Instaluj dodatkowe moduły"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
@@ -89,6 +96,9 @@ msgid ""
 "and faster for real time stock computation but, in counter-part, it manages "
 "less efficiently priorities in procurements."
 msgstr ""
+"Moduł JIT pozwala działać planiście bez jego uruchamiania. Jest to szybsze i "
+"łatwiejsze dla obliczeń zapasów w czasie rzeczywistym, ale nieefektywne w "
+"zarządzaniu priorytetami w nabyciach."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
@@ -97,11 +107,15 @@ msgid ""
 "work order/operation. You will be able to planify, analyse the cost, check "
 "times, ... on all operations of each manufacturing order"
 msgstr ""
+"Ten moduł pozwala nie tylko zarządzać produkcją przez zamówienia produkcji, "
+"ale również przez zamówienia czynności/operacje. Będziesz mógł planować, "
+"analizować koszt, sprawdzać czas, ... dla wszystkich operacji w każdym "
+"zamówieniu produkcyjnym"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,board_document:0
 msgid "Document Management"
-msgstr ""
+msgstr "Zarządzanie dokumentami"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,portal:0
@@ -111,7 +125,7 @@ msgstr ""
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Stock & Manufacturing"
-msgstr ""
+msgstr "Zapasy i Produkcja"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
@@ -119,6 +133,8 @@ msgid ""
 "Allow to manage product repairs. Handle the guarantee limit date and the "
 "invoicing of products and services."
 msgstr ""
+"Pozwala zarządzać naprawami produktów. Obsługuje czasy gwarancji i "
+"fakturowanie produktów i usług."
 
 #. module: profile_manufacturing
 #: constraint:ir.ui.view:0
@@ -132,16 +148,20 @@ msgid ""
 "manufacturing profile you selected. You will be able to install them based "
 "on our requirements."
 msgstr ""
+"Instaluj więcej modułów. Proponujemy moduły zalecane do profilu "
+"produkcyjnego, który wybrałeś. Będziesz mógł je instalować według naszych "
+"wskazań."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
 msgid "This module allows you to add sub poducts in mrp bom."
 msgstr ""
+"Ten moduł pozwala dodać produkty uboczne w zestawieniu materiałowym MRP."
 
 #. module: profile_manufacturing
 #: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information
 msgid "Manufacturing industry profile"
-msgstr ""
+msgstr "Profil firm produkcyjnych"
 
 #. module: profile_manufacturing
 #: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard
@@ -155,26 +175,28 @@ msgid ""
 "opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
 "on."
 msgstr ""
+"To instaluje funkcjonalność relacji z klientami jak: obsługa sygnałów i "
+"szans, współdzielone kalendarze, obsadzanie stanowisk, obsługa błędów itp."
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Install"
-msgstr ""
+msgstr "Instaluj"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0
 msgid "CRM and Calendars"
-msgstr ""
+msgstr "CRM i kalendarze"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
 msgid "Repair"
-msgstr ""
+msgstr "Naprawa"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0
 msgid "Display margins on the sale order form."
-msgstr ""
+msgstr "Wyświetlaj marże na formularzu zamówienia sprzedaży."
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
@@ -184,26 +206,30 @@ msgid ""
 "a perfect ergonomy with touchscreen materials and payment processing "
 "hardware."
 msgstr ""
+"Ten moduł pozwala obsługiwać punkt sprzedaży. Zawiera podstawową formę "
+"operacji punktu sprzedaży. Musisz sprawdzić jeszcze nasz punkt sprzedaży dla "
+"sprzedawcy (frontend), zby się przekonać o ergonomii ekranu dotykowego i "
+"urządzeń do obsługi płatności."
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0
 msgid "Mrp Sub Product"
-msgstr ""
+msgstr "Produkt uboczny MRP"
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Sprzedaż"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,warning:0
 msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0
 msgid "Margins on Sales Order"
-msgstr ""
+msgstr "Marże w zamówieniu sprzedaży"
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
@@ -214,18 +240,23 @@ msgid ""
 "managing a manufacturing chain, a quality control location, product that you "
 "rent, etc."
 msgstr ""
+"Pozwala zarządzać zaawansowaną logistyką z różnymi strefami. Możesz "
+"zdefiniować, według produktu: domyślną strefę, ścieżkę stref dla różnych "
+"operacji, itp. Moduł ten jest zwykle stosowany do: lokalizacji produktów, "
+"zarządzania łańcuchem produkcyjnym, stref kontroli jakości, produktów "
+"wypożyczanych, itp."
 
 #. module: profile_manufacturing
 #: view:profile.manufacturing.config.install_modules_wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
 msgid "Point of Sale"
-msgstr ""
+msgstr "Punkt sprzedaży"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
 msgid "Advanced Locations"
-msgstr ""
+msgstr "Zaawansowane strefy"
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 3c7e80d4c11..a98b5cb28fd 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -28,7 +28,7 @@
     "category" : "Generic Modules/Projects & Services",
     "depends" : ["product", "analytic", "process", "mail_gateway"],
     "description": """Project management module that track multi-level projects, tasks,
-works done on tasks, eso. It is able to render planning, order tasks, eso.
+work done on tasks, eso. It is able to render planning, order tasks, eso.
     """,
     "init_xml" : [],
     "update_xml": [
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index cd6839344dc..386eb18b18e 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.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: 2010-05-13 17:05+0000\n"
+"PO-Revision-Date: 2010-05-25 15:03+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-14 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -1130,7 +1130,7 @@ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych projektów."
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr "Ostateczny czas ukończenia"
+msgstr "Termin"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
diff --git a/addons/project/project.py b/addons/project/project.py
index a6c703657d0..bdf7e30837e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -47,6 +47,8 @@ class project(osv.osv):
     _inherits = {'account.analytic.account':"category_id"}
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
         if user == 1:
                 return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
         if context and context.has_key('user_prefence') and context['user_prefence']:
@@ -266,13 +268,11 @@ class task(osv.osv):
         hours = dict(cr.fetchall())
         for task in self.browse(cr, uid, ids, context=context):
             res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
+            res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
-                if task.state =='done':
-                    res[task.id]['progress'] = 100.0
-                else:
+                if task.state != 'done':
                     res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
-            else:
-                res[task.id]['progress'] = 0.0
+
             if task.state in ('done','cancel'):
                 res[task.id]['progress'] = 100.0
             res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
@@ -559,6 +559,8 @@ class config_compute_remaining(osv.osv_memory):
     }
 
     def compute_hours(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         task_obj = self.pool.get('project.task')
         request = self.pool.get('res.request')
         if 'active_id' in context:
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 76ee14b990a..f22e352d16b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -122,8 +122,7 @@
                        <field name="user_id" string="Project Manager" default="1"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
-                   <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Users" name="Users"  icon="terp-project" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner"  icon="terp-project" domain = "[]" context="{'group_by':'partner_id'}"/>
                       </group>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index db880ae0149..a56ae9435c3 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -55,10 +55,10 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                 	<group>
-	                    <filter icon="terp-project" string="Last 365 Days"
+	                    <filter icon="gtk-media-rewind" string="Last 365 Days"
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Tasks performed in last 365 Days"/>
-	                    <filter icon="terp-project" string="Last 30 Days"
+	                    <filter icon="gtk-media-rewind" string="Last 30 Days"
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Tasks performed in last 30 days"/>
@@ -98,22 +98,11 @@
 	                    </field>
 	                    <field name="project_id">
 	                        <filter icon="terp-project"
-	                        		string="Non assigned tasks to projects"
-	                        		help ="Non assigned tasks to projects"
-	                        		domain="[('project_id','=',False"/>
+	                        		string="My Projects"
+	                        		help="My Projects"
+	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
 	                    </field>
                     </group>
-                    <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
-	                    <field name="type" widget="selection"/>
-	                    <separator orientation="vertical"/>
-                        <field name="date_start"/>
-                        <field name="date_deadline"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="priority"/>
-	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="11">
                         <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
                         <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
@@ -129,6 +118,16 @@
                         <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
                         <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
                     </group>
+                    <newline/>
+	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
+	                    <field name="type" widget="selection"/>
+	                    <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_deadline"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="priority"/>
+	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -216,7 +215,7 @@
     </record>
 
     <!-- Views and action for project  dashboard -->
-       <record id="view_task_by_days_vs_planned_hours_tree" model="ir.ui.view">
+    <record id="view_task_by_days_vs_planned_hours_tree" model="ir.ui.view">
         <field name="name">task.by.days.vs.planned.hours.tree</field>
         <field name="model">task.by.days.vs.planned.hours</field>
         <field name="type">tree</field>
@@ -248,5 +247,6 @@
         <field name="view_mode">graph,tree</field>
         <field name="view_id" ref="view_task_by_days_vs_planned_hours_graph"/>
     </record>
+    
     </data>
 </openerp>
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 068c42bee8d..d5271fc913e 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-22 14:25+0000\n"
+"PO-Revision-Date: 2010-05-25 10:02+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -37,7 +37,7 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
 msgid "My Deadlines"
-msgstr ""
+msgstr "Moje terminy"
 
 #. module: project_gtd
 #: selection:project.gtd.timebox,type:0
@@ -83,7 +83,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 #. module: project_gtd
 #: field:project.gtd.timebox,context4_id:0
 msgid "Context 4"
-msgstr ""
+msgstr "Kontekst 4"
 
 #. module: project_gtd
 #: wizard_field:project.gtd.timebox.fill,init,timebox_to_id:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.module.module,shortdesc:project_gtd.module_meta_information
 msgid "Getting Things Done - Time Management Module"
-msgstr ""
+msgstr "GTD - personalny moduł zarządzania czasem"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks
@@ -140,7 +140,7 @@ msgstr ""
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_pending
 msgid "My Pending Tasks"
-msgstr ""
+msgstr "Moje zadania oczekujące"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -166,17 +166,17 @@ msgstr ""
 #. module: project_gtd
 #: field:project.gtd.timebox,context1_id:0
 msgid "Context 1"
-msgstr ""
+msgstr "Kontekst 1"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context2_id:0
 msgid "Context 2"
-msgstr ""
+msgstr "Kontekst 2"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context3_id:0
 msgid "Context 3"
-msgstr ""
+msgstr "Kontekst 3"
 
 #. module: project_gtd
 #: wizard_button:project.gtd.timebox.fill,init,process:0
@@ -186,12 +186,12 @@ msgstr ""
 #. module: project_gtd
 #: field:project.gtd.timebox,context5_id:0
 msgid "Context 5"
-msgstr ""
+msgstr "Kontekst 5"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,context6_id:0
 msgid "Context 6"
-msgstr ""
+msgstr "Kontekst 6"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
@@ -244,18 +244,18 @@ msgstr "Kontekst"
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_open
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Moje otwarte zadania"
 
 #. module: project_gtd
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time
 #: model:ir.ui.menu,name:project_gtd.menu_open_time
 msgid "Time Management"
-msgstr ""
+msgstr "Zarządzanie czasem"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "GTD - planowanie osobiste"
 
 #. module: project_gtd
 #: field:project.gtd.timebox,task1_ids:0
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 513bae085bd..982d1688014 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -31,8 +31,10 @@
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
+        'crm',
         'project',
         'hr_timesheet_sheet',
+        'project_long_term',
     ],
     'init_xml': [
         'project_issue_data.xml'
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f67986526cd..b67ef6a849a 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -113,7 +113,6 @@ class project_issue(osv.osv, crm.crm_case):
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'id': fields.integer('ID'),  
         'name': fields.char('Name', size=128, required=True), 
-        'active': fields.boolean('Active', required=False), 
         'create_date': fields.datetime('Creation Date' , readonly=True), 
         'write_date': fields.datetime('Update Date' , readonly=True), 
         'date_deadline': fields.date('Deadline'), 
@@ -173,7 +172,6 @@ class project_issue(osv.osv, crm.crm_case):
        return False
 
     _defaults = {
-        'active': lambda *a: 1, 
         'user_id': crm.crm_case._get_default_user, 
         'partner_id': crm.crm_case._get_default_partner, 
         'partner_address_id': crm.crm_case._get_default_partner_address, 
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 210ad4ee737..27b72e459ef 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -82,11 +82,8 @@
                         		<separator string="Statistics" colspan="2" col="2"/>
                         		<field name="day_open"/>
                         		<field name="day_close"/>
-                    		</group>
-                            <group col="2" colspan="2">
                                 <separator string="References" colspan="2"/>
                                 <field name="id"/>
-                                <field name="active"/>
                             </group>
                             <field name="log_ids" nolabel="1" colspan="4">
 		                        <tree string="Logs">
@@ -143,6 +140,7 @@
             <field name="arch" type="xml">
                 <tree string="Issue Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
+                    <field name="create_date"/>
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Severity"/>
@@ -155,6 +153,7 @@
                         states="open,draft,pending,done,cancel" />
                     <field name="type_id" string="Version"/>
                     <field name="user_id"/>
+                    <field name="assigned_to"/>
                     <field name="state"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
@@ -172,21 +171,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <group>
+                    <group colspan="4" col="20">
                         <filter icon="gtk-home" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                            help="Todays's bugs"
+                            help="Today's bugs"
                             />
                         <filter icon="gtk-media-rewind"
                             string="    7 Days    " separator="1"
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
                             />
-
-                    </group>
-                    <separator orientation="vertical"/>
-                    <group>
+                    	<separator orientation="vertical"/>
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
@@ -196,7 +192,7 @@
                         <field name="project_id" select="1" widget="selection" string="Project"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="16">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
 	                    <filter string="Stage" icon="terp-crm" domain="[]"
 	                        context="{'group_by':'stage_id'}" />
 	                    <filter string="Priority" icon="terp-crm" domain="[]"
@@ -271,7 +267,7 @@
                         <filter icon="gtk-home" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                            help="Todays's features"
+                            help="Today's features"
                             />
                         <filter icon="gtk-media-rewind"
                             string="    7 Days    " separator="1"
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 5729698392f..5694d33993b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -96,7 +96,50 @@
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+
+						<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+	            		<separator orientation="vertical"/>
+	            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
+	            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
+	            		<separator orientation="vertical"/>
+	            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
+	            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
+	            		<newline/>
+	            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
+	            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+	            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/>
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -127,49 +170,6 @@
                         </group>
 
                    </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-						
-						<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
-	            		<separator orientation="vertical"/>
-	            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
-	            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
-	            		<separator orientation="vertical"/>
-	            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
-	            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
-	            		<newline/>
-	            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
-	            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-	            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/>
-            		
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
                </search>
             </field>
         </record>
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 353fe6c28c1..c48ff73b0f0 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -34,13 +34,11 @@ from tools.translate import _
 
 class project_issue(osv.osv):
     _inherit = 'project.issue'
-
     _columns = {
         'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
-        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
-                                                domain="[('partner_id', '=', partner_id)]",
-                                                required=True),
+        'analytic_account_id': fields.related('project_id','category_id',string='Analytic Account')
     }
+project_issue()
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
@@ -53,10 +51,8 @@ account_analytic_line()
 
 class hr_analytic_issue(osv.osv):
     _inherit = 'hr.analytic.timesheet'
-
     _columns = {
         'issue_id' : fields.many2one('project.issue', 'Issue'),
     }
-
 hr_analytic_issue()
 
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 2ed2e7fbdcc..12171d0a429 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -9,11 +9,11 @@
             <field name="arch" type="xml">
                 <notebook colspan="4">
                     <page string="Worklogs">
-                        <separator string="Timesheets" colspan="4" />
+                        <field name="analytic_account_id" invisible="1"/>
                         <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
                             <tree editable="top" string="Timesheet">
-                                <field name="create_date" string="Date" />
-                                <field name="user_id" readonly="1" />
+                                <field name="date"/>
+                                <field name="user_id"/>
                                 <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 99bce80caca..32945899b30 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -27,13 +27,13 @@
     "depends" : ["project", "resource"],
     "description": """
 
-        Long Term Project management module that track planning, scheduling, resources allocation.
+        Long Term Project management module that tracks planning, scheduling, resources allocation.
         Mainly used with Big project management.
-            - Project Phases will be maintain by Manager of the project
+            - Project Phases will be maintained by Manager of the project
             - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
-                                        If no project given then all the draft,open and pending states phases will be taken
-            - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as arguement and computes all the open,draft and pending tasks
-            - Schedule Tasks: All the tasks which are in draft,pending and open states are scheduled with taking the phase's start date
+                                        If no project given then all the draft,open and pending state phases will be taken
+            - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks
+            - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date
 
     """,
     "init_xml" : [],
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 0a0e92c71e5..95e9099f549 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -33,7 +33,7 @@ class project_phase(osv.osv):
          data_phase = self.browse(cr, uid, ids[0], context=context)
          prev_ids = data_phase.previous_phase_ids
          next_ids = data_phase.next_phase_ids
-         # it should nither be in prev_ids nor in next_ids
+         # it should neither be in prev_ids nor in next_ids
          if (data_phase in prev_ids) or (data_phase in next_ids):
              return False
          ids = [id for id in prev_ids if id in next_ids]
@@ -235,7 +235,7 @@ class project_resource_allocation(osv.osv):
     _columns = {
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
-        'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"),
+        'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
         'useability': 100,
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 6fc07eb9274..7eedf814817 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -230,7 +230,7 @@
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'responsible_id'}"/>
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 22c5097c897..7fd2d0f39f7 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -7,19 +7,19 @@ 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-12-10 21:08+0000\n"
+"PO-Revision-Date: 2010-05-25 15:08+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "Dla każdego produktu o typie usługa i na zamówienie"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_mrptask0
@@ -31,7 +31,7 @@ msgstr "Zadanie"
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procure method is Make to order and supply method is produce"
 msgstr ""
-"Jeśli metoda nabycia jest \"Na zamówienie' i metoda zaopatrzenia jest "
+"Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
 "'Produkcja'"
 
 #. module: project_mrp
@@ -57,29 +57,29 @@ msgstr "Zarządzanie projektami - Integracja ze sprzedażą i MRP"
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procure Task"
-msgstr ""
+msgstr "Utwórz zadanie"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr ""
+msgstr "Utworzono zadanie dla wykonywanej usługi"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
 msgid "Order Task"
-msgstr ""
+msgstr "Zamów zadanie"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
 msgid "Sale Order Task"
-msgstr ""
+msgstr "Zadanie do zamówienia sprzedaży"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
 msgid "Create Task"
-msgstr ""
+msgstr "Utwórz zadanie"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "W przypadku sprzedaży usług na zamówienie sprzedaży"
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index cbc30a912e7..87a68a2e410 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -32,7 +32,7 @@ This module is based on the analytic accounting and is totally integrated with
 * the holidays management
 * the project management
 
-So that, each department manager can know if someone in his team has still unaloccated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
+So that, each department manager can know if someone in his team has still unallocated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
 
 At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
 """,
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 7dbf2195c16..0ebbcd8e519 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -112,11 +112,7 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-<<<<<<< TREE
-                                                        <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
-=======
                                                         <button name="%(project.action_project_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
->>>>>>> MERGE-SOURCE
                                                         <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
 
                                                     </group>
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 4d89af6bb28..80601db9e81 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '0.1',
     'category': 'Generic Modules/Projects & Services',
     'description': """
-        - If deadline date of project is changed will
+        - If deadline date of project is changed 
           then the deadline date for all the tasks will change to the same  """,
     'author': 'Tiny',
     'depends': ['base', 'project'],
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 6d000c26b4f..fcc33100d02 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -7,21 +7,21 @@ 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-09-08 15:12+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-25 15:04+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
 msgid "Project Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy projektu"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
 msgid "Related Timeline Id"
-msgstr ""
+msgstr "ID związanej karty czasu pracy"
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 7093582d7fc..35a7c9f3de6 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -78,7 +78,7 @@
 	            		<field name="project_id" select="1"/>
 	                    <field name="user_id" select="1" widget="selection"/>
                 		<newline/>
-                		<group expand="1" string="Extended options..." colspan="10" col="12">
+                		<group expand="1" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     		<filter icon="terp-project"
                     		string="Very urgent"
                     		domain="[('priority','=','0')]"/>
@@ -96,7 +96,7 @@
                     		domain="[('priority','=','4')]"/>
                 		</group>
 	                    <newline/>
-                		<group expand="1" string="Group By..." colspan="10" col="11">
+                		<group expand="1" string="Group By..." colspan="10" col="11" groups="base.group_extended">
                     		<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
                     		<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
                     		<filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" />
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8f76d4b409b..8aa643d1c43 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -163,7 +163,7 @@
                     <field name="create_uid" select="1" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10">
+                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 49caced7a6b..0cfc357b51f 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -88,7 +88,29 @@
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
+                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
+                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
+                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
+                    <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
+                    <newline/>
+                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
+                </group>
+				<newline/>
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
@@ -113,28 +135,6 @@
  					<newline/>
 					<field name="date"/>
                 </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
-                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
-                    <newline/>
-                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 72f11069fcf..4a4587f5f04 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -127,7 +127,7 @@
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10">
+                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
   					<separator orientation="vertical"/>                    
                     <filter string="Date Start" icon="terp-purchase" domain="[]" context="{'group_by':'date_start'}"/>
diff --git a/addons/report_analytic/i18n/pl.po b/addons/report_analytic/i18n/pl.po
index 906dafc61c1..24bd7fd6d0b 100644
--- a/addons/report_analytic/i18n/pl.po
+++ b/addons/report_analytic/i18n/pl.po
@@ -7,19 +7,19 @@ 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-09-08 16:36+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-25 16:48+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
 #: model:ir.model,name:report_analytic.model_report_analytic_account_close
 msgid "Analytic account to close"
-msgstr ""
+msgstr "Konto analityczne do zamknięcia"
 
 #. module: report_analytic
 #: constraint:ir.model:0
@@ -32,7 +32,7 @@ msgstr ""
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity_max:0
 msgid "Max. Quantity"
-msgstr ""
+msgstr "Maksymalna ilość"
 
 #. module: report_analytic
 #: constraint:ir.ui.view:0
@@ -42,27 +42,27 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #. module: report_analytic
 #: field:report.analytic.account.close,name:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Konto analityczne"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,state:0
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Termin"
 
 #. module: report_analytic
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: report_analytic
 #: model:ir.module.module,shortdesc:report_analytic.module_meta_information
 msgid "Analytic Account Reporting"
-msgstr ""
+msgstr "Raportowanie kont analitycznych"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,partner_id:0
@@ -72,16 +72,16 @@ msgstr ""
 #. module: report_analytic
 #: field:report.analytic.account.close,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: report_analytic
 #: model:ir.actions.act_window,name:report_analytic.action_analytic_account_tree
 #: model:ir.ui.menu,name:report_analytic.menu_action_analytic_account_tree
 #: view:report.analytic.account.close:0
 msgid "Expired analytic accounts"
-msgstr ""
+msgstr "Konta analityczne przeterminowane"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 5fb8f7e564c..de9d3af1e44 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Inventory Control',
     'description': """
     A module that adds intrastat reports.
-    This module gives the details of the goods traded between the countries of Europan Union """,
+    This module gives the details of the goods traded between the countries of European Union """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 8d986aa4c64..3bf58ea034e 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -66,7 +66,7 @@ class report_intrastat(osv.osv):
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'supply_units':fields.float('Supply Units', readonly=True),
         'ref':fields.char('Source document',size=64, readonly=True),
-        'code': fields.char('Country code', size="2", readonly=True),
+        'code': fields.char('Country code', size=2, readonly=True),
         'intrastat_id': fields.many2one('report.intrastat.code', 'Intrastat code', readonly=True),
         'weight': fields.float('Weight', readonly=True),
         'value': fields.float('Value', readonly=True),
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 172d7e23a44..225a6626ab1 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -35,7 +35,7 @@ class resource_calendar(osv.osv):
         'manager' : fields.many2one('res.users', 'Workgroup manager'),
     }
     _defaults = {
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', c)
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=c)
     }
 
     def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False):
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 68cd5ccbe9b..579f6976814 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -14,10 +14,10 @@
                        <field name="name"/>
                        <field name="user_id" string="User" widget="selection"/>
                        <field name="resource_type"/>
-                       <field name="company_id" widget="selection"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
+                   <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
                         <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
@@ -36,7 +36,7 @@
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
                        <field name="manager" widget="selection"/>
-                       <field name="company_id" widget="selection"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                </search>
             </field>
@@ -50,13 +50,14 @@
                 <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
-                       <field name="company_id" string="Company" widget="selection"/>
+                       <field name="company_id" string="Company" widget="selection" />
                        <field name="calendar_id" string="Working Time" widget="selection"/>
                        <field name="resource_id" string="Resource" widget="selection"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter string="Resouce" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
             </field>
@@ -70,7 +71,7 @@
                 <form string="Working Period">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <newline/>
                     <field colspan="4" name="week_id" nolabel="1" widget="one2many_list"/>
                 </form>
@@ -85,7 +86,7 @@
                 <tree string="Working Period">
                     <field name="name"/>
                     <field name="manager" select="1"/>
-                    <field name="company_id" select="1"/>
+                    <field name="company_id" select="1" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -162,11 +163,11 @@
                 <form string="Resource">
                     <field name="name" />
                     <field name="active"/>
-                    <field name="company_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="calendar_id" widget="selection"/>
                     <field name="resource_type" />
                     <field name="user_id" attrs="{'required':[('resource_type','=','user')]}"/>
-                    <field name="time_efficiency" />
+                    <field name="time_efficiency" groups="base.group_extended"/>
                 </form>
             </field>
         </record>
@@ -177,10 +178,10 @@
             <field name="arch" type="xml">
                 <tree string="Resources">
                     <field name="name" />
-                    <field name="company_id" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
                     <field name="calendar_id" />
-                    <field name="time_efficiency" />
+                    <field name="time_efficiency" groups="base.group_extended"/>
                     <field name="user_id" />
                 </tree>
             </field>
@@ -200,7 +201,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Detail">
                     <field name="name"/>
-                    <field name="company_id"  widget="selection"/>
+                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
                     <field name="calendar_id"/>
                     <field name="resource_id"  on_change="onchange_resource(resource_id)"/>
                     <newline/>
@@ -216,7 +217,7 @@
             <field name="arch" type="xml">
                 <tree string="Leave Detail">
                     <field name="name" />
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="calendar_id" />
                     <field name="date_from" />
                     <field name="date_to" />
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index c8b616ced78..e713c479f72 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -36,16 +36,15 @@ class sale_report(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
-        'product_qty':fields.float('Qty', readonly=True),
+        'product_qty':fields.float('# of Qty', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
-        'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
         'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
-        'delay':fields.float('Avg Closing Days', digits=(16,2), readonly=True),
+        'delay':fields.float('Days to Close', digits=(16,2), readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
+        'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
         'state': fields.selection([
             ('draft', 'Quotation'),
@@ -57,12 +56,8 @@ class sale_report(osv.osv):
             ('done', 'Done'),
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True),
-        'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
-        'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact Name', readonly=True),
-        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address Name', readonly=True),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'date_confirm': fields.date('Confirmation Date', readonly=True)
     }
     _order = 'date desc'
     def init(self, cr):
@@ -80,42 +75,32 @@ class sale_report(osv.osv):
                      s.partner_id as partner_id,
                      s.user_id as user_id,
                      s.shop_id as shop_id,
-                     s.fiscal_position as fiscal_position,
-                     s.payment_term as payment_term,
                      s.company_id as company_id,
                      extract(epoch from avg(s.date_confirm-s.create_date))/(24*60*60)::decimal(16,2) as delay,
                      sum(l.product_uom_qty*l.price_unit) as price_total,
                      (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
                      count(*) as nbr,
                      s.state,
-                     s.partner_invoice_id as partner_invoice_id,
-                     s.partner_order_id as partner_order_id,
-                     s.partner_shipping_id as partner_shipping_id,
+                     pt.categ_id,
                      s.pricelist_id as pricelist_id,
-                     s.project_id as analytic_account_id,
-                     s.date_confirm as date_confirm
+                     s.project_id as analytic_account_id
                      from
                  sale_order_line l
-                 left join
-                     sale_order s on (s.id=l.order_id)
-                     left join product_uom u on (u.id=l.product_uom)
+                 left join sale_order s on (s.id=l.order_id)
+                 left join product_uom u on (u.id=l.product_uom)
+                 left join product_template pt on (pt.id=l.product_id)
                  group by
                      s.date_order,
                      s.partner_id,
                      l.product_id,
                      l.product_uom,
                      s.user_id,
+                     pt.categ_id,
                      s.state,
                      s.shop_id,
                      s.company_id,
-                     s.fiscal_position,
-                     s.payment_term,
-                     s.partner_invoice_id,
-                     s.partner_order_id,
-                     s.partner_shipping_id,
                      s.pricelist_id,
-                     s.project_id,
-                     s.date_confirm
+                     s.project_id
             )
         """)
 sale_report()
@@ -212,7 +197,7 @@ class product_bought_by_sale_order(osv.osv):
                 where
                     s.state='manual' or s.state='progress'
                 group by
-                    l.product_id,  to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY') 
+                    l.product_id,  to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY')
             )
         """)
 product_bought_by_sale_order()
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index fe88fa33555..2fca6dedd5a 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -1,35 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+
     <record id="view_order_product_tree" model="ir.ui.view">
         <field name="name">sale.report.tree</field>
         <field name="model">sale.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Sales Orders Statistics">
+            <tree string="Sales Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="shop_id" invisible="1"/>
-                <field name="company_id" invisible="1"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
-                <field name="product_qty" invisible="1"/>
-                <field name="delay" avg="Days to Close"/>
+                <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
+                <field name="product_qty" sum="# of Qty"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
+                <field name="delay" avg="Days to Close"/>
                 <field name="state" invisible="1"/>
-                <field name="fiscal_position" invisible="1"/>
-                <field name="payment_term" invisible="1"/>
-                <field name="partner_invoice_id" invisible="1"/>
-                <field name="partner_order_id" invisible="1"/>
-                <field name="partner_shipping_id" invisible="1"/>
                 <field name="pricelist_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1"/>
-                <field name="date_confirm" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -39,9 +35,10 @@
          <field name="model">sale.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Sales Orders Statistics" type="bar">
+             <graph string="Sales Analysis" type="bar">
                  <field name="product_id"/>
                  <field name="price_total"/>
+                 <field name="state" group="True"/>
              </graph>
          </field>
     </record>
@@ -51,43 +48,58 @@
         <field name="model">sale.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Sale Orders">
+            <search string="Sales Analysis">
             	<group>
-            	    <filter icon="terp-sale" string="This Year"
-	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Tasks performed in this year"/>
-	                <filter icon="terp-sale" string="This Month"
-	                		name="month"
-	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                		help="Tasks performed in this month"/>
+            	    <filter icon="gtk-media-rewind" string="Last 365 Days"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                    help="Tasks performed in last 365 days"/>
+	                <filter icon="gtk-media-rewind" string="Last 30 Days"
+	                	name="month"
+	                	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                	help="Tasks performed in last 30 days"/>
 	                <filter icon="gtk-media-rewind"
-	                        string="    7 Days    "
-	                        separator="1"
-	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                        help="Tasks during last 7 days"/>
+	                     string="    7 Days    "
+	                     separator="1"
+	                     domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                     help="Tasks during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter icon="terp-sale"
-	                    	string="Quotations"
-	                    	domain="[('state','=','draft')]"/>
+	                    string="Quotations"
+	                    domain="[('state','=','draft')]"/>
 	                <filter icon="terp-sale"
-	                		string="Waiting Schedule"
-	                		domain="[('state','=','waiting_date')]"/>
-	                <filter icon="terp-sale"
-	                		string="In progress"
-	                		domain="[('state','=','progress')]"/>
-
+	                	string="Sales"
+	                	domain="[('state','not in',('draft','done','cancel'))]"/>
 	                <separator orientation="vertical"/>
+	                <field name="partner_id"/>
+                    <field name="product_id"/>
 	                <field name="user_id" widget="selection">
 	                    <filter icon="terp-sale"
-	                    		string="sale Non User"
-	                    		help="sale Non User"
-	                    		domain="[('user_id','=',False)]"/>
+                            string="My Sales"
+                            help="My Sales"
+                            domain="[('user_id','=',uid)]"/>
 	                </field>
-	                <field name="partner_id"/>
-	                <field name="product_id"/>
+	                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Group By..." colspan="10" col="12">
+                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
+                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
+                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
+                    <filter string="Category of Product" icon="terp-sale" context="{'group_by':'categ_id'}"/>
+                    <separator orientation="vertical"/>
+					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
+                </group>
+				<newline/>
+                <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
                     <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
                     <filter icon="terp-sale" string="       Invoice Exception      " domain="[('state','=','invoice_except')]"/>
                     <separator orientation="vertical"/>
@@ -110,48 +122,24 @@
                     <field name="date"/>
                     <field name="date_confirm"/>
                 </group>
-                <newline/>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
-                    <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Fiscal Position" icon="terp-sale" context="{'group_by':'fiscal_position'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
-                    <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
-                    <filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
-                    <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
-                    <newline/>
-                    <filter string="Invoice Address Name" icon="terp-sale" context="{'group_by':'partner_invoice_id'}"/>
-                    <filter string="Ordering Contact Name" icon="terp-sale" context="{'group_by':'partner_order_id'}"/>
-                    <filter string="Shipping Address Name" icon="terp-sale" context="{'group_by':'partner_shipping_id'}"/>
-                    <separator orientation="vertical"/>
-					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
-                </group>
             </search>
         </field>
     </record>
 
     <record id="action_order_report_all" model="ir.actions.act_window">
-        <field name="name">Sales Orders</field>
+        <field name="name">Sales Analysis</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_order_product_search"/>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
 
- <!-- This views used in board_sale module -->
-     <record id="view_sale_order_by_clients_tree" model="ir.ui.view">
+    <!--This views used in board_sale module -->
+    <record id="view_sale_order_by_clients_tree" model="ir.ui.view">
         <field name="name">sale.order.by.clients.tree</field>
         <field name="model">sale.order.by.clients</field>
         <field name="type">tree</field>
@@ -216,7 +204,7 @@
         <field name="view_id" ref="view_uninvoiced_lines_per_month_tree"/>
     </record>
 
-       <record id="view_product_bought_by_sale_order_tree" model="ir.ui.view">
+    <record id="view_product_bought_by_sale_order_tree" model="ir.ui.view">
         <field name="name">product.bought.by.sale.order.tree</field>
         <field name="model">product.bought.by.sale.order</field>
         <field name="type">tree</field>
@@ -283,5 +271,6 @@
         <field name="view_mode">tree,graph</field>
         <field name="view_id" ref="view_sales_by_regions_tree"/>
     </record>
+
 </data>
 </openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 272ee0ecd70..43d8d6768cc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -227,7 +227,7 @@ class sale_order(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
         'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}),
         'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
-        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}),
+        'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sale order"),
 
         'incoterm': fields.selection(_incoterm_get, 'Incoterm', size=3),
         'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
@@ -243,7 +243,7 @@ class sale_order(osv.osv):
   - The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
   - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.
   - The 'Invoice from the picking' choice is used to create an invoice during the picking process."""),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current sale order"),
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
@@ -292,7 +292,7 @@ class sale_order(osv.osv):
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
         'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and  self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
-        '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.id,
+#        '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.id,
     }
     _order = 'name desc'
 
@@ -824,7 +824,7 @@ class sale_order_line(osv.osv):
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}),
         'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft':[('readonly',False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
@@ -1036,7 +1036,7 @@ class sale_order_line(osv.osv):
                 if product_obj.uos_id.category_id.id != uos2.category_id.id:
                     uos = False
             else:
-                uos = False        
+                uos = False
         if product_obj.description_sale:
             result['notes'] = product_obj.description_sale
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5add715a0cc..c3a8708decb 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -225,7 +225,7 @@
                                 <separator string="Conditions" colspan="2"/>
                                 <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
-                                <field name="company_id" widget="selection"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Dates" colspan="2"/>
@@ -260,7 +260,7 @@
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11">
+                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
@@ -380,7 +380,8 @@
                             <field name="delay" groups="base.group_extended"/>
                             <field name="price_subtotal"/>
                             <field name="th_weight"/>
-                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                            <separator colspan="4" string="Taxes"/>
+                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
                             <separator colspan="4" string="States"/>
                             <field name="state"/>
                             <group col="2" colspan="2">
@@ -397,12 +398,12 @@
 <!--                        <page string="Properties" groups="base.group_extended">-->
 <!--                            <field name="property_ids" nolabel="1"/>-->
 <!--                        </page>-->
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
                         <page string="Invoice Lines" groups="base.group_extended">
                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                         </page>
+                        <page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -443,10 +444,14 @@
                     <filter icon="terp-purchase" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
-                        separator="1" />
+                        />
                     <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
-                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" 
-                        separator="1" />
+                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
+                        />
+                    <filter icon="terp-purchase" string="Sale Order"
+                        domain="[('state','=','confirmed')]"
+                        name="sale order"
+                        />
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -468,7 +473,6 @@
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
-            <field name="context">{"search_default_uninvoiced":1,"search_default_unshipped":1}</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index b7c5f4fd512..d204d4a3ee5 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -28,7 +28,7 @@
     The sale journal modules allows you to categorise your
     sales and deliveries (picking lists) between different journals.
     This module is very helpful for bigger companies that
-    works by departments.
+    work by departments.
 
     You can use journal for different purposes, some examples:
     * isolate sales of different departments
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index dc903684be6..089e36cb5cd 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.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 10:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-26 07:02+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -25,35 +25,35 @@ msgstr "Sprzedaż miesięczna"
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
 msgid "Assigned packing"
-msgstr ""
+msgstr "Przypisane przesunięcie"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "assigned"
-msgstr "Przypisany"
+msgstr ""
 
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Czeka na planowanie"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "to be invoiced"
-msgstr "do zaksięgowania"
+msgstr ""
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
 #: view:sale_journal.sale.journal:0
 #: field:stock.picking,sale_journal_id:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Dziennik sprzedaży"
 
 #. module: sale_journal
 #: field:sale_journal.sale.journal,sale_stats_ids:0
@@ -64,19 +64,19 @@ msgstr "Statystyki sprzedaży"
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "waiting"
-msgstr "oczekuje"
+msgstr ""
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Set to Draft"
-msgstr "Ustaw na wer.roboczą"
+msgstr "Ustaw na projekt"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date:0
 #: field:sale_journal.sale.journal,date:0
 msgid "Journal date"
-msgstr ""
+msgstr "Data dziennika"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
@@ -88,7 +88,7 @@ msgstr "Metoda pakowania wg faktur"
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
 msgid "Packing Journals"
-msgstr "Dzienniki pakowania"
+msgstr "Dzienniki przesunięć"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
@@ -123,7 +123,7 @@ msgstr "Zarządzanie sprzedażą i dostawami przez dziennik"
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "done"
-msgstr "gotowe"
+msgstr ""
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,price_average:0
@@ -165,7 +165,7 @@ msgstr "Cena całkowita"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
 msgid "Packing journals"
-msgstr "Dzienniki pakowania"
+msgstr "Dzienniki przesunięć"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
@@ -190,27 +190,27 @@ msgstr "Otwarte dzienniki"
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Packing"
-msgstr ""
+msgstr "Lista przesunięć"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and packing."
-msgstr ""
+msgstr "Typ dziennika stosowany do sprzedaży i list przesunięć"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "None"
-msgstr ""
+msgstr "Brak"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
 msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Sprzedaż wg dziennika (bieżący miesiąc)"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ręczne w trakcie przetwarzania"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -218,28 +218,28 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
 msgid "Packing by journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Cancel Packing"
-msgstr ""
+msgstr "Anuluj listę przesunięć"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
 msgid "Confirmed packing"
-msgstr ""
+msgstr "Potwierdzone listy przesunięć"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "In progress"
-msgstr ""
+msgstr "W toku"
 
 #. module: sale_journal
 #: view:sale_journal.picking.stats:0
 msgid "Packing by journals"
-msgstr ""
+msgstr "Listy przesunięć wg dzienników"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,name:0
@@ -258,7 +258,7 @@ msgstr "Stan faktury"
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
 #: view:sale_journal.invoice.type.stats:0
 msgid "Packing by invoice method"
-msgstr ""
+msgstr "Listy przesunięć wg metod faktury"
 
 #. module: sale_journal
 #: field:sale_journal.sale.stats,state:0
@@ -268,7 +268,7 @@ msgstr "Stan zamówienia"
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Wyjątek wysyłki"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -281,7 +281,7 @@ msgstr "Uwaga"
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Draft"
-msgstr "Roboczy"
+msgstr "Projekt"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
@@ -292,7 +292,7 @@ msgstr ""
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Wyjątek faktury"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_validation:0
@@ -309,17 +309,17 @@ msgstr ""
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktywne"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
 msgid "Draft sales"
-msgstr "wer.robocza sprzedaży"
+msgstr "Projekt sprzedaży"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Oferta"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal
@@ -370,7 +370,7 @@ msgstr "Sprzedaż"
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting
 #: view:sale_journal.picking.journal:0
 msgid "Packing Journal"
-msgstr ""
+msgstr "Dziennik list przesunięcia"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
@@ -382,7 +382,7 @@ msgstr "Gotowe"
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anulowano"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,picking_stats_ids:0
@@ -393,7 +393,7 @@ msgstr "Statystyka dziennika"
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otwarte"
 
 #. module: sale_journal
 #: constraint:ir.model:0
@@ -423,7 +423,7 @@ msgstr "Moje otwarte dzienniki"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open
 msgid "Statistics on packing to invoice"
-msgstr ""
+msgstr "Statystyka list przesunięć wg faktur"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
@@ -436,23 +436,23 @@ msgstr "Anuluj sprzedaż"
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr ""
+msgstr "Typ faktury"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "invoiced"
-msgstr "zafakturowano"
+msgstr ""
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "confirmed"
-msgstr "Potwierdzono"
+msgstr ""
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_picking_stats
 msgid "Packing lists by Journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,quantity:0
@@ -483,7 +483,7 @@ msgstr "Metoda fakturowania"
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_this_month
 msgid "This Month"
-msgstr ""
+msgstr "W tym miesiącu"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales
@@ -506,7 +506,7 @@ msgstr "Nie pogrupowane"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open
 msgid "Packing to invoice"
-msgstr ""
+msgstr "Listy przesunięć do zafakturowania"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
@@ -517,7 +517,7 @@ msgstr "Informacja dziennika"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats
 msgid "Stats on packing by invoice method"
-msgstr ""
+msgstr "Statystyka list przesunięć wg metody fakturowania"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
@@ -535,7 +535,7 @@ msgstr "Stany"
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu
 msgid "Packing by Journal"
-msgstr ""
+msgstr "Listy przesunięć wg dziennika"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
@@ -546,7 +546,7 @@ msgstr "Zamknij dziennik"
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice
 msgid "Packing to Invoice"
-msgstr ""
+msgstr "Lista przesunięć do zafakturowania"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
diff --git a/addons/scrum/__openerp__.py b/addons/scrum/__openerp__.py
index 3170baca2a1..2f4007793ac 100644
--- a/addons/scrum/__openerp__.py
+++ b/addons/scrum/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Enterprise Specific Modules/Information Technology',
     'description': """
-    This modules implements all concepts defined by the scrum project
+    This module implements all concepts defined by the scrum project
     management methodology for IT companies:
     * Project with sprints, product owner, scrum master
     * Sprints with reviews, daily meetings, feedbacks
@@ -36,10 +36,10 @@
     * Mid-term, long-term road-map
     * Customers/functional requests VS technical ones
 
-    It also create a new reporting:
+    It also creates a new reporting:
     * Burn-down chart
 
-    The scrum projects and tasks inherits from the real projects and
+    The scrum projects and tasks inherit from the real projects and
     tasks, so you can continue working on normal tasks that will also
     include tasks from scrum projects.
 
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index b9c4e0149b8..107fa97b13c 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -151,7 +151,7 @@
                         <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Sprint" icon="terp-project" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <filter string="Responsible" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 487dbcf55ea..be2ed4bfc55 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -14,8 +14,8 @@
         <page string="Sales &amp; Purchases" position="inside">
           <group colspan="4" col="4" groups="base.group_extended">
             <separator string="Stock Properties" colspan="4"/>
-            <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" />
-            <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]"/>
+            <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" groups="base.group_extended" />
+            <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
           </group>
         </page>
       </field>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index ad189ee546a..dc300994232 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -148,10 +148,10 @@ class product_product(osv.osv):
         return res
 
     def get_product_available(self,cr,uid,ids,context=None):
-        if not context:
+        if context is None:
             context = {}
-        states=context.get('states',[])
-        what=context.get('what',())
+        states = context.get('states',[])
+        what = context.get('what',())
         if not ids:
             ids = self.search(cr, uid, [])
         res = {}.fromkeys(ids, 0.0)
@@ -184,9 +184,9 @@ class product_product(osv.osv):
         # build the list of ids of children of the location given by id
         if context.get('compute_child',True):
             child_location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
-            location_ids= len(child_location_ids) and child_location_ids or location_ids
+            location_ids = child_location_ids or location_ids
         else:
-            location_ids= location_ids
+            location_ids = location_ids
 
         uoms_o = {}
         product2uom = {}
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 3e7fe147c73..81e2bb125fd 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -95,7 +95,7 @@ class stock_report_tracklots(osv.osv):
     }
     
     def init(self, cr):
-        drop_view_if_exists(cr, 'stock_report_prodlots')
+        drop_view_if_exists(cr, 'stock_report_tracklots')
         cr.execute("""
            create or replace view stock_report_tracklots as (
                 
@@ -150,7 +150,7 @@ class report_stock_lines_date(osv.osv):
         'date': fields.datetime('Latest Inventory Date'),
     }
     def init(self, cr):
-        drop_view_if_exists(cr, 'stock_report_prodlots')
+        drop_view_if_exists(cr, 'report_stock_lines_date')
         cr.execute("""
             create or replace view report_stock_lines_date as (
                 select
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 3a7b233504a..673fd14e76e 100755
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -20,7 +20,7 @@
                 <field name="product_uom"/>
                 <field name="state"/>
                 <field name="value"/>
-                
+
            </tree>
         </field>
     </record>
@@ -75,7 +75,7 @@
                     	icon="terp-stock"
                     	domain="[('state','=','done')]"
                     	help = "Completed Stock-Moves"/>
-                    	
+
                 <separator orientation="vertical"/>
                 <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage','=','internal')]"/>
                 <filter icon="terp-stock" string="Scrap Locations" domain="[('location_id.scrap_location','=',1)]"/>
@@ -83,15 +83,8 @@
                 <field name="product_id"/>
                 </group>
                 <newline/>
-                
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                <field name="location_id" widget = "selection"/>
-                <field name="location_dest_id"  widget = "selection"/>
-                <field name="date_planned"/>
-                </group>
-                <newline/>
                 <group expand="1" string="Group By..." >
-             		<filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
                     <filter name="product" string="Product" icon="terp-stock" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
                     <filter name="src_location" string="Source Location" icon="terp-stock" context="{'group_by':'location_id'}"/>
@@ -102,6 +95,13 @@
                     <filter string="Month" icon="terp-stock" context="{'group_by':'date_planned'}"/>
                     <filter string="Year" icon="terp-stock" context="{'group_by':'year'}"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Extended options..."  groups="base.group_extended">
+                <field name="location_id" widget = "selection"/>
+                <field name="location_dest_id"  widget = "selection"/>
+                <field name="date_planned"/>
+                </group>
+
             </search>
         </field>
     </record>
@@ -118,9 +118,9 @@
 	<menuitem
         id="stock.next_id_61"
         name="Reporting"
-        parent="stock.menu_stock_root" groups="base.group_user"/>    
+        parent="stock.menu_stock_root" groups="base.group_user"/>
 
 	<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="5"/>
-	
+
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 62d1b06fd19..c343b09931a 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -54,22 +54,41 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter icon="terp-stock" string="Last 365 Days"
+                   		<filter icon="gtk-media-rewind" string="Last 365 Days"
 	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Picking in last 365 days"/>
-	                	<filter icon="terp-stock" string="Last 30 Days"
+	                	<filter icon="gtk-media-rewind" string="Last 30 Days"
 	                			name="month"
 	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                			help="Picking in last 30 days"/>
+	                	<filter icon="gtk-media-rewind"
+                                string="    7 Days    "
+                                separator="1"
+                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                                help="Picking during last 7 days"/>
                         <separator orientation="vertical"/>
                         <filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
                         <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
 						<separator orientation="vertical"/>
 						<field name="partner_id"/>
-						<field name="company_id" groups="base.group_extended" widget="selection"/>
+						<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                    </group>
                    <newline/>
-                	<group expand="0" string="Extended options..." colspan="10" col="12">
+                   <group expand="1" string="Group By...">
+                        <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-stock" domain="[]" context="{'group_by':'year'}"/>
+                    </group>
+                    <newline/>
+                	<group expand="0" string="Extended options..." groups="base.group_extended">
                 		<field name="type"/>
                 		<separator orientation="vertical"/>
                 		<field name="min_date"/>
@@ -82,20 +101,7 @@
 	                    <separator orientation="vertical"/>
 	                    <field name="date_done"/>
                 	</group>
-                   <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="5">
-                        <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-                    	<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                    	<filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
-                    	<separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
-                    	<filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-stock" domain="[]" context="{'group_by':'year'}"/>
-                    </group>
+
                </search>
             </field>
         </record>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7ef8920f305..fadcd6f77f1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1214,7 +1214,7 @@ class stock_move(osv.osv):
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
 
         'date': fields.datetime('Created Date'),
-        'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
+        'date_planned': fields.datetime('Date Planned', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5cb543b748e..970c55f9bd8 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,7 +55,7 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="4">
+                    <group expand="1" string="Group By..." colspan="4" col="4" groups="base.group_extended">
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -341,7 +341,7 @@
                     <field name="location_dest_id" />
                     <field name="date" />
                     <field name="date_planned" string="Date"/>
- 					<field name="date_expected" string="Date Expected"/>                    
+                     <field name="date_expected" string="Date Expected"/>                    
                     <field name="state"/>
                 </tree>
             </field>
@@ -652,7 +652,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
- 											<field name="date_expected" string="Date Expected"/>                                            
+                                             <field name="date_expected" string="Date Expected"/>                                            
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
@@ -738,7 +738,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-		    		<field name="address_id"/>
+                    <field name="address_id"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -777,7 +777,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
- 									<field name="date_expected" string="Date Expected"/>                                    
+                                     <field name="date_expected" string="Date Expected"/>                                    
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -804,7 +804,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
- 											<field name="date_expected"  string="Date Expected"/>                                            
+                                             <field name="date_expected"  string="Date Expected"/>                                            
                                             <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -957,7 +957,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date_planned"/>
- 									<field name="date_expected" string="Date Expected"/>                                    
+                                     <field name="date_expected" string="Date Expected"/>                                    
                                     <field name="state"/>
                                     <button
                                            name="%(stock.track_line)d"
@@ -984,7 +984,7 @@
                                             <field colspan="4" invisible="1" name="name"/>
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
- 											<field name="date_expected"  string="Date Expected"/>                                            
+                                             <field name="date_expected"  string="Date Expected"/>                                            
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <field name="prodlot_id" groups="base.group_extended"
                                                 context="{'location_id':location_id, 'product_id':product_id}"
@@ -1159,7 +1159,7 @@
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field colspan="4" invisible="1" name="name" />
                                             <field groups="base.group_extended" name="date_planned"/>
- 											<field name="date_expected" groups="base.group_extended" string="Date Expected"/>                                            
+                                             <field name="date_expected" groups="base.group_extended" string="Date Expected"/>                                            
                                             <newline/>
                                             <newline/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
@@ -1225,7 +1225,7 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
-                    	<filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <separator orientation="vertical" />
@@ -1286,7 +1286,7 @@
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-						<filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
                     </group>
@@ -1312,18 +1312,16 @@
             <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancel');red:date_planned > current_date" string="Moves">
-                    <field name="name" string="Move Name"/>
+                <tree colors="grey:state in ('cancel');red:(state not in ('cancel','done')) and date_planned > current_date" string="Moves">
+                    <field name="picking_id" select="1"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-    		    <field name="product_uom" string="Unit Of Measure"/>
-                    <field name="picking_id" select="1"/>
-
+                    <field name="product_uom" string="Unit Of Measure"/>
                     <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
-					<field name="date_expected"/>              
+                    <field name="date_expected"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -1362,7 +1360,7 @@
                                 <separator string="Dates &amp; Priority" colspan="2" />
                                 <field name="date"/>
                                 <field name="date_planned"/>
-								<field name="date_expected"/>                                
+                                <field name="date_expected"/>                                
                                 <field name="priority"/>
                             </group>
 
@@ -1395,31 +1393,39 @@
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>
             <field name="type">search</field>
-            <field eval="6" name="priority"/>
+            <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" name="Available" domain="[('state','=','assigned')]" help="Available"/>
+                        <filter icon="terp-stock" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves"/>
+                        <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future stock moves"/>
+                        <filter icon="terp-stock" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
-                        <field name="location_id"/>
-                        <field name="location_dest_id"/>
+                        <field name="location_id" string="Location" domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
+                        <field name="address_id" string="Partner" context="{'contact_display':'partner'}" domain="[('picking_id.address_id','ilike',self)]"/>
+                        <field name="date_planned"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
-                    	<filter icon="terp-stock" string="Inventory" domain="[]" context="{'group_by':'name'}" />
-                    	<filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Source Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                        <filter string="Dest. Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Product" name="by_product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
+                        <filter string="Lot" name="prodlot_id" icon="terp-stock" domain="[]"  context="{'group_by':'prodlot_id'}"/>
+                        <filter string="Packing" name="picking_id" icon="terp-stock" domain="[]"  context="{'group_by':'picking_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Source" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                        <filter string="Destination" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Creation" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Expected" icon="terp-stock" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                 </search>
             </field>
         </record>
 
         <record id="action_move_form2" model="ir.actions.act_window">
-            <field name="name">All Moves</field>
+            <field name="name">Stock Moves</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1611,10 +1617,10 @@
             src_model="stock.location"/>
 
         <act_window
-            context="{'location': active_id}"
+            context="{'location': active_id, 'search_default_done': 1}"
             domain="[('product_id','=',active_id)]"
             id="act_product_stock_move_open"
-            name="All Stock Moves"
+            name="Stock Moves"
             res_model="stock.move"
             src_model="product.product"/>
 
@@ -1626,7 +1632,7 @@
             src_model="stock.move"/>
 
         <act_window
-            context="{'location': active_id}"
+            context="{'location': active_id, 'search_default_future': 1}"
             domain="[('product_id','=',active_id),('state','in',('waiting','confirmed','assigned'))]"
             id="act_product_stock_move_futur_open"
             name="Future Stock Moves"
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index 1ff4e8d0b10..100e793805b 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -38,7 +38,7 @@ Because we have another module sale_forecast which uses terms "Sales Forecast" a
 
 Activity with this module is divided to three steps:
 - Creating Periods. Mandatory step.
-- Creating Sale Forecasts and entering quantities to them. Optional step but useful for farther planning.
+- Creating Sale Forecasts and entering quantities to them. Optional step but useful for further planning.
 - Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period.
 
 Periods
@@ -52,7 +52,7 @@ Creating periods is the first step you have to do to use modules features. You c
 Remarks:
 - These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system.
 - Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods.
-- When periods are created automatically their start and finish dates are with with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. 
+- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. 
 - If you use overlapping periods for the same product, warehouse and company results can be unpredictable.
 - If current date doesn't belong to any period or you have holes between periods results can be unpredictable.
 
@@ -65,13 +65,13 @@ You have few menus for Sales forecast in "Sales Management - Sales Forecasts".
 Menu "Create Sales Forecasts for Sales Periods" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. It is an option "Copy Last Forecast" to copy forecast and other settings of period before this one to created one.
 
 Remarks:
-- This tool doesn't create lines if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast if relevant lines exists you have to do it manually using menus described bellow.
+- This tool doesn't create lines, if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast, if relevant lines exists you have to do it manually using menus described bellow.
 - When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. 
 - When you choose "Copy Last Forecast" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them).
 
 
 Menus "Sales Forecasts"
-On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". Farther calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click "Validate" button but it is not mandatory.
+On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". Further calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click "Validate" button but it is not mandatory.
 
 Instead of forecast quantity you can enter amount of forecast sales in field "Product Amount". System will count quantity from amount according to Sale price of the Product.
 
@@ -94,7 +94,7 @@ Menu "Create Stock Planning Lines" allows you to create quickly Planning lines f
 
 Under menu "Master Procurement Scheduler" you can generally change the values "Planned Out" and "Planned In" to observe the field "Stock Simulation" and decide if this value would be accurate for end of the Period. 
 "Planned Out" can be based on "Warehouse Forecast" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. 
-"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the and of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only".
+"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the end of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only".
 
 If after few tries you decide that you found correct quantities for "Planned Out" and "Planned In" and you are satisfied with end of period stock calculated in "Stock Simulation" you can click "Procure Incoming Left" button to procure quantity of field "Incoming Left" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. 
 
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index ecca1a5cb35..d662d72da64 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-20 15:53+0000\n"
+"PO-Revision-Date: 2010-05-25 17:33+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-05-27 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -83,7 +83,7 @@ msgstr "Pola dokumentu subskrypcji"
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
 msgid "Interval Qty"
-msgstr ""
+msgstr "Il. interwał"
 
 #. module: subscription
 #: view:subscription.subscription:0
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index ee4099828f2..47840d7082f 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Tools',
     'description': """
-    This module is used for surveing. It depends on the answers or reviews of some questions by different users.
+    This module is used for surveying. It depends on the answers or reviews of some questions by different users.
     A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers.
     Different users may give different answers of question and according to that survey is done. 
     Partners are also sent mails with user name and password for the invitation of the survey