[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20120625105833-yx7rn4ggvbiwpmlc
author: Atul Patel (OpenERP) <atp@tinyerp.com> 2012-06-25 16:28:33 +0530
committer: Atul Patel (OpenERP) <atp@tinyerp.com> 2012-06-25 16:28:33 +0530
commit: eaa3f47b92f82d9e032bd905bfdff9430fc957c5 (patch)
tree: a068b92f1eac78a5934b0e25e5f240d1a710d8de
parent: af8c698b46217d6aad7dc5d8f4b2027b93b9092f (diff)
parent: 0a22debf5fb7af0dbf4ebf5039aa6ecbfb054a95 (diff)
445 files changed, 12129 insertions, 8039 deletions
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 58a1abac364..68a723aa4a0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -405,23 +405,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                   <group>
+                    <group>
+                        <field name="number"
+                            string="Invoice"
+                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
-                        <field name="number"
-                            string="Reference"
-                            filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                        <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
-                        <field name="user_id" widget="selection" string="Salesperson">
-                            <filter domain="[('user_id','=',uid)]" help="My invoices" icon="terp-personal" />
-                        </field>
-                    </group>
-                    <newline/>
-                    <group>
+                        <field name="user_id" widget="selection" string="Salesperson"/>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id" string="Period"/>
                     </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d8959b896f6..ab46f7519f8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -65,11 +65,11 @@
             <field name="arch" type="xml">
                 <search string="Search Fiscalyear">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
                         <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="state"/>
                     </group>
                     <newline/>
@@ -141,10 +141,9 @@
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <group>
-                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <filter string="To Close" name="draft" domain="[('state','=','draft')]" icon="terp-dialog-close"/>
                     </group>
                 </search>
             </field>
@@ -217,11 +216,11 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="user_type"/>
                     </group>
                     <newline/>
@@ -379,7 +378,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal View">
-                    <field name="name"/>
+                    <field name="name" string="Journal View"/>
                 </search>
             </field>
         </record>
@@ -440,13 +439,13 @@
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
+                    <separator orientation="vertical"/>
                     <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-camera_test"/>
                     <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
-                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+                    <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="user_id"/>
                     </group>
                     <newline/>
@@ -521,12 +520,14 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name" string="Bank Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" name="state_draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
                         <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id" widget='selection' domain="[('type', '=', 'cash')]" />
                     </group>
                     <newline/>
@@ -564,11 +565,13 @@
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <group>
+                        <field name="name" string="Bank Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="date"/>
                         <field name="period_id"/>
                         <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]" />
                     </group>
@@ -693,8 +696,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Type">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Type"/>
                 </search>
             </field>
         </record>
@@ -794,8 +796,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Tax Code">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Code"/>
                     <field name="parent_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
@@ -881,8 +882,7 @@
             <field name="arch" type="xml">
                 <search string="Search Taxes">
                     <group>
-                        <field name="name"/>
-                        <field name="description"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </search>
@@ -1147,6 +1147,8 @@
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
@@ -1158,15 +1160,11 @@
                             domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help="Unreconciled Journal Items"
                             name="unreconciled"/>
                         <separator orientation="vertical"/>
+                        <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                        <separator orientation="vertical"/>
                         <field name="move_id" string="Number (Move)"/>
-                        <field name="date"/>
                         <field name="account_id"/>
-                        <field name="partner_id">
-                            <filter help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
-                        </field>
-                    </group>
-                    <newline/>
-                    <group>
+                        <field name="partner_id"/>
                         <field name="journal_id" widget="selection" context="{'journal_id':self}"/>
                         <field name="period_id" context="{'period_id':self}"/>
                     </group>
@@ -1392,18 +1390,16 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('to_check','=',True)]" help="Journal Entries to Review"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="partner_id"/>
-                        <field name="date"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection"/>
                         <field name="period_id"/>
                     </group>
@@ -1622,17 +1618,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
-                  <group>
-                    <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
-                    <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
-                    <separator orientation="vertical"/>
-                      <field name="name"/>
-                      <field name="journal_id" widget="selection"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <group>
+                        <field name="name" string="Journal Entry Model"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
+                        <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
                 </search>
             </field>
@@ -1715,7 +1712,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
-                    <field name="name"/>
+                    <field name="name" string="Payment Term"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -1801,12 +1798,14 @@
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
                     <group>
+                        <field name="name" string="Account Subscription"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                         <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="model_id"/>
-                        <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -2072,14 +2071,14 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
-                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
+                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                        <separator orientation="vertical"/>
                         <field name="parent_id"/>
-                        <field name="type"/>
                         <field name="user_type"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -2140,13 +2139,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
-                      <group>
-                          <field name="name"/>
+                    <group>
+                        <field name="name" string="Account Template"/>
+                        <separator orientation="vertical"/>
                         <field name="account_root_id"/>
                         <field name="bank_account_view_id"/>
-                      </group>
-                      <newline/>
-                      <group expand="0" string="Group By...">
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
                         <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
                         <separator orientation="vertical"/>
@@ -2155,7 +2155,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
                         <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
-                      </group>
+                    </group>
                 </search>
             </field>
         </record>
@@ -2262,11 +2262,11 @@
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
                         <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="description"/>
                         <field name="chart_template_id"/>
                     </group>
                 </search>
@@ -2305,8 +2305,7 @@
             <field name="arch" type="xml">
                 <search string="Search tax template">
                     <group>
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
                         <field name="parent_id"/>
                     </group>
                     <newline/>
@@ -2457,7 +2456,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fiscal Position">
-                    <field name="name"/>
+                    <field name="name" string="Fiscal Position Template"/>
                 </search>
             </field>
         </record>
@@ -2747,9 +2746,10 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <group>
-                        <field name="name"/>
-                        <field name="type"/>
+                        <field name="name" string="Account Report"/>
+                        <separator orientation="vertical"/>
                         <field name="account_report_id"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 0f01be87a26..913e43e5982 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -1,38 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="action_aged_receivable" model="ir.actions.act_window">
-            <field name="name">Receivable Accounts</field>
-            <field name="res_model">report.account.receivable</field>
+
+        <record id="action_company_analysis_tree" model="ir.actions.act_window">
+            <field name="name">Company Analysis</field>
+            <field name="res_model">account.entries.report</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','receivable')]</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="account.view_account_entries_report_tree"/>
+            <field name="domain">[('year','=',time.strftime('%Y'))]</field>
         </record>
-        <record id="action_aged_income" model="ir.actions.act_window">
-            <field name="name">Income Accounts</field>
-            <field name="res_model">report.account.receivable</field>
+
+        <record id="action_treasory_graph" model="ir.actions.act_window">
+            <field name="name">Treasury</field>
+            <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','income')]</field>
+            <field name="domain">[('type','=','liquidity')]</field>
+            <field name="context">{'default_type': 'liquidity'}</field>
+            <field name="view_id" ref="account.view_treasory_graph"/>
         </record>
-      <record id="action_company_analysis_tree" model="ir.actions.act_window">
-          <field name="name">Company Analysis</field>
-          <field name="res_model">account.entries.report</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">tree,graph</field>
-          <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
-          <field name="view_id" ref="account.view_account_entries_report_tree"/>
-          <field name="domain">[('year','=',time.strftime('%Y'))]</field>
-      </record>
-      <record id="action_treasory_graph" model="ir.actions.act_window">
-          <field name="name">Treasury</field>
-          <field name="res_model">account.account</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>
-          <field name="domain">[('type','=','liquidity')]</field>
-          <field name="context">{'default_type': 'liquidity'}</field>
-          <field name="view_id" ref="account.view_treasory_graph"/>
-      </record>
+
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -45,7 +34,7 @@
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
                         <column>
-                            <action name="%(action_treasory_graph)d" string="Treasury"/> <!--groups="account.group_account_manager,account.group_account_user"-->
+                            <action name="%(action_treasory_graph)d" string="Treasury"/>
                         </column>
                     </board>
                 </form>
@@ -53,7 +42,7 @@
         </record>
 
         <record id="open_board_account" model="ir.actions.act_window">
-            <field name="name">Accounting Dashboard</field>
+            <field name="name">Accounting</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -61,8 +50,12 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
-        <menuitem id="menu_dashboard_acc" name="Accounting" sequence="30" parent="base.menu_reporting_dashboard" groups="group_account_user,group_account_manager"/>
-        <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
+        <menuitem id="menu_board_account"
+                  action="open_board_account" 
+                  icon="terp-graph"  
+                  parent="base.menu_reporting_dashboard" 
+                  groups="group_account_user,group_account_manager" 
+                  sequence="45"/>
 
     </data>
 </openerp>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index e07cc98e5e2..b092b3a2f8c 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -169,11 +169,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -627,18 +622,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
 msgstr ""
@@ -1558,11 +1541,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid "Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice."
 msgstr ""
@@ -2545,13 +2523,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -5909,11 +5880,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6412,11 +6378,6 @@ msgid "You can specify year, month and date in the name of the model using the f
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 06c1b29e391..1b7cde8d05f 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -182,11 +182,6 @@ msgid "All Analytic Entries"
 msgstr "كل القيود التحليلية"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "الفواتير التي تم أنشاءها خلال 15 يوما الماضية"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "عمود الأسماء"
@@ -689,18 +684,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "الشركة يجب ان تكون واحدة لجميع المدخلات حتى يمكن تسويتها"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "حسابات مدينة"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1679,11 +1662,6 @@ msgid "Responsible"
 msgstr "مسئول"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "المبيعات حسب نوع الحساب"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2765,13 +2743,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "المبيعات بعرض الحسابات"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "سيقوم هذا المعالج بإنشاء قيود محاسبية تكرارية"
@@ -6374,11 +6345,6 @@ msgid "Supplier Refund"
 msgstr "رد للمورد"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "اللوحة الرئيسية"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "سطور القيود"
@@ -6943,11 +6909,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "حسابات الدخل"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "مرجع الوثيقة التي انتجت تقرير الفاتورة هذا."
@@ -10815,6 +10776,9 @@ msgstr ""
 #~ msgid "Accounting Entries-"
 #~ msgstr "المدخلات المحاسبية -"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "الفواتير التي تم أنشاءها خلال 15 يوما الماضية"
+
 #~ msgid "Negative"
 #~ msgstr "سالب"
 
@@ -10913,6 +10877,9 @@ msgstr ""
 #~ "Check this if the user is allowed to reconcile entries in this account."
 #~ msgstr "علم علي هذه لو أن هذا المستخدم لتسوية قيود هذا الحساب."
 
+#~ msgid "Sales by Account"
+#~ msgstr "المبيعات بعرض الحسابات"
+
 #~ msgid "Reference Number"
 #~ msgstr "رقم المرجع"
 
@@ -10949,6 +10916,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "ذهاب للشريك التالي"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "المبيعات حسب نوع الحساب"
+
 #, python-format
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "يجب إعطاء حساب لقيود الإعدام !"
@@ -11098,6 +11068,10 @@ msgstr ""
 #~ msgid "Aged Receivables"
 #~ msgstr "الديون المشكوك في تحصيلها"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "حسابات مدينة"
+
 #~ msgid "Net Profit"
 #~ msgstr "صافي الربح"
 
@@ -11226,6 +11200,9 @@ msgstr ""
 #~ msgid "7"
 #~ msgstr "٧"
 
+#~ msgid "Dashboard"
+#~ msgstr "اللوحة الرئيسية"
+
 #, python-format
 #~ msgid "Unable to find a valid period !"
 #~ msgstr "غير قادر على العثور على فترة صالحة!"
@@ -11280,6 +11257,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "تقرير حساب الأرباح و الخسائر"
 
+#~ msgid "Income Accounts"
+#~ msgstr "حسابات الدخل"
+
 #~ msgid "Period length (days)"
 #~ msgstr "مدة الفتر (أيام)"
 
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 0f67e7c85b0..fea3ae7a3fa 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -187,11 +187,6 @@ msgid "All Analytic Entries"
 msgstr "Всички аналитични записи"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Фактури създадени през последните 15 дни"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -699,18 +694,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Приходни сметки"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1705,11 +1688,6 @@ msgid "Responsible"
 msgstr "Отговорник"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Продажби по вид сметка"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2772,13 +2750,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Продажби по сметка"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Този помощник ще създаде повтарящи се счетоводни записи"
@@ -6323,11 +6294,6 @@ msgid "Supplier Refund"
 msgstr "Обезщетение на доставчик"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Табло"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Редове на запис"
@@ -6884,11 +6850,6 @@ msgstr ""
 "Напр. Мой модел от %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Приходни сметки"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11312,6 +11273,10 @@ msgstr ""
 #~ "Натиснета на Изчисляване за обновяване на базата на данъка"
 
 #, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Приходни сметки"
+
+#, python-format
 #~ msgid ""
 #~ "Selected Move lines does not have any account move enties in draft state"
 #~ msgstr ""
@@ -11433,6 +11398,9 @@ msgstr ""
 #~ msgid "Compute Code for Taxes included prices"
 #~ msgstr "Изчисляващ код за данъци, включени в цените"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Фактури създадени през последните 15 дни"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11488,6 +11456,9 @@ msgstr ""
 #~ msgid "Your Reference"
 #~ msgstr "Ваша референция"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Продажби по вид сметка"
+
 #, python-format
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Сметката не е посочена за равняване!"
@@ -11515,6 +11486,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Грешка! Не може да създавате рекурсивни категории"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Продажби по сметка"
+
 #~ msgid "Total :"
 #~ msgstr "Общо :"
 
@@ -11570,6 +11544,9 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Вид обезщетение"
 
+#~ msgid "Dashboard"
+#~ msgstr "Табло"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  оценка: процент"
 
@@ -11577,6 +11554,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "Текущата валута не е настроена правилно!"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Приходни сметки"
+
 #~ msgid "Display accounts"
 #~ msgstr "Показване на сметки"
 
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index 3531bec68e1..2a909753cba 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "An holl enmontoù analitek"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 9aa53c36952..0081ad0211d 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -180,11 +180,6 @@ msgid "All Analytic Entries"
 msgstr "Sve analitičke stavke"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Fakture unesene u zadnjih 15 dana"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -670,18 +665,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Potražni računi"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1643,11 +1626,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2702,13 +2680,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6239,11 +6210,6 @@ msgid "Supplier Refund"
 msgstr "Povrat dobavljaču"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Stavke unosa"
@@ -6787,11 +6753,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konta prihoda"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11177,6 +11138,10 @@ msgstr ""
 #~ msgid "Control Invoice"
 #~ msgstr "Kontroliraj fakturu"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Potražni računi"
+
 #~ msgid "Date payment"
 #~ msgstr "Datum plaćanja"
 
@@ -11680,9 +11645,15 @@ msgstr ""
 #~ msgid "The sequence used for invoice numbers in this journal."
 #~ msgstr "Sekvence korištene za brojeve faktura u ovoj knjizi."
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konta prihoda"
+
 #~ msgid "Year :"
 #~ msgstr "Godina :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Fakture unesene u zadnjih 15 dana"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta po vrstama"
 
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 27cc1c853ae..05206357deb 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -182,11 +182,6 @@ msgid "All Analytic Entries"
 msgstr "Tots els assentaments analítics"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Factures creades en els últims 15 dies"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -699,18 +694,6 @@ msgstr ""
 "els assentaments"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Comptes a cobrar"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1696,11 +1679,6 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendes per tipus de compte"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2804,13 +2782,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendes per compte"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Aquest assistent crearà assentaments comptables recursius"
@@ -6449,11 +6420,6 @@ msgid "Supplier Refund"
 msgstr "Factura rectificativa (abonament) de proveïdor"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Taulell"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Línies d'assentament"
@@ -7035,11 +7001,6 @@ msgstr ""
 "Exemple: El meu model a %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Comptes d'ingressos"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referència del document que ha generat aquest informe de factura."
@@ -11806,6 +11767,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Cost i retorn del compte per diari (aquest mes)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Comptes a cobrar"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Obre per trencar conciliació"
 
@@ -12508,6 +12473,12 @@ msgstr ""
 #~ msgid "You cannot remove an account which has account entries!. "
 #~ msgstr "No podeu eliminar un compte que conté assentaments comptables. "
 
+#~ msgid "Income Accounts"
+#~ msgstr "Comptes d'ingressos"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Factures creades en els últims 15 dies"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Comptes per tipus"
 
@@ -12574,6 +12545,9 @@ msgstr ""
 #~ "Valors deure o haver incorrectes en el model (deure + haver ha de ser major "
 #~ "que \"0\")!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendes per tipus de compte"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Error! No podeu definir exercicis fiscals que es superposin"
 
@@ -12606,6 +12580,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Test codi impost"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendes per compte"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -12723,6 +12700,9 @@ msgstr ""
 #~ "No s'ha trobat un pla comptable per a aquesta companyia. Creeu un pla "
 #~ "comptable."
 
+#~ msgid "Dashboard"
+#~ msgstr "Taulell"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  valoració: percentatge"
 
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 6d88ff64d0a..3d04d7a944d 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account
@@ -184,11 +184,6 @@ msgid "All Analytic Entries"
 msgstr "Všechny analytické záznamy"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktury vytvořené v posledních 15 dnech"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Označení sloupce"
@@ -694,18 +689,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Při likvidaci záznamů by u všech měla být stejná firma"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Pohledávky"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1680,11 +1663,6 @@ msgid "Responsible"
 msgstr "Odopovědné"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Prodeje dle typu účtu"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2753,13 +2731,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Nastavit vaši účtovou osnovu"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Prodeje dle účtu"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Průvodce vytvoří opakující se účetní položky"
@@ -6303,11 +6274,6 @@ msgid "Supplier Refund"
 msgstr "Dobropis dodavatele"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Nástěnka"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Řádky položek"
@@ -6856,11 +6822,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Příjmové účty"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Odkaz na dokumenty, které generovaly tento výkaz faktury."
@@ -10834,6 +10795,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Jít na dalšího partnera"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Prodeje dle typu účtu"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Včetně počátečních zůstatků"
 
@@ -10879,6 +10843,9 @@ msgstr ""
 #~ "Nemůžete změnit společnost tohoto deníku, protože vztažené záznamy existují "
 #~ "v řádcích položek"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Prodeje dle účtu"
+
 #~ msgid "Reference Number"
 #~ msgstr "Referenční číslo"
 
@@ -10983,6 +10950,9 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Typ úhrady"
 
+#~ msgid "Dashboard"
+#~ msgstr "Nástěnka"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Výkaz účtu zisku a ztrát"
 
@@ -10990,6 +10960,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "Aktuální měna není správně nastavena !"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Příjmové účty"
+
 #~ msgid "9"
 #~ msgstr "9"
 
@@ -11119,6 +11092,9 @@ msgstr ""
 #~ "Výkaz zisku a ztráty Vám dá přehled o zisku či ztrátě společnosti v jediném "
 #~ "dokumentu"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktury vytvořené v posledních 15 dnech"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -11158,6 +11134,10 @@ msgstr ""
 #~ msgstr "konečný zůstatek zadaný ověřovatelem pokladny"
 
 #, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Pohledávky"
+
+#, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Nesprávný zůstatek výpisu!\n"
 
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 538edc84e1a..6592fbeb4ed 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "Alle analytiske poster"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -667,18 +662,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1640,11 +1623,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2695,13 +2673,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6221,11 +6192,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6765,11 +6731,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 010d9573f09..d861aa73278 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -187,11 +187,6 @@ msgid "All Analytic Entries"
 msgstr "Alle Analytischen Buchungen"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Rechnungen der letzten 15 Tage"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Spaltenbeschriftung"
@@ -716,18 +711,6 @@ msgstr ""
 "Buchungen identisch sein"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debitorenkonten"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1736,11 +1719,6 @@ msgid "Responsible"
 msgstr "Mitarbeiter"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Verkäufe nach Kontotypen"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2865,13 +2843,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Konfigurieren Sie Ihren Kontenplan"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Verkäufe nach Konten"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Diese Assistent erzeugt wiederkehrende Buchungen."
@@ -6583,11 +6554,6 @@ msgid "Supplier Refund"
 msgstr "Lieferanten Gutschrift"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Pinnwand"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Buchungspositionen"
@@ -7179,11 +7145,6 @@ msgstr ""
 "z.B.  Meine Buchungsvorlage am %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Ertragskonten"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Belegreferenz für diese Rechnung"
@@ -12615,12 +12576,18 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Beleg OP-Ausgleich"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Ertragskonten"
+
 #~ msgid "Total :"
 #~ msgstr "Summe :"
 
 #~ msgid "Year :"
 #~ msgstr "Jahr"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Rechnungen der letzten 15 Tage"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konten nach Typ"
 
@@ -12713,6 +12680,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Gehe zu nächstem Partner"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Verkäufe nach Kontotypen"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Fehler ! Sie können keine Überschneidungen bei Geschäftsjahren haben"
 
@@ -12764,6 +12734,9 @@ msgstr ""
 #~ "Sie können das zugewiesene Unternehmen bei einem Journal nicht ändern, da es "
 #~ "bereits abhängige Daten in vorhandenen Journalen gibt."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Verkäufe nach Konten"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -12949,6 +12922,9 @@ msgstr ""
 #~ "Es konnte kein Kontenplan für dieses Unternehmen gefunden werden. Bitte "
 #~ "definieren Sie ein Konto."
 
+#~ msgid "Dashboard"
+#~ msgstr "Pinnwand"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Auswertung Gewinn und Verlust"
 
@@ -13214,6 +13190,10 @@ msgstr ""
 #~ "Sie können kein Konto löschen, ohne dabei auch vorher die jeweiligen "
 #~ "Buchungszeilen zu löschen, wenn dieses vor dem neuen Sinnvoll ist. "
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debitorenkonten"
+
 #~ msgid "Tax codes"
 #~ msgstr "Umsatzsteuererklärung"
 
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 0359af49415..20d991c7404 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -185,11 +185,6 @@ msgid "All Analytic Entries"
 msgstr "Όλες οι εγγραφές αναλυτικής"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Τιμολόγια που εκδόθηκαν τις τελευταίες 15 μέρες"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Ετικέτα Στήλης"
@@ -701,18 +696,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Λογαριασμοί Εισπρακτέοι"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1677,11 +1660,6 @@ msgid "Responsible"
 msgstr "Υπεύθυνος"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Πωλήσεις Τύπο Λογαριασμού"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2740,13 +2718,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6290,11 +6261,6 @@ msgid "Supplier Refund"
 msgstr "Επιστροφή Χρημάτων από Προμηθευτή"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Γραμμές εγγραφής"
@@ -6838,11 +6804,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Λογαριασμοί Εσόδων"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11566,6 +11527,10 @@ msgstr ""
 #~ msgid "Modify Invoice"
 #~ msgstr "Τροποποίηση Τιμολογίου"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Λογαριασμοί Εισπρακτέοι"
+
 #~ msgid "OK"
 #~ msgstr "OK"
 
@@ -12040,12 +12005,18 @@ msgstr ""
 #~ "Αν είναι λογαριασμός φόρου εδώ θα περιέχει το ποσό μετά τον φόρο, αν είναι "
 #~ "λογαριασμός βάσης του φόρου θα περιέχει το αφορολόγητο ποσό."
 
+#~ msgid "Income Accounts"
+#~ msgstr "Λογαριασμοί Εσόδων"
+
 #~ msgid "Total :"
 #~ msgstr "Σύνολο:"
 
 #~ msgid "Year :"
 #~ msgstr "Έτος :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Τιμολόγια που εκδόθηκαν τις τελευταίες 15 μέρες"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Λογαριασμοί με βάση τον τύπο"
 
@@ -12086,6 +12057,9 @@ msgstr ""
 #~ msgid "Anglo-Saxon Accounting"
 #~ msgstr "Αγγλο- Σαχονικό Σύστημα Λογιστικής"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Πωλήσεις Τύπο Λογαριασμού"
+
 #~ msgid "Voucher Management"
 #~ msgstr "Διαχείριση παραστατικών"
 
diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po
index f7d3c66b3fe..124c69b0cda 100644
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgid "All Analytic Entries"
 msgstr "All Analytic Entries"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Invoices Created Within Past 15 Days"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -694,18 +689,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "To reconcile the entries company should be the same for all entries"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Accounts Receivable"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1667,11 +1650,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2721,13 +2699,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6262,11 +6233,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Entry lines"
@@ -6808,11 +6774,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10530,6 +10491,9 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Negative"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Invoices Created Within Past 15 Days"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -10561,6 +10525,10 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "closing balance entered by the cashbox verifier"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Accounts Receivable"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Invalid model name in the action definition."
 
diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po
index 71795b7b819..cfc2573763b 100644
--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2690,13 +2668,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6208,11 +6179,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6752,11 +6718,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 49b4c7f6c66..4332daeac45 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -187,11 +187,6 @@ msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Etiqueta de columna"
@@ -713,18 +708,6 @@ msgstr ""
 "asientos"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas a cobrar"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1727,11 +1710,6 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2855,13 +2833,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Configure su plan de cuentas"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará asientos contables recurrentes"
@@ -6550,11 +6521,6 @@ msgid "Supplier Refund"
 msgstr "Factura rectificativa de proveedor"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Apuntes"
@@ -7143,11 +7109,6 @@ msgstr ""
 "Ejemplo: Mi modelo del %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referencia del documento que ha generado este informe de factura."
@@ -12087,6 +12048,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Costo y retorno de la cuenta por diario (este mes)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas a cobrar"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Abrir para romper conciliación"
 
@@ -12632,12 +12597,18 @@ msgstr ""
 #~ msgid "Generate entries before:"
 #~ msgstr "Generar asientos hasta:"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid "Total :"
 #~ msgstr "Total :"
 
 #~ msgid "Year :"
 #~ msgstr "Ejercicio :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Cuentas por tipo"
 
@@ -12844,6 +12815,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Ir a la siguiente empresa"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por tipo de cuenta"
+
 #~ msgid "Reserve And Profit/Loss Account"
 #~ msgstr "Cuenta de reservas y pérdidas/ganancias"
 
@@ -12865,6 +12839,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Diario"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por cuenta"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -12993,6 +12970,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Contabilidad. Informe de pérdida y ganancias"
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablero"
+
 #, python-format
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr ""
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 511736cc85d..da52cd29225 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -668,18 +663,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas a cobrar"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1642,11 +1625,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2701,13 +2679,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6249,11 +6220,6 @@ msgid "Supplier Refund"
 msgstr "Reembolso de proveedor"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Líneas de asiento"
@@ -6799,11 +6765,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11363,6 +11324,10 @@ msgstr ""
 #~ msgid "By Date"
 #~ msgstr "Por fecha"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas a cobrar"
+
 #~ msgid "Date payment"
 #~ msgstr "Fecha de pago"
 
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index 5194af41c8d..015b28492e3 100644
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -188,11 +188,6 @@ msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Etiqueta de columna"
@@ -683,18 +678,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1656,11 +1639,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2708,13 +2686,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6229,11 +6200,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6773,11 +6739,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10475,5 +10436,8 @@ msgstr ""
 #~ msgid "Please define sequence on invoice journal"
 #~ msgstr "Defina una secuencia en el diario de la factura"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "abrierto para reconciliacion"
diff --git a/addons/account/i18n/es_CR.po b/addons/account/i18n/es_CR.po
index b60cbe256fe..dcca71a0020 100644
--- a/addons/account/i18n/es_CR.po
+++ b/addons/account/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: account
@@ -188,11 +188,6 @@ msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Etiqueta de columna"
@@ -714,18 +709,6 @@ msgstr ""
 "asientos"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas por Cobrar"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1728,11 +1711,6 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2856,13 +2834,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Configure su plan de cuentas"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará asientos contables recurrentes"
@@ -6555,11 +6526,6 @@ msgid "Supplier Refund"
 msgstr "Factura rectificativa de proveedor"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Apuntes"
@@ -7148,11 +7114,6 @@ msgstr ""
 "Ejemplo: Mi modelo del %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referencia del documento que ha generado este informe de factura."
@@ -11186,12 +11147,21 @@ msgstr ""
 "El monto residual de una línea de asiento por cobrar o por pagar expresado "
 "en su moneda (puede ser diferente de la moneda de la compañía)."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "Abrir para romper conciliación"
 
 #~ msgid "Go to next partner"
 #~ msgstr "Ir a la siguiente empresa"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por tipo de cuenta"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por cuenta"
+
 #~ msgid "Tax codes"
 #~ msgstr "Códigos de impuestos"
 
@@ -11216,6 +11186,12 @@ msgstr ""
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Crear una cuenta basada en esta plantilla"
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablero"
+
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid "Open for bank reconciliation"
 #~ msgstr "Abrir para la conciliación bancaria"
 
@@ -13399,3 +13375,7 @@ msgstr ""
 
 #~ msgid "Description On Invoices"
 #~ msgstr "Descripción en facturas"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas por Cobrar"
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 93f1727728c..58e1b207809 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -17,8 +17,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -190,11 +190,6 @@ msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Etiqueta de Columna"
@@ -710,18 +705,6 @@ msgstr ""
 "los asientos"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas por Cobrar"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1725,11 +1708,6 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Sales by Account Type"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2848,13 +2826,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Configure su plan de cuentas"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por Cuenta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "This wizard will create recurring accounting entries"
@@ -6531,11 +6502,6 @@ msgid "Supplier Refund"
 msgstr "Nota de Credito"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Líneas de asiento"
@@ -7124,11 +7090,6 @@ msgstr ""
 "e.g. My model on %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Reference of the document that generated this invoice report."
@@ -12164,6 +12125,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Cuentas de costos y ganancias por diario (este mes)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas por Cobrar"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Abrir para desconciliacion"
 
@@ -12385,6 +12350,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Revisar si usuario esta permitido para conciliar entradas en esta cuenta"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid "Total :"
 #~ msgstr "Total :"
 
@@ -12410,6 +12378,9 @@ msgstr ""
 #~ msgid "Reference Number"
 #~ msgstr "Núm. Referencia"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr "No hay diario definido para el cierre de ejercicio fiscal"
@@ -12515,6 +12486,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Siguiente Empresa"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Sales by Account Type"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Error! You cannot define overlapping fiscal years"
 
@@ -12575,6 +12549,9 @@ msgstr ""
 #~ "You cannot modify company of this journal as its related record exist in "
 #~ "Entry Lines"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por Cuenta"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -12767,6 +12744,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Can not find account chart for this company, Please Create account."
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablero"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Account Profit And Loss Report"
 
diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po
index 3ecdcc1e845..e0b5085ca2d 100644
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -184,11 +184,6 @@ msgid "All Analytic Entries"
 msgstr "Todos los asientos analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -702,18 +697,6 @@ msgstr ""
 "asientos"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas por cobrar"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1698,11 +1681,6 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2809,13 +2787,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará asientos contables recurrentes"
@@ -6456,11 +6427,6 @@ msgid "Supplier Refund"
 msgstr "Reembolso del Proveedor:"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Panel de Control"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Apuntes"
@@ -7040,11 +7006,6 @@ msgstr ""
 "Ejemplo: Mi modelo del %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referencia del documento que ha generado este informe de factura."
@@ -10943,6 +10904,9 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "¡No puede eliminar el movimiento validado: \"%s\"!"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas en los últimos 15 días"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -10978,6 +10942,10 @@ msgstr ""
 #~ msgstr "cerrando balance introducido por el verificador de caja"
 
 #, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Cuentas por cobrar"
+
+#, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "¡El balance del extracto bancario es incorrecto!\n"
 
@@ -11051,6 +11019,9 @@ msgstr ""
 #~ msgid "Include initial balances"
 #~ msgstr "Incluir balances iniciales"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por tipo de cuenta"
+
 #~ msgid "The optional quantity on entries"
 #~ msgstr "La cantidad opcional en los asientos"
 
@@ -11120,6 +11091,9 @@ msgstr ""
 #~ msgid "Tax codes"
 #~ msgstr "Códigos de impuestos"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por cuenta"
+
 #~ msgid "Reference Number"
 #~ msgstr "Número de referencia"
 
@@ -11365,6 +11339,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "¡La moneda actual no está configurada correctamente!"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Cuentas de ingresos"
+
 #~ msgid ""
 #~ "Account Voucher module includes all the basic requirements of Voucher "
 #~ "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
@@ -11553,6 +11530,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Contabilidad. Informe de pérdida y ganancias"
 
+#~ msgid "Dashboard"
+#~ msgstr "Panel de Control"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  valoración: porcentaje"
 
diff --git a/addons/account/i18n/es_VE.po b/addons/account/i18n/es_VE.po
index c7c140407ac..6cf5ee551cd 100644
--- a/addons/account/i18n/es_VE.po
+++ b/addons/account/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -184,11 +184,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -672,18 +667,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1645,11 +1628,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2702,13 +2680,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6220,11 +6191,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6764,11 +6730,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index f92b7f9bde1..d82fac46838 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -180,11 +180,6 @@ msgid "All Analytic Entries"
 msgstr "Kõik analüütilised kirjed"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Viimase 15 päeva jooksul loodud arved"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -668,18 +663,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Nõuete kontod"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1641,11 +1624,6 @@ msgid "Responsible"
 msgstr "Vastutav"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Müügid konto järgi"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2691,13 +2669,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6212,11 +6183,6 @@ msgid "Supplier Refund"
 msgstr "Tarnija hüvitis"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Kirje read"
@@ -6756,11 +6722,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10952,6 +10913,10 @@ msgstr ""
 #~ msgid "Delta Credit"
 #~ msgstr "Delta kreedit"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Nõuete kontod"
+
 #~ msgid "Generic Reports"
 #~ msgstr "Üldised aruanded"
 
@@ -11182,6 +11147,9 @@ msgstr ""
 #~ msgid "Create subscription entries"
 #~ msgstr "Koosta tellimus sissekanded"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Viimase 15 päeva jooksul loodud arved"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Kontod tüübi järgi"
 
@@ -11274,6 +11242,9 @@ msgstr ""
 #~ "Vale krediidi või deebeti arv mudelis ( Krediit + Deebet Peab olema suurem "
 #~ "kui \"0\" ) !"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Müügid konto järgi"
+
 #, python-format
 #~ msgid "You cannot deactivate an account that contains account moves."
 #~ msgstr "Sa ei saa deaktiveerida kontot mis sisaldab konto liikumisi."
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index d0a7612d77d..75e0295e9c2 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index b2e0a4e68ff..48864b71a0e 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:20+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po
index 7cdef42d92a..2cadc9dbec6 100644
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index e95f2432c0f..d9bbdccd9c3 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -184,11 +184,6 @@ msgid "All Analytic Entries"
 msgstr "Kaikki analyyttiset merkinnät"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Lasku muodostettu 15 päivän sisällä"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Sarakeotsikko"
@@ -678,18 +673,6 @@ msgstr ""
 "Täsmäyttääksesi viennit yrityksen tulisi olla sama kaikille vienneille"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Saatavat tilit"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1654,11 +1637,6 @@ msgid "Responsible"
 msgstr "Vastuuhenkilö"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Myynti tilityypeittäin"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2718,13 +2696,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Myynnit tileittäin"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Velho luo toistuvat kirjanpitoviennit"
@@ -6259,11 +6230,6 @@ msgid "Supplier Refund"
 msgstr "Toimittajan hyvitys"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Työpöytä"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Merkintärivit"
@@ -6807,11 +6773,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Tulotilit"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11564,6 +11525,10 @@ msgstr ""
 #~ "Tätä kenttää käytetään merkintöihin maksettavista ja saatavista. Voit "
 #~ "asettaa rajapäivämäärän merkintärivin maksulle."
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Saatavat tilit"
+
 #~ msgid ""
 #~ "The account moves of the invoice have been reconciled with account moves of "
 #~ "the payment(s)."
@@ -11984,6 +11949,9 @@ msgstr ""
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Sisällytä suoritetut merkinnät"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Lasku muodostettu 15 päivän sisällä"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -12051,6 +12019,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Verokoodien testaus"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Myynti tilityypeittäin"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Virhe! Et voi määritellä päällekkäisiä kirjanpitovuosia"
 
@@ -12111,6 +12082,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Voitto ja tappiotilin raportti"
 
+#~ msgid "Dashboard"
+#~ msgstr "Työpöytä"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  arvoostus: prosenttia"
 
@@ -12197,6 +12171,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " päiväkirja"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Myynnit tileittäin"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Tilikirjan konfiguraatio"
 
@@ -12235,6 +12212,9 @@ msgstr ""
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Luo tilikarttasi mallipohjan perusteella"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Tulotilit"
+
 #, python-format
 #~ msgid "You can not have two open register for the same journal"
 #~ msgstr "Samalla päiväkirjalla ei voi olla kahta avointa kassaa"
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 2ff5a2dec12..b33ed370784 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1200
@@ -254,11 +254,6 @@ msgid "All Analytic Entries"
 msgstr "Toutes les écritures analytiques"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Factures créées au cours des 15 derniers jours"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Titre de colonne"
@@ -775,18 +770,6 @@ msgstr ""
 "écritures."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Comptes clients"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1796,11 +1779,6 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventes par type de compte"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2922,13 +2900,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Configurez votre plan de comptes"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventes par compte"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Cet assistant va générer les écritures comptables récurrentes"
@@ -6624,11 +6595,6 @@ msgid "Supplier Refund"
 msgstr "Avoir fournisseur"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tableau de bord"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Lignes d'écritures"
@@ -7216,11 +7182,6 @@ msgstr ""
 "par exmple : Mon modèle du %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Comptes de revenus"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Référence du document qui a généré ce document de facture."
@@ -12641,6 +12602,9 @@ msgstr ""
 #~ msgid "asgfas"
 #~ msgstr "asgfas"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Comptes de revenus"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Comptes par type"
 
@@ -12695,6 +12659,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Aller au partenaire suivant"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventes par type de compte"
+
 #, python-format
 #~ msgid "No journal for ending writing has been defined for the fiscal year"
 #~ msgstr ""
@@ -12772,6 +12739,9 @@ msgstr ""
 #~ "Pas de période définie pour cette date : %s !\n"
 #~ "Veuillez créer un exercice comptable."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventes par compte"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Paramétrage du plan comptable"
 
@@ -12846,6 +12816,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Rapport des pertes et profits comptables"
 
+#~ msgid "Dashboard"
+#~ msgstr "Tableau de bord"
+
 #~ msgid "Your Bank and Cash Accounts"
 #~ msgstr "Vos comptes de banque et de liquidités"
 
@@ -13364,6 +13337,13 @@ msgstr ""
 #~ "module \"account_voucher\" prend en charge les pièces justificatives.\n"
 #~ "    "
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Factures créées au cours des 15 derniers jours"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Comptes clients"
+
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "Installer votre plan comptable"
 
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
index d2c25c29cf2..c8c0459b3da 100644
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2690,13 +2668,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6206,11 +6177,6 @@ msgid "Supplier Refund"
 msgstr "Note de Crédit Fournisseur"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6750,11 +6716,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 9988a188979..93cf9a7edfe 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -184,11 +184,6 @@ msgid "All Analytic Entries"
 msgstr "Todas as entradas Analíticas"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas nos últimos 15 días"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -700,18 +695,6 @@ msgstr ""
 "asentos"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Contas de Ventas"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1695,11 +1678,6 @@ msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por Tipo de Conta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2797,13 +2775,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por Conta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará apuntes contables recorrentes"
@@ -6416,11 +6387,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6962,11 +6928,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10724,6 +10685,9 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "¡Non podes eliminar o movemento contabilizado: \"%s\"!"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturas creadas nos últimos 15 días"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -10756,6 +10720,10 @@ msgstr ""
 #~ msgstr "o saldo de peche entrou polo verificador de caixa"
 
 #, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Contas de Ventas"
+
+#, python-format
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "¡O estado do saldo é incorrecto!\n"
 
@@ -10838,6 +10806,9 @@ msgstr ""
 #~ "¡Valor do crédito ou débito incorrecto no modelo (Crédito + Débito debe ser "
 #~ "superior a \"0\")!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Ventas por Tipo de Conta"
+
 #, python-format
 #~ msgid "You have to provide an account for the write off entry !"
 #~ msgstr "Ten que indicar unha conta para a entrada a cancelar"
@@ -10903,6 +10874,9 @@ msgstr ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "O balance agardado(%.2f) é diferente do calculado: (%.2f)"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Ventas por Conta"
+
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 0a677b48da6..481dee5a46e 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "તમામ વિશ્લેષક મુલ્યો"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "છેલ્લા ૧૫ દિવસમા બનાવવામા આવેલ ભરતિયા"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10488,3 +10449,6 @@ msgstr ""
 
 #~ msgid "Are you sure ?"
 #~ msgstr "તમે ચોક્કસ છો?"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "છેલ્લા ૧૫ દિવસમા બનાવવામા આવેલ ભરતિયા"
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 44d1f13e048..66f32672990 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index fcf976abadb..a292d43e286 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "सभी विश्लेषणात्मक प्रविष्टियाँ"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "स्तंभ लेबल"
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 6cd5dc0ab0a..05c9c8e7052 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -180,11 +180,6 @@ msgid "All Analytic Entries"
 msgstr "Sve analitičke stavke"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi kreirani u zadnjih 15 dana"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Labela stupca"
@@ -687,18 +682,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Sve stavke zatvaranja moraju biti iz iste organizacije"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Potražna konta"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1677,11 +1660,6 @@ msgid "Responsible"
 msgstr "Odgovoran"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Prodaja po tipu konta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2775,13 +2753,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Prodaje po kontu"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Asistent za kreiranje ponavljajućih temeljnica"
@@ -6390,11 +6361,6 @@ msgid "Supplier Refund"
 msgstr "Povrat URA"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Kokpit"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Stavke knjiženja"
@@ -6973,11 +6939,6 @@ msgstr ""
 "npr. Knjiženje troškova plaće za %(month)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konta prihoda"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Oznaka dokumenta koji je kreirao ovaj račun."
@@ -11397,6 +11358,9 @@ msgstr ""
 #~ msgid "Date Invoiced"
 #~ msgstr "Datum izrade računa"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi kreirani u zadnjih 15 dana"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
 
@@ -12005,6 +11969,10 @@ msgstr ""
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Saldo blagajne ne odgovara izračunatom saldu!"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Potražna konta"
+
 #~ msgid "Next Partner to reconcile"
 #~ msgstr "Slijedeći partner za zatvaranje"
 
@@ -12070,6 +12038,9 @@ msgstr ""
 #~ msgid "Tax Code Test"
 #~ msgstr "Test porezne grupe"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Prodaja po tipu konta"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Greška! Fiskalne godine se ne smiju preklapati"
 
@@ -12089,6 +12060,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Dnevnik"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Prodaje po kontu"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Postava kontnog plana"
 
@@ -12186,6 +12160,9 @@ msgstr ""
 #~ msgid "  valuation: percent"
 #~ msgstr "  vrijednost: postotak"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konta prihoda"
+
 #, python-format
 #~ msgid "You can not have two open register for the same journal"
 #~ msgstr "Ne možete otvoriti dvije blagajne u jednom dnevniku"
@@ -12470,6 +12447,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Can not find account chart for this company, Please Create account."
 
+#~ msgid "Dashboard"
+#~ msgstr "Kokpit"
+
 #, python-format
 #~ msgid ""
 #~ "Please define the Reserve and Profit/Loss account for current user company !"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 55334720844..a9d5e45b32f 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -181,11 +181,6 @@ msgid "All Analytic Entries"
 msgstr "Minden gyűjtőkód tétel"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Az elmúlt 15 napban készített számlák"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -697,18 +692,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Minden párosítandó tételnek ugyanahhoz a vállalathoz kell tartoznia."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Vevő számlák"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1694,11 +1677,6 @@ msgid "Responsible"
 msgstr "Felelős"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Számlatípusonkénti értékesítés"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2792,13 +2770,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Főkönyvi számlánkénti értékesítés"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Ez a varázsló ismétlődő könyvelési tételeket hoz létre"
@@ -6410,11 +6381,6 @@ msgid "Supplier Refund"
 msgstr "Bejövő jóváíró számla"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Vezérlőpult"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Tételsorok"
@@ -6990,11 +6956,6 @@ msgstr ""
 "pl. %(date)s-i modell"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Árbevétel főkönyvi számlák"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Bizonylat, amely előállította ezt a számlát."
@@ -11198,6 +11159,10 @@ msgstr ""
 #~ msgid "Calculated Balance"
 #~ msgstr "Számított egyenleg"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Vevő számlák"
+
 #~ msgid "Next Partner to reconcile"
 #~ msgstr "Következő párosítandó partner"
 
@@ -11226,6 +11191,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "A következő partnerre lép"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Számlatípusonkénti értékesítés"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Nyitó egyenleg kiírása"
 
@@ -11261,6 +11229,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Hiba! Nem hozhat létre rekurzív kategóriákat!"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Főkönyvi számlánkénti értékesítés"
+
 #~ msgid "Reference Number"
 #~ msgstr "Hivatkozási szám"
 
@@ -11407,6 +11378,9 @@ msgstr ""
 #~ msgid "Balance Sheet (Liability Accounts)"
 #~ msgstr "Mérleg (forrás számlák)"
 
+#~ msgid "Dashboard"
+#~ msgstr "Vezérlőpult"
+
 #, python-format
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Nincs ilyen főkönyvi számla. Kérem, hozza létre!"
@@ -11422,6 +11396,9 @@ msgstr ""
 #~ msgid "  valuation: percent"
 #~ msgstr "  értékelés: százalék"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Árbevétel főkönyvi számlák"
+
 #, python-format
 #~ msgid ""
 #~ "Can not find account chart for this company in invoice line account, Please "
@@ -11590,6 +11567,9 @@ msgstr ""
 #~ "Nem módosíthatja a napló vállalatát, mivel van kapcsolt rekordja a "
 #~ "tételsorokban."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Az elmúlt 15 napban készített számlák"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 49d7979faa9..2f5be6ce13e 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgid "All Analytic Entries"
 msgstr "Seluruh Ayat Analitik"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Invoice/Tagihan yang Dibuat dalam 15 Hari Terakhir"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Nama Kolom"
@@ -713,18 +708,6 @@ msgstr ""
 "catatan"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Akun Piutang"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1733,11 +1716,6 @@ msgid "Responsible"
 msgstr "Bertanggung Jawab"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Sales Berdasarkan tipe akun"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2833,13 +2811,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Penjualan menurut Akun"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Panduan ini akan membuat entri akuntansi yang berulang"
@@ -6368,11 +6339,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Baris Catatan"
@@ -6916,11 +6882,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Akun Penghasilan"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10928,6 +10889,9 @@ msgstr ""
 #~ msgid "Accounting Entries-"
 #~ msgstr "Entri Akuntansi"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Invoice/Tagihan yang Dibuat dalam 15 Hari Terakhir"
+
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr ""
@@ -10996,9 +10960,16 @@ msgstr ""
 #~ msgid "You can not use this general account in this journal !"
 #~ msgstr "Anda tidak dapat menggunakan akun umum ini di jurnal ini !"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Akun Piutang"
+
 #~ msgid "Description on invoices"
 #~ msgstr "Uraian pada tagihan"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Akun Penghasilan"
+
 #~ msgid "Period length (days)"
 #~ msgstr "Lama periode (hari)"
 
@@ -11183,6 +11154,9 @@ msgstr ""
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Akun ini tidak didefinisikan untuk direkonsiliasi!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Sales Berdasarkan tipe akun"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Error! Anda tidak dapat menetapkan tumpang tindih tahun fiskal"
 
@@ -11229,5 +11203,8 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Jurnal"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Penjualan menurut Akun"
+
 #~ msgid "Reference Number"
 #~ msgstr "Nomor Referensi"
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 295e69f716d..21a69463045 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgid "All Analytic Entries"
 msgstr "Tutte le voci analitiche"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Fatture create negli ultimi 15 giorni"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -705,18 +700,6 @@ msgstr ""
 "registrazioni."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Conti di Credito"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1703,11 +1686,6 @@ msgid "Responsible"
 msgstr "Responsabile"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendite per tipo di conto"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2803,13 +2781,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendite per conto"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Questo wizard crea voci contabili ricorrenti."
@@ -6437,11 +6408,6 @@ msgid "Supplier Refund"
 msgstr "Resi a fornitore"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Righe movimento"
@@ -7002,11 +6968,6 @@ msgstr ""
 "Esempio: Il mio modello del %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Conti per entrate"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Riferimento al documento che ha creato questa fattura"
@@ -11518,6 +11479,9 @@ msgstr ""
 #~ msgid "Generic Reports"
 #~ msgstr "Stampe generiche"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Fatture create negli ultimi 15 giorni"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Conti per Tipo"
 
@@ -11722,6 +11686,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Vai al partner successivo"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendite per tipo di conto"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Errore! Non è possibile definire anni fiscali sovrapposti"
 
@@ -11753,6 +11720,9 @@ msgstr ""
 #~ msgid "  number of days: 30"
 #~ msgstr "  numero di giorni: 30"
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #, python-format
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Il saldo cassa contanti non coincide con quello calcolato !"
@@ -11837,6 +11807,9 @@ msgstr ""
 #~ "Check this if the user is allowed to reconcile entries in this account."
 #~ msgstr "Spunta se l'utente può riconciliare registrazioni in questo conto."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendite per conto"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -11961,6 +11934,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "La valuta corrente non e' correttamente configurata"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Conti per entrate"
+
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Errore ! Non è possibile creare membri associati ricorsivi."
 
@@ -12182,6 +12158,10 @@ msgstr ""
 #~ msgid "Cannot locate parent code for template account!"
 #~ msgstr "Non è possibile localizzare il codice padre del modello del conto!"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Conti di Credito"
+
 #~ msgid ""
 #~ "Allows invoice lines to impact multiple analytic accounts simultaneously."
 #~ msgstr ""
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index e753a9e4e30..21c7bea93f3 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "全ての分析エントリー"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "過去15日以内に作成済の請求書"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "列ラベル"
@@ -680,18 +675,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "エントリーを消し込みするために、会社は全てのエントリーに対して同じであるべきです。"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "売掛金"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1665,11 +1648,6 @@ msgid "Responsible"
 msgstr "担当"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "アカウントタイプ別売上"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2737,13 +2715,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "勘定科目表の設定"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "アカウント別売上"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "このウィザードは定期会計エントリーを作成します。"
@@ -6312,11 +6283,6 @@ msgid "Supplier Refund"
 msgstr "仕入先返金"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "ダッシュボード"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "エントリー行"
@@ -6875,11 +6841,6 @@ msgstr ""
 "例えば、%(date)s の私のモデル"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "損益勘定"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "この請求書レポートを生成したドキュメントの参照"
@@ -10721,12 +10682,25 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Go to next partner"
 #~ msgstr "次のパートナへ"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "アカウントタイプ別売上"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "売掛金"
+
+#~ msgid "Sales by Account"
+#~ msgstr "アカウント別売上"
+
 #~ msgid "Tax codes"
 #~ msgstr "税金コード"
 
 #~ msgid "Generate Chart of Accounts from a Chart Template"
 #~ msgstr "チャートテンプレートから勘定科目表を生成"
 
+#~ msgid "Income Accounts"
+#~ msgstr "損益勘定"
+
 #~ msgid "Accounts by type"
 #~ msgstr "タイプ毎のアカウント"
 
@@ -10745,6 +10719,12 @@ msgstr "仕訳帳エントリーの買掛金、または買掛金の残差金額
 #~ msgid "Create an Account based on this template"
 #~ msgstr "このテンプレートに基づくアカウントの作成"
 
+#~ msgid "Dashboard"
+#~ msgstr "ダッシュボード"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "過去15日以内に作成済の請求書"
+
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "会計表のインストール"
 
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 4d08141c640..a315d1da5b9 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po
index c7a285fdbb0..1fed244473e 100644
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 9129d84cb31..835f56db8a5 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "채권 계정"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "소득 계정"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10440,6 +10401,10 @@ msgstr ""
 #~ "defined !"
 #~ msgstr "공급자의 결제 조건에 정의된 결제 조건 라인 (결제)이 없습니다 !"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "채권 계정"
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "미결제 공급자 인보이스"
 
@@ -10466,5 +10431,8 @@ msgstr ""
 #~ msgid "Account move line \"%s\" is not valid"
 #~ msgstr "계정이동 라인 \"%s\"은 유효하지 않습니다"
 
+#~ msgid "Income Accounts"
+#~ msgstr "소득 계정"
+
 #~ msgid "Accounts by type"
 #~ msgstr "타입 별 계정"
diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po
index 405b4ca7be6..15b5489282c 100644
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:19+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "ໃບເກັບເຍີນເຮັດຂຶ້ນຫຼັງຈາກ ໑໕ ວັນເເລ້ວນີ້"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10438,3 +10399,6 @@ msgstr ""
 
 #~ msgid "Positive"
 #~ msgstr "ສົມ"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "ໃບເກັບເຍີນເຮັດຂຶ້ນຫຼັງຈາກ ໑໕ ວັນເເລ້ວນີ້"
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index a487b38aac0..0be0e9d6b28 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:20+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -182,11 +182,6 @@ msgid "All Analytic Entries"
 msgstr "Visi analitiniai įrašai"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Sukurtos sąskaitos per pastarąsias 15 dienų"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -672,18 +667,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debetinės sąskaitos"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1645,11 +1628,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2704,13 +2682,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6234,11 +6205,6 @@ msgid "Supplier Refund"
 msgstr "Grąžinimas tiekėjui"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Įrašo eilutės"
@@ -6779,11 +6745,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11424,6 +11385,10 @@ msgstr ""
 #~ msgstr "Atidaryti gretinimo atšaukimui"
 
 #, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debetinės sąskaitos"
+
+#, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "Data nepatenka į pasirinktus fiskalinius metus."
 
@@ -11720,6 +11685,9 @@ msgstr ""
 #~ msgid "Please define sequence on invoice journal"
 #~ msgstr "Prašome nurodyti eiliškumą sąskaitų žurnale"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Sukurtos sąskaitos per pastarąsias 15 dienų"
+
 #~ msgid ""
 #~ "The Profit and Loss report gives you an overview of your company profit and "
 #~ "loss in a single document"
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index f81d49b355a..d8bd764ec46 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:20+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgid "All Analytic Entries"
 msgstr "Visi Analītiskie Ieraksti"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Rēķini, kas izveidoti pēdējās 15 dienās"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -697,18 +692,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Kontējumu sasaisti var veikt tikai viena uzņēmuma ietvaros"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debitoru Konti"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1693,11 +1676,6 @@ msgid "Responsible"
 msgstr "Atbildīgais"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Pārdošana pēc Konta tipa"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2786,13 +2764,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Pārdošanas dati pēc Konta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Ar šī vedņa palīdzību tiek veidoti regulārie grāmatojumi"
@@ -6370,11 +6341,6 @@ msgid "Supplier Refund"
 msgstr "Ienākošie Kredītrēķini"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Rīku panelis"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Kontējumi"
@@ -6946,11 +6912,6 @@ msgstr ""
 "piem., Mans %(date)s modelis"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Ieņēmumu Konti"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Atcauce uz rēķina pirmdokumentu."
@@ -11185,6 +11146,9 @@ msgstr ""
 #~ msgid "Draft Supplier Invoices"
 #~ msgstr "Neapstiprināti Ienākošie Rēķini"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Rēķini, kas izveidoti pēdējās 15 dienās"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11206,6 +11170,10 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Izraksta bilance ir kļūdaina!\n"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debitoru Konti"
+
 #~ msgid "Total With Tax"
 #~ msgstr "Kopā ar Nodokli"
 
@@ -11255,6 +11223,9 @@ msgstr ""
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Konts nav atzīmēts, kā sasaistāms!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Pārdošana pēc Konta tipa"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Kļūda! Nav iespējams definēt fiskālos gadus, kuru periodi pārklājas."
 
@@ -11294,6 +11265,9 @@ msgstr ""
 #~ "Nav iespējams mainīt uzņēmumu žurnālam, jo tas satur grāmatojumus, kas "
 #~ "attiecas uz noteiktu uzņēmumu."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Pārdošanas dati pēc Konta"
+
 #~ msgid "Reference Number"
 #~ msgstr "Atsauces Nr."
 
@@ -11417,6 +11391,9 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Atmaksas Tips"
 
+#~ msgid "Dashboard"
+#~ msgstr "Rīku panelis"
+
 #~ msgid ""
 #~ "You cannot create entries on different periods/journals in the same move"
 #~ msgstr "Nevar vienlaicīgi veidot ierakstus dažādos periodos/žurnālos"
@@ -11476,6 +11453,9 @@ msgstr ""
 #~ msgid "Acc. Type Name"
 #~ msgstr "Konta Tips"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Ieņēmumu Konti"
+
 #~ msgid "Year :"
 #~ msgstr "Gads :"
 
diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po
index 9bfa51e217c..27d80955567 100644
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:20+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -187,11 +187,6 @@ msgid "All Analytic Entries"
 msgstr "Сите аналитички влезови"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Фактури креирани во изминатите 15 дена"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Ознака на колона"
@@ -704,18 +699,6 @@ msgstr ""
 "За да ги порамните записите компанијата мора да биде иста за сите влезови"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Конта за побарувања"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1719,11 +1702,6 @@ msgid "Responsible"
 msgstr "Одговорен"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Продажби по тип на конто"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2833,13 +2811,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Конфигурирајте го вашиот контен план"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Продажби по конто"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Овој волшебник ќе креира повторливи сметководствени записи"
@@ -6479,11 +6450,6 @@ msgid "Supplier Refund"
 msgstr "Поврати на добавувач"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Конторлна табла"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Ставки на запис"
@@ -7052,11 +7018,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Конта за приходи"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Референца на документот кој го генерирал овој извештај за фактура."
@@ -11019,12 +10980,25 @@ msgstr ""
 #~ msgid "Voucher Management"
 #~ msgstr "Водење на ваучери"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Фактури креирани во изминатите 15 дена"
+
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "Отворено за непорамнување"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Конта за побарувања"
+
 #~ msgid "Go to next partner"
 #~ msgstr "Оди на следен партнер"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Продажби по тип на конто"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Продажби по конто"
+
 #~ msgid "Tax codes"
 #~ msgstr "Даночни кодови"
 
@@ -11046,6 +11020,12 @@ msgstr ""
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Креирај конто базирано на овој урнек"
 
+#~ msgid "Dashboard"
+#~ msgstr "Конторлна табла"
+
+#~ msgid "Income Accounts"
+#~ msgstr "Конта за приходи"
+
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "Инсталирајте го контниот план"
 
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index a8d43ba9ffb..8bd96eba63e 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:20+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -187,11 +187,6 @@ msgid "All Analytic Entries"
 msgstr "Бүх аналитик бичилтүүд"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Сүүлийн 15 өдөрт үүссэн нэхэмжлэлүүд"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Баганын Шошго"
@@ -408,7 +403,7 @@ msgstr "Худалдан авалтын буцаалт"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Нээх / Хаах Нөхцөл"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -459,7 +454,7 @@ msgstr "Гүйлгээний валютаар илэрхийлэгдэх дүн"
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Харьцуулах боломжтой"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -521,7 +516,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Данс энэ журнальд хэрэглэгдсэн"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -565,7 +560,7 @@ msgstr "Гүйцээгдээгүй гүйлгээнүүд"
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Эсрэг тал"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -597,7 +592,7 @@ msgstr "Бүх"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "Нэхэмжлэлийн хаягийн нэр"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -627,7 +622,7 @@ msgstr "Дараалал"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Тайлангийн утга"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -690,18 +685,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Авлагын данс"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -726,7 +709,7 @@ msgstr "Та гүйлгээ үүсгэхдээ итгэлтэй байна уу?
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл хэвлэх"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -764,7 +747,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Нөхөн олгох арга"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -775,7 +758,7 @@ msgstr "Та зөвхөн ноорог нэхэмжлэлийн валютыг �
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Санхүүгийн тайлан"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -1663,11 +1646,6 @@ msgid "Responsible"
 msgstr "Хариуцагч"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Борлуулалт дансны төрлөөр"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2739,13 +2717,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Борлуулалт дансаар"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Энэ визард давтан гүйлгээний бичилт үүсгэнэ"
@@ -3918,7 +3889,7 @@ msgstr "Дундаж ханшаар"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Дансдыг Харуулах"
 
 #. module: account
 #: view:account.state.open:0
@@ -6312,11 +6283,6 @@ msgid "Supplier Refund"
 msgstr "Нийлүүлэгчийн буцаалт"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Хянах самбар"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Журналын бичилтүүд"
@@ -6801,6 +6767,8 @@ msgid ""
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
+"Энэ нь тайлан нь шалгах балансыг хэвлэх буюу pdf-р гаргаж данс бүрийг нэг "
+"тайлан дээр шалгах боломжийг өгдөг."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6862,11 +6830,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Орлогын данс"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -9683,6 +9646,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Энэ нь тайлан нь шалгах балансыг хэвлэх буюу pdf-р гаргаж ерөнхий дэвтэрийг "
+"бүх журналийн дэлгэрэнгүйгээр гаргадаг."
 
 #. module: account
 #: selection:account.account,type:0
@@ -11613,6 +11578,9 @@ msgstr ""
 #~ msgid "Statement Process"
 #~ msgstr "Бримтын үйл явц"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Орлогын данс"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Дансны төрлөөр"
 
@@ -11828,6 +11796,10 @@ msgstr ""
 #~ msgid "closing balance entered by the cashbox verifier"
 #~ msgstr "Мөнгө хариуцагчийн оруулсан хаалтын үлдэгдэл"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Авлагын данс"
+
 #~ msgid "logo"
 #~ msgstr "лого"
 
@@ -12083,6 +12055,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Энэ компанид дансны мод алга, Данс үүсгэнэ үү."
 
+#~ msgid "Dashboard"
+#~ msgstr "Хянах самбар"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Орлого зарлагын тайлан"
 
@@ -12231,6 +12206,12 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Та батлагдсан гүйлгээг устгах боломжгүй: \"%s\"!"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Борлуулалт дансны төрлөөр"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Борлуулалт дансаар"
+
 #, python-format
 #~ msgid ""
 #~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -12277,3 +12258,6 @@ msgstr ""
 
 #~ msgid "Include Reconciled Entries"
 #~ msgstr "Нийцүүлсэн бичилтүүдийг хамруулах"
+
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Сүүлийн 15 өдөрт үүссэн нэхэмжлэлүүд"
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index a990b8418eb..bd20a4fa589 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:20+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgid "All Analytic Entries"
 msgstr "Alle analytiske registreringer"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Fakturaer Opprettet innefor de siste 15 dager"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -688,18 +683,6 @@ msgstr ""
 "For å avstemme oppføringene bør firma være det samme for alle oppføringer"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debitorkonti"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1664,11 +1647,6 @@ msgid "Responsible"
 msgstr "Ansvarlig"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Salg pr kontotype"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2718,13 +2696,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Salg pr. konto"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6252,11 +6223,6 @@ msgid "Supplier Refund"
 msgstr "Kreditnota"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Konsoll"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Posteringslinjer"
@@ -6800,11 +6766,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Inntektskonto"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10502,6 +10463,9 @@ msgstr ""
 #~ msgid "Negative"
 #~ msgstr "Negativ"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Fakturaer Opprettet innefor de siste 15 dager"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -10545,6 +10509,10 @@ msgstr ""
 #~ msgid "Calculated Balance"
 #~ msgstr "Kalkulert balanse"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debitorkonti"
+
 #~ msgid "Due date Computation"
 #~ msgstr "Forfallsdato beregning"
 
@@ -10588,6 +10556,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Gå til neste partner"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Salg pr kontotype"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Include initial balances"
 
@@ -10617,6 +10588,9 @@ msgstr ""
 #~ "Check this if the user is allowed to reconcile entries in this account."
 #~ msgstr "Kryss av hvis bruker skal kunne avstemme posteringer på denne konto."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Salg pr. konto"
+
 #~ msgid "Tax codes"
 #~ msgstr "Avgiftskoder"
 
@@ -10768,12 +10742,18 @@ msgstr ""
 #~ msgid "Refund Type"
 #~ msgstr "Kredittype"
 
+#~ msgid "Dashboard"
+#~ msgstr "Konsoll"
+
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Opprett kontoplanen din fra en kontoplanmal"
 
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Resultatrapport"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Inntektskonto"
+
 #~ msgid "9"
 #~ msgstr "9"
 
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 7c9b97c2ded..a4909ed21bd 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:18+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: code:addons/account/account.py:1307
@@ -193,11 +193,6 @@ msgid "All Analytic Entries"
 msgstr "Alle kostenplaatsboekingen"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturen gemaakt binnen de laatste 15 dagen"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Kolomtitel"
@@ -717,18 +712,6 @@ msgstr ""
 "bedrijf vallen."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Debiteuren"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1736,11 +1719,6 @@ msgid "Responsible"
 msgstr "Verantwoordelijke"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Verkopen per rekeningtype"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2863,13 +2841,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Grootboekschema instellen"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Verkopen per grootboekrekening"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Deze assistent genereert herhalende boekingen"
@@ -6551,11 +6522,6 @@ msgid "Supplier Refund"
 msgstr "Credit inkoopfactuur"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Boekingsregels"
@@ -7149,11 +7115,6 @@ msgstr ""
 "e.g. My model on %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Opbrengsten rekeningen"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "referentie van het document dat deze factuur heeft gegenereerd."
@@ -12082,6 +12043,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Kosten en opbrengsten per dagboek (Deze maand)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Debiteuren"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Open voor verrekening"
 
@@ -12674,6 +12639,9 @@ msgstr ""
 #~ msgid "Year :"
 #~ msgstr "Jaar :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturen gemaakt binnen de laatste 15 dagen"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Rekeningen per soort"
 
@@ -12886,6 +12854,9 @@ msgstr ""
 #~ msgid "Customer Invoices to Approve"
 #~ msgstr "Klantfacturen goed te keuren"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Verkopen per rekeningtype"
+
 #~ msgid "Fill this if the journal is to be used for refunds of invoices."
 #~ msgstr ""
 #~ "A.u.b. invullen indien het dagboek gebruikt wordt voor het crediteren van "
@@ -12897,6 +12868,9 @@ msgstr ""
 #~ msgid "Your Reference"
 #~ msgstr "Uw referentie"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Verkopen per grootboekrekening"
+
 #~ msgid "A/c Code"
 #~ msgstr "Rek. code"
 
@@ -13030,6 +13004,9 @@ msgstr ""
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Maak een rekening gebaseerd op dit sjabloon"
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #~ msgid "Description On Invoices"
 #~ msgstr "Omschrijving op facturen"
 
@@ -13042,6 +13019,9 @@ msgstr ""
 #~ msgid "Cost Ledger for period"
 #~ msgstr "Kosten grootboek voor periode"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Opbrengsten rekeningen"
+
 #~ msgid "Consider reconciled entries"
 #~ msgstr "Afgeletterde boekingen meenemen"
 
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 146e020563f..1808aff32cc 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgid "All Analytic Entries"
 msgstr "Alle analytische boekingen"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturen van de afgelopen 15 dagen"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Kolomkop"
@@ -708,18 +703,6 @@ msgstr ""
 "bedrijf behoren."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Klanten"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1723,11 +1706,6 @@ msgid "Responsible"
 msgstr "Verantwoordelijke"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Verkopen per rekeningtype"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2843,13 +2821,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Stel uw boekhoudplan in"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Verkopen per rekening"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Deze wizard maakt de terugkerende boekingen."
@@ -6520,11 +6491,6 @@ msgid "Supplier Refund"
 msgstr "Aankoopcreditnota"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Boekingslijnen"
@@ -7109,11 +7075,6 @@ msgstr ""
 "vb. Mijn model van %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Opbrengstenrekeningen"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11640,6 +11601,10 @@ msgstr ""
 #~ msgid "O_k"
 #~ msgstr "O_k"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Klanten"
+
 #~ msgid "Due date Computation"
 #~ msgstr "Berekening vervaldatum"
 
@@ -11679,6 +11644,9 @@ msgstr ""
 #~ msgid "Include initial balances"
 #~ msgstr "Beginbalans opnemen"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Verkopen per rekeningtype"
+
 #, python-format
 #~ msgid "The account is not defined to be reconciled !"
 #~ msgstr "Deze rekening is niet ingesteld voor afpunten."
@@ -11715,6 +11683,9 @@ msgstr ""
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "U kunt de bevestigde boeking \"%s\" niet verwijderen."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturen van de afgelopen 15 dagen"
+
 #, python-format
 #~ msgid ""
 #~ "No period defined for this date: %s !\n"
@@ -11832,6 +11803,9 @@ msgstr ""
 #~ "U kunt de firma van dit journaal niet wijzigen, omdat er al een boekingslijn "
 #~ "bestaat."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Verkopen per rekening"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -12086,6 +12060,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Kan geen boekhoudplan vinden voor deze firma. Gelieve er een te maken."
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Maak uw boekhoudplan volgens een sjabloon."
 
@@ -12112,6 +12089,9 @@ msgstr ""
 #~ "De module Boekstukken bevat alle basiselementen voor boekstukken voor "
 #~ "banken, kas, verkoop, aankoop, onkosten, enz. "
 
+#~ msgid "Income Accounts"
+#~ msgstr "Opbrengstenrekeningen"
+
 #~ msgid ""
 #~ "Allows you to change the sign of the balance amount displayed in the "
 #~ "reports, so that you can see positive figures instead of negative ones in "
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index c81de281bba..53dbb6e4629 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:20+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:39+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index bf60ef138b0..a1bbaaa1178 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgid "All Analytic Entries"
 msgstr "Wszystkie zapisy analityczne"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktury utworzone w ostatnich 15. dniach."
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Etykieta kolumny"
@@ -703,18 +698,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Do uzgodnień zapisów firma musi być ta sama dla wszystkich zapisów"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konta należności"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1704,11 +1687,6 @@ msgid "Responsible"
 msgstr "Odpowiedzialny"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Sprzedaż wg typów kont"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2808,13 +2786,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Konfiguruj plan kont"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Sprzedaż wg kont"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Ten kreator utworzy zapisy powtarzalne"
@@ -6445,11 +6416,6 @@ msgid "Supplier Refund"
 msgstr "Korekta od dostawcy"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Konsola"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Pozycje zapisu"
@@ -7009,11 +6975,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konta dochodowe"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Odnośnik do dokumentu, który wygenerował te fakturę."
@@ -11658,6 +11619,10 @@ msgstr ""
 #~ msgid "Receivable and Payable"
 #~ msgstr "Należności i zobowiązania"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konta należności"
+
 #~ msgid "Accounting Statement"
 #~ msgstr "Zestawienie księgowe"
 
@@ -12212,6 +12177,9 @@ msgstr ""
 #~ "1. Pozycja 1: procent 0.02 14 dni\n"
 #~ "2. Pozycja 2: reszta 30 dni"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konta dochodowe"
+
 #~ msgid ""
 #~ "This account will be used to value outgoing stock for the current product "
 #~ "category"
@@ -12266,6 +12234,9 @@ msgstr ""
 #~ msgid "You cannot deactivate an account that contains account moves."
 #~ msgstr "Nie możesz dezaktywować konta zawierającego zapisy."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktury utworzone w ostatnich 15. dniach."
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta wg typu"
 
@@ -12386,6 +12357,9 @@ msgstr ""
 #~ msgid " Journal"
 #~ msgstr " Dziennik"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Sprzedaż wg kont"
+
 #~ msgid "Accounting Chart Configuration"
 #~ msgstr "Konfiguracja planu kont"
 
@@ -12437,6 +12411,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Raport zysków i strat"
 
+#~ msgid "Dashboard"
+#~ msgstr "Konsola"
+
 #~ msgid "Your Bank and Cash Accounts"
 #~ msgstr "Twoje konta bankwe i gotówkowe"
 
@@ -12575,6 +12552,9 @@ msgstr ""
 #~ msgid "Anglo-Saxon Accounting"
 #~ msgstr "Ksiągowość anglosaska"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Sprzedaż wg typów kont"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Błąd! Nie możesz tworzyć lat podatkowych zachodzących na siebie"
 
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 392e4d586ea..6019614ec2e 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgid "All Analytic Entries"
 msgstr "Todos os Movimentos Analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faturas Criadas nos Últimos 15 Dias"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Rótulo da Coluna"
@@ -706,18 +701,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Todos os movimentos a conciliar devem ser da mesma empresa."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Contas a Receber"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1724,11 +1707,6 @@ msgid "Responsible"
 msgstr "Responsável"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendas por tipo de conta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2845,13 +2823,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Configure o seu Plano de Contas"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendas por conta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Esta assistente vai criar lançamentos contabilísticos recorrentes"
@@ -6544,11 +6515,6 @@ msgid "Supplier Refund"
 msgstr "Nota de crédito de fornecedores"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Painel"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Linhas de movimentos"
@@ -7137,11 +7103,6 @@ msgstr ""
 "Ex. Meu modelo em %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Contas de Despesas"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referência ao documento que gerou esta fatura"
@@ -12711,9 +12672,15 @@ msgstr ""
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Não se pode definir anos fiscais sobrepostos"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendas por conta"
+
 #~ msgid "Total With Tax"
 #~ msgstr "Total, com taxas"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendas por tipo de conta"
+
 #, python-format
 #~ msgid " Journal"
 #~ msgstr " Diário"
@@ -12793,6 +12760,9 @@ msgstr ""
 #~ msgid "account.installer.modules"
 #~ msgstr "account.installer.modules"
 
+#~ msgid "Dashboard"
+#~ msgstr "Painel"
+
 #~ msgid "Bank and Cash Accounts"
 #~ msgstr "Contas bancárias e de caixa"
 
@@ -13196,6 +13166,9 @@ msgstr ""
 #~ msgid "Liabilities"
 #~ msgstr "Passivo"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faturas Criadas nos Últimos 15 Dias"
+
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Impossível apagar movimentos confirmados: \"%s\"!"
@@ -13298,6 +13271,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "A Divisa actual não está bem configurada!"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Contas de Despesas"
+
 #~ msgid ""
 #~ "The normal chart of accounts has a structure defined by the legal "
 #~ "requirement of the country. The analytic chart of account structure should "
@@ -13354,3 +13330,7 @@ msgstr ""
 
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Criar uma conta baseada neste Template"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Contas a Receber"
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index e93e9b53440..55aaa64c832 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:43+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -186,11 +186,6 @@ msgid "All Analytic Entries"
 msgstr "Todos os lançamentos analíticos"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faturas Criadas nos Últimos 15 Dias"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Etiqueta da Coluna"
@@ -711,18 +706,6 @@ msgstr ""
 "entradas"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Contas de Recebíveis"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1731,11 +1714,6 @@ msgid "Responsible"
 msgstr "Responsável"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vendas por Tipo de Conta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2850,13 +2828,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Configurar o Plano de Contas"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vendas por Conta"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Este assistente irá criar lançamentos contábeis periódicos"
@@ -6537,11 +6508,6 @@ msgid "Supplier Refund"
 msgstr "Devolução para Fornecedor"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Painel"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Linhas de lançamento"
@@ -7123,11 +7089,6 @@ msgstr ""
 "Ex.: Meu modelo em %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Contas de Receitas"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referência do documento que gerou este relatório de fatura."
@@ -12473,6 +12434,9 @@ msgstr ""
 #~ msgid "Accounts by type"
 #~ msgstr "Contas por tipo"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Contas de Receitas"
+
 #~ msgid "Display accounts"
 #~ msgstr "Exibir contas"
 
@@ -12487,6 +12451,9 @@ msgstr ""
 #~ "Você não pode remover/desativar uma conta que é definida como uma "
 #~ "propriedade de qualquer Parceiro."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faturas Criadas nos Últimos 15 Dias"
+
 #~ msgid "Calculated Balance"
 #~ msgstr "Balanço Calculado"
 
@@ -12557,6 +12524,9 @@ msgstr ""
 #~ "O termo de pagamento definido fornece uma quantia computada maior que a "
 #~ "quantia total da Fatura."
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vendas por Tipo de Conta"
+
 #~ msgid "Reserve And Profit/Loss Account"
 #~ msgstr "Conta de Reserva e Lucro/Perda"
 
@@ -12645,6 +12615,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Erro!  Você não pode criar categorias recursivas."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vendas por Conta"
+
 #~ msgid "Narration"
 #~ msgstr "Relato"
 
@@ -12795,6 +12768,9 @@ msgstr ""
 #~ "O plano de contas não foi encontrado para esta empresa. Por favor, crie uma "
 #~ "conta."
 
+#~ msgid "Dashboard"
+#~ msgstr "Painel"
+
 #~ msgid "  valuation: percent"
 #~ msgstr "  valorização: porcentagem"
 
@@ -12943,6 +12919,10 @@ msgstr ""
 #~ msgid "You can not create move line on view account."
 #~ msgstr "Você não pode criar linhas de movimento em uma conta de exibição."
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Contas de Recebíveis"
+
 #~ msgid ""
 #~ "Financial and accounting module that covers:\n"
 #~ "    General accountings\n"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 81a1881a0d7..17faa618ac5 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -187,11 +187,6 @@ msgid "All Analytic Entries"
 msgstr "Toate Inregistrarile Analitice"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturi create in ultimele 15 zile"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Eticheta coloana"
@@ -713,18 +708,6 @@ msgstr ""
 "toate inregistrarile"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Conturi Incasari"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1734,11 +1717,6 @@ msgid "Responsible"
 msgstr "Responsabil"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Vanzari dupa Tipul de cont"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2858,13 +2836,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Configurati-va Planul de Conturi"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Vanzari dupa Cont"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Acest wizard va crea inregistrari contabile recurente"
@@ -6573,11 +6544,6 @@ msgid "Supplier Refund"
 msgstr "Restituire furnizor"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablou de bord"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Linii inregistrari"
@@ -7171,11 +7137,6 @@ msgstr ""
 "ex. Modelul meu in %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Conturi de venituri"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referinta la documentul care a generat acest raport al facturii."
@@ -12305,12 +12266,18 @@ msgstr ""
 #~ msgid "JNRL"
 #~ msgstr "JRNL"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Conturi de venituri"
+
 #~ msgid "Total :"
 #~ msgstr "Total :"
 
 #~ msgid "Year :"
 #~ msgstr "An :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Facturi create in ultimele 15 zile"
+
 #~ msgid "Display accounts"
 #~ msgstr "Afişează conturile"
 
@@ -12455,6 +12422,9 @@ msgstr ""
 #~ msgid "Account Profit And Loss"
 #~ msgstr "Contul de profit si pierdere"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Vanzari dupa Cont"
+
 #~ msgid "Reference Number"
 #~ msgstr "Număr de referinţă"
 
@@ -12633,6 +12603,9 @@ msgstr ""
 #~ "Nu poate fi gasit planul de conturi pentru aceasta companie, va rugam sa "
 #~ "creati unul."
 
+#~ msgid "Dashboard"
+#~ msgstr "Tablou de bord"
+
 #~ msgid "Generate Your Accounting Chart from a Chart Template"
 #~ msgstr "Generare Plan contabil dintr-un Sablon de planuri"
 
@@ -13247,6 +13220,9 @@ msgstr ""
 #~ "Exemplu: la 14 zile nete 2 procente, suma ramasa la 30 de zile sfarsit de "
 #~ "luna."
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Vanzari dupa Tipul de cont"
+
 #~ msgid "Reserve And Profit/Loss Account"
 #~ msgstr "Cont de Rezerva si Profit/Pierderi"
 
@@ -13337,6 +13313,10 @@ msgstr ""
 #~ "Nu puteti valida o Inregistrare in Jurnal decat daca toate elementele "
 #~ "jurnalului se afla in acelasi plan de conturi !"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Conturi Incasari"
+
 #~ msgid "Tax codes"
 #~ msgstr "Coduri fiscale"
 
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index efabbff55e1..daf20290592 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -182,11 +182,6 @@ msgid "All Analytic Entries"
 msgstr "Все проводки аналитического учета"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Счета созданные за прошедшие 15 дней"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Заголовок столбца"
@@ -694,18 +689,6 @@ msgstr ""
 "Для проведения сверки, организация в проводках не должна различаться."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Счета к получению"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1688,11 +1671,6 @@ msgid "Responsible"
 msgstr "Ответственный"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Продажи по типу счета"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2789,13 +2767,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Продажи по бух. счетам"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Этот мастер создаст повторяющиеся бухгалтерские проводки"
@@ -6387,11 +6358,6 @@ msgid "Supplier Refund"
 msgstr "Возврат средств от поставщика"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Инфо-панель"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Проводки"
@@ -6962,11 +6928,6 @@ msgstr ""
 "пример: Моя модель на %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Счета доходов"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Ссылка на документ, создавший этот отчет о счете."
@@ -11501,6 +11462,10 @@ msgstr ""
 #~ msgid "General Credit"
 #~ msgstr "Общий кредит"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Счета к получению"
+
 #~ msgid "Date payment"
 #~ msgstr "Дата оплаты"
 
@@ -11616,6 +11581,9 @@ msgstr ""
 #~ msgid "Display accounts"
 #~ msgstr "Показать счета"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Счета созданные за прошедшие 15 дней"
+
 #~ msgid "account.installer.modules"
 #~ msgstr "account.installer.modules"
 
@@ -11631,6 +11599,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Переход к следующему партнеру"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Продажи по типу счета"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Ошибка! Вы не можете определить перекрывающиеся отчетные года"
 
@@ -11644,6 +11615,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Ошибка! Нельзя создать рекурсивные категории."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Продажи по бух. счетам"
+
 #, python-format
 #~ msgid ""
 #~ "No fiscal year defined for this date !\n"
@@ -11711,6 +11685,9 @@ msgstr ""
 #~ msgid "  valuation: percent"
 #~ msgstr "  оценка: процент"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Счета доходов"
+
 #~ msgid "9"
 #~ msgstr "9"
 
@@ -11955,6 +11932,9 @@ msgstr ""
 #~ msgid "Sort By"
 #~ msgstr "Сортировать по"
 
+#~ msgid "Dashboard"
+#~ msgstr "Инфо-панель"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Выполнение настройки"
 
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 2f30a6dd35b..441bc63a679 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 3a244028ac9..ce373d93122 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktúry vytvorené za posledných 15 dní"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Účty pohľadávok"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10456,9 +10417,16 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Účty pohľadávok"
+
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Neuhradené dodávateľské faktúry"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktúry vytvorené za posledných 15 dní"
+
 #~ msgid "Customer Invoices to Approve"
 #~ msgstr "Zákaznícke faktúry na schválenie"
 
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 5cceca7325c..01bb129d711 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -183,11 +183,6 @@ msgid "All Analytic Entries"
 msgstr "Vse analitične postavke"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi narejeni v zadnjih 15-ih dneh"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Oznaka stolpca"
@@ -684,18 +679,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Usklajeni vnosi podjetja bi morali biti enaki za vse vpise"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konti terjatev"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1685,11 +1668,6 @@ msgid "Responsible"
 msgstr "Odgovoren"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Prodaja glede na vrsto konta"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2765,13 +2743,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Konfiguracija kontnega načrta"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Prodaja po kontih"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Ta čarovnik bo ustvaril ponavljajoče vknjižbe."
@@ -6351,11 +6322,6 @@ msgid "Supplier Refund"
 msgstr "Vrnitev dobavitelju"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Nadzorna plošča"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Postavke"
@@ -6913,11 +6879,6 @@ msgstr ""
 "%(date)s: tenutni datum"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konti prihodkov"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Referenca dokumenta , ki je osnova za ta račun."
@@ -11409,6 +11370,10 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Analytic Journal -"
 #~ msgstr "Analitični dnevnik"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konti terjatev"
+
 #~ msgid "Journal Voucher"
 #~ msgstr "Dnevnik za kupone."
 
@@ -11560,12 +11525,18 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Account Manager"
 #~ msgstr "Odgovorni za stranko"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konti prihodkov"
+
 #~ msgid "Total :"
 #~ msgstr "Skupaj:"
 
 #~ msgid "Year :"
 #~ msgstr "Leto:"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi narejeni v zadnjih 15-ih dneh"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot remove/deactivate an account which is set as a property to any "
@@ -11637,9 +11608,15 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Total With Tax"
 #~ msgstr "Skupaj z davkom"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Prodaja glede na vrsto konta"
+
 #~ msgid "Tax codes"
 #~ msgstr "Davčne skupine"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Prodaja po kontih"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Vrste kontov"
 
@@ -11774,6 +11751,9 @@ msgstr "Preostali znesek terjatev ali obveznosti"
 #~ msgid "Create an Account based on this template"
 #~ msgstr "Kreiraj  konto na osnovi predloge"
 
+#~ msgid "Dashboard"
+#~ msgstr "Nadzorna plošča"
+
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "Namestitev kontnega načrta"
 
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index feec5719395..c88c990e3dd 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:17+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:35+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "Të Gjitha Shënimet Analitike"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2693,13 +2671,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6215,11 +6186,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6759,11 +6725,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index bb41bf9994d..2bac460adf9 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:21+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:40+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "Svi analitički unosi"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi kreirani u zadnjih 15 dana"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -669,18 +664,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konta potraživanja"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1642,11 +1625,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2701,13 +2679,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6237,11 +6208,6 @@ msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Stavke knjiženja"
@@ -6785,11 +6751,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konto Prihoda"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11483,6 +11444,10 @@ msgstr ""
 #~ msgid "Control Invoice"
 #~ msgstr "Kontrolisi račun"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konta potraživanja"
+
 #~ msgid "Date payment"
 #~ msgstr "Datum plaćanja"
 
@@ -11696,12 +11661,18 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Zatvaranje izvoda"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konto Prihoda"
+
 #~ msgid "Total :"
 #~ msgstr "Ukupno:"
 
 #~ msgid "Year :"
 #~ msgstr "Godina :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi kreirani u zadnjih 15 dana"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta po vrsti"
 
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index ea7c4c00a78..efba4df07d4 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -181,11 +181,6 @@ msgid "All Analytic Entries"
 msgstr "Svi analitički unosi"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Računi kreirani u zadnjih 15 dana"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Labela Kolone"
@@ -676,18 +671,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Konta potraživanja"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1649,11 +1632,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2708,13 +2686,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6244,11 +6215,6 @@ msgid "Supplier Refund"
 msgstr "Povrat Dobavljaču"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Stavke knjiženja"
@@ -6792,11 +6758,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Konto Prihoda"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -11523,6 +11484,10 @@ msgstr ""
 #~ msgid "Account cost and revenue by journal (This Month)"
 #~ msgstr "Trošak i prihod konta po dnevniku (ovaj mesec)"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Konta potraživanja"
+
 #~ msgid "Open for unreconciliation"
 #~ msgstr "Otvori za poništenje zatvaranja"
 
@@ -11751,12 +11716,18 @@ msgstr ""
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Izračunaj datume stavki"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Konto Prihoda"
+
 #~ msgid "Total :"
 #~ msgstr "Ukupno:"
 
 #~ msgid "Year :"
 #~ msgstr "Godina :"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Računi kreirani u zadnjih 15 dana"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Konta po vrsti"
 
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index b3d03136594..16e0bbd2ddb 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -185,11 +185,6 @@ msgid "All Analytic Entries"
 msgstr "Alla objektposter"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Faktura skapad inom 15 dagar"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Kolumnetikett"
@@ -704,18 +699,6 @@ msgstr ""
 "av dem korrekt."
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Kundfordringskonton"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1721,11 +1704,6 @@ msgid "Responsible"
 msgstr "Ansvarig"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Försäljning per kontotyp"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2833,13 +2811,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "Installera din kontoplan"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Försäljning per konto"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Denna assistent kommer att skapa återkommande bokföringsposter"
@@ -6515,11 +6486,6 @@ msgid "Supplier Refund"
 msgstr "Återbetalning till leverantör"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Infopanel"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Entry lines"
@@ -7106,11 +7072,6 @@ msgstr ""
 "t ex Min mall  på %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Intäktskonton"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -12629,6 +12590,9 @@ msgstr ""
 #~ "The optional quantity expressed by this line, eg: number of product sold. "
 #~ "The quantity is not a legal requirement but is very usefull for some reports."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Faktura skapad inom 15 dagar"
+
 #~ msgid "Calculated Balance"
 #~ msgstr "Balansräkning"
 
@@ -12673,6 +12637,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Hoppa till nästa företag"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Försäljning per kontotyp"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "Fel! Su kan inte definiera överlappande bokföringsår."
 
@@ -12686,6 +12653,9 @@ msgstr ""
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Fel ! Du kan inte skapa rekursiva kategorier."
 
+#~ msgid "Sales by Account"
+#~ msgstr "Försäljning per konto"
+
 #~ msgid "Narration"
 #~ msgstr "berättelse"
 
@@ -12929,6 +12899,10 @@ msgstr ""
 #~ msgid "You cannot remove an account which has account entries!. "
 #~ msgstr "Du kan inte radera ett konto med affärshändelser! "
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Kundfordringskonton"
+
 #~ msgid "Tax codes"
 #~ msgstr "Skattedeklarationsrubriker"
 
@@ -12938,9 +12912,15 @@ msgstr ""
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "Öppna för oavstämning"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Intäktskonton"
+
 #~ msgid "Unreconciliate transactions"
 #~ msgstr "Oavstämda transaktioner"
 
+#~ msgid "Dashboard"
+#~ msgstr "Infopanel"
+
 #~ msgid "Cost Ledger for period"
 #~ msgstr "Kostnadsredovisning för perioden"
 
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index 3cff3d99a33..44786a8eb8f 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index dc97cf5f11c..aa40c2a25b5 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 93a977ff5ae..7bcb63005c5 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:41+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr "วิเคราะห์ทุกรายการ"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "ใบแจ้งหนี้ที่สร้างขึ้นภายใน 15 วันที่ผ่านมา"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "บัญชีลูกหนี้"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr "รับผิดชอบ"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10450,6 +10411,10 @@ msgstr ""
 #~ msgid "Positive"
 #~ msgstr "ค่าเป็นบวก"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "บัญชีลูกหนี้"
+
 #~ msgid "Profit & Loss (Expense Accounts)"
 #~ msgstr "กำไรขาดทุน(บัญชีค่าใช้จ่าย)"
 
@@ -10499,6 +10464,9 @@ msgstr ""
 #~ "loss in a single document"
 #~ msgstr "งบกำไรขาดทุนทำให้คุณเห็นกำไรขาดทุนในภาพรวมของบริษัทในเอกสารฉบับเดียว"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "ใบแจ้งหนี้ที่สร้างขึ้นภายใน 15 วันที่ผ่านมา"
+
 #~ msgid "Your Reference"
 #~ msgstr "การอ้างอิงของคุณ"
 
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index df211917ccd..b71be74a6c8 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -664,18 +659,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1637,11 +1620,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2687,13 +2665,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6203,11 +6174,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6747,11 +6713,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 8f8c88b7f35..bac7c3efaab 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -181,11 +181,6 @@ msgid "All Analytic Entries"
 msgstr "Bütün Analitik hareketler"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Son 15 Günde Oluşturulmuş Faturalar"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "Kolon Etiketi"
@@ -694,18 +689,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Girişin uzlaştırılması için bütün girişler için firma aynı olmalı"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Alıcılar Hesabı"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1686,11 +1669,6 @@ msgid "Responsible"
 msgstr "Sorumlu"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Hesap Türüne göre Satışlar"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2786,13 +2764,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Hesaba Göre Satışlar"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "Bu sihirbaz yinelenen muhasebe girişleri oluşturu"
@@ -6410,11 +6381,6 @@ msgid "Supplier Refund"
 msgstr "Supplier Refund"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Dashboard"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Kayıt Kalemleri"
@@ -6995,11 +6961,6 @@ msgstr ""
 "e.g. My model on %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Gelir Hesapları"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Reference of the document that generated this invoice report."
@@ -11364,6 +11325,10 @@ msgstr ""
 #~ msgid "A/c No."
 #~ msgstr "A/c No."
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Alıcılar Hesabı"
+
 #~ msgid "Control Invoice"
 #~ msgstr "Fatura Kontrol Et"
 
@@ -11469,6 +11434,9 @@ msgstr ""
 #~ msgid "Compute Entry Dates"
 #~ msgstr "Giriş Tarihlerini Hesapla"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Gelir Hesapları"
+
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
 
@@ -11627,6 +11595,9 @@ msgstr ""
 #~ "You cannot modify company of this journal as its related record exist in "
 #~ "Entry Lines"
 
+#~ msgid "Sales by Account"
+#~ msgstr "Hesaba Göre Satışlar"
+
 #, python-format
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
@@ -11910,6 +11881,9 @@ msgstr ""
 #~ msgid "Can not find account chart for this company, Please Create account."
 #~ msgstr "Can not find account chart for this company, Please Create account."
 
+#~ msgid "Dashboard"
+#~ msgstr "Dashboard"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Account Profit And Loss Report"
 
@@ -12303,6 +12277,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Sıra alanı, kaynakları küçükten büyüğe doğru sıralamak için kullanılır."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Son 15 Günde Oluşturulmuş Faturalar"
+
 #, python-format
 #~ msgid " Journal"
 #~ msgstr " Yevmiye"
@@ -12463,6 +12440,9 @@ msgstr ""
 #~ msgid "Go to next partner"
 #~ msgstr "Sonraki paydaşa geç"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Hesap Türüne göre Satışlar"
+
 #~ msgid "Include initial balances"
 #~ msgstr "Başlangıç bakiyelerini içer"
 
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index dfe3a6a377d..18f4503dc69 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:22+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 502fb457ded..5e005a010ee 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgid "All Analytic Entries"
 msgstr "Всі Аналітичні Записи"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -666,18 +661,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Рахунки дебіторів"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1639,11 +1622,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2689,13 +2667,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6206,11 +6177,6 @@ msgid "Supplier Refund"
 msgstr "Повернення постачальнику"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Рядки проводки"
@@ -6750,11 +6716,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Рухунки доходів"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
@@ -10991,5 +10952,12 @@ msgstr ""
 #~ msgid "Statement reconcile"
 #~ msgstr "Вивірка виписки"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Рахунки дебіторів"
+
+#~ msgid "Income Accounts"
+#~ msgstr "Рухунки доходів"
+
 #~ msgid "Accounts by type"
 #~ msgstr "Рахунки за типом"
diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po
index e1c460716d5..1640d64e352 100644
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 3d7eb82d79e..559890531fb 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -185,11 +185,6 @@ msgid "All Analytic Entries"
 msgstr "Các bút toán quản trị"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Hoá đơn được tạo trong 15 ngày qua"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -697,18 +692,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "To reconcile the entries company should be the same for all entries"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Các tài khoản phải thu"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1692,11 +1675,6 @@ msgid "Responsible"
 msgstr "Chịu trách nhiệm"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Doanh số theo loại tài khoản"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2785,13 +2763,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Doanh thu theo tài khoản"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "This wizard will create recurring accounting entries"
@@ -6422,11 +6393,6 @@ msgid "Supplier Refund"
 msgstr "Hoàn tiền cho Nhà cung cấp"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Bảng điều khiển"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "Entry lines"
@@ -7004,11 +6970,6 @@ msgstr ""
 "e.g. My model on %(date)s"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Các Tài khoản Thu nhập"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "Tham chiếu tài liệu dùng để phát sinh báo cáo hóa đơn này."
@@ -11604,6 +11565,10 @@ msgstr ""
 #~ msgid "Are you sure ?"
 #~ msgstr "Bạn có chắc chắn?"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "Các tài khoản phải thu"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML không hợp lệ cho Kiến trúc Xem!"
 
@@ -11631,6 +11596,12 @@ msgstr ""
 #~ msgid "Bank account owner"
 #~ msgstr "Chủ tài khoản ngân hàng"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "Doanh số theo loại tài khoản"
+
+#~ msgid "Sales by Account"
+#~ msgstr "Doanh thu theo tài khoản"
+
 #~ msgid "Tax codes"
 #~ msgstr "Các mã thuế"
 
@@ -11795,6 +11766,9 @@ msgstr ""
 #~ msgid "Balance Sheet (Liability Accounts)"
 #~ msgstr "Bảng cân đối kế toán (Các Tài khoản Nợ)"
 
+#~ msgid "Dashboard"
+#~ msgstr "Bảng điều khiển"
+
 #~ msgid "Account Profit And Loss Report"
 #~ msgstr "Báo cáo Tài khoản Lợi nhuận và Lỗ"
 
@@ -11805,6 +11779,9 @@ msgstr ""
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "Loại tiền hiện tại không được cấu hình đúng !"
 
+#~ msgid "Income Accounts"
+#~ msgstr "Các Tài khoản Thu nhập"
+
 #~ msgid "Period length (days)"
 #~ msgstr "Thời gian của Chu kỳ (ngày)"
 
@@ -11838,6 +11815,9 @@ msgstr ""
 #~ "Báo cáo Lãi và Lỗ cho bạn một cái nhìn tổng quan về tình trạng lãi hay lỗ "
 #~ "của công ty bạn chỉ trong một tài liệu đơn."
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "Hoá đơn được tạo trong 15 ngày qua"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 06389ae80ac..09b4a8b9ac4 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgid "All Analytic Entries"
 msgstr "所有辅助核算"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "过去15天开的发票"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "字段标签"
@@ -667,18 +662,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "要核销这些凭证，这些凭证所属公司必须一致"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "应收款科目"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1641,11 +1624,6 @@ msgid "Responsible"
 msgstr "负责人"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "销售科目类型"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2702,13 +2680,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "科目表设置"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "销售科目"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "该向导将创建一个定期分录"
@@ -6241,11 +6212,6 @@ msgid "Supplier Refund"
 msgstr "供应商红字发票"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "仪表盘"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "明细"
@@ -6798,11 +6764,6 @@ msgstr ""
 "例如：日期为 %(date)s 的定期发生凭证"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "损益科目"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "相关单据生成此发票报表"
@@ -10800,6 +10761,10 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Control Invoice"
 #~ msgstr "控制发票"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "应收款科目"
+
 #~ msgid "Date payment"
 #~ msgstr "付款日期"
 
@@ -11996,6 +11961,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 #~ msgstr "<drawString x=\"4.6cm\" y=\"28.7cm\">"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "过去15天开的发票"
+
 #~ msgid ""
 #~ "The sequence field is used to order the resources from lower sequences to "
 #~ "higher ones"
@@ -12030,6 +11998,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "invoiced amount."
 #~ msgstr "无法建立发票！"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "销售科目类型"
+
 #~ msgid "Error! You cannot define overlapping fiscal years"
 #~ msgstr "错误！你不能重复定义会计年度"
 
@@ -12045,6 +12016,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Reserve & Profit/Loss Account"
 #~ msgstr "损益类科目"
 
+#~ msgid "Sales by Account"
+#~ msgstr "销售科目"
+
 #~ msgid "Calculated Balance"
 #~ msgstr "计算余额"
 
@@ -12327,6 +12301,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ msgid "Currnt currency is not confirured properly !"
 #~ msgstr "当前的货币没设置正确！"
 
+#~ msgid "Income Accounts"
+#~ msgstr "损益科目"
+
 #~ msgid ""
 #~ "Account Voucher module includes all the basic requirements of Voucher "
 #~ "Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
@@ -12604,6 +12581,9 @@ msgstr "基于当前币别的应收或应付款的余额"
 #~ "科目一览表是根据贵公司所在国家的会计制度建立的。辅助核算项一览表是按贵公司管理需要或者需要查看成本/收益。一般用于管理合同、项目、产品或部门。很多Open"
 #~ "ERP业务（发票、计工单、费用报销）都会生成相关辅助核算项的记录"
 
+#~ msgid "Dashboard"
+#~ msgstr "仪表盘"
+
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "导入会计科目表"
 
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index 51d1d8e69dd..c4c18dd951e 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:23+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:42+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -179,11 +179,6 @@ msgid "All Analytic Entries"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr ""
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr ""
@@ -665,18 +660,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr ""
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1638,11 +1621,6 @@ msgid "Responsible"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2688,13 +2666,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr ""
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr ""
@@ -6204,11 +6175,6 @@ msgid "Supplier Refund"
 msgstr ""
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr ""
@@ -6748,11 +6714,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr ""
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr ""
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index c8d90db4db8..de258142216 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:24+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -178,11 +178,6 @@ msgid "All Analytic Entries"
 msgstr "所有輔助核算"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "過去15天開的發票"
-
-#. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
 msgstr "欄位標籤"
@@ -666,18 +661,6 @@ msgid "To reconcile the entries company should be the same for all entries"
 msgstr "要核銷這些憑證，這些憑證所屬公司必須一致"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:297
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "應收款科目"
-
-#. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -1640,11 +1623,6 @@ msgid "Responsible"
 msgstr "負責人"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "銷售科目類型"
-
-#. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
@@ -2699,13 +2677,6 @@ msgid "Configure Your Chart of Accounts"
 msgstr "科目表設置"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "銷售科目"
-
-#. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
 msgstr "該嚮導將建立一個定期分錄"
@@ -6238,11 +6209,6 @@ msgid "Supplier Refund"
 msgstr "供應商紅字發票"
 
 #. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "儀表盤"
-
-#. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
 msgstr "明細"
@@ -6795,11 +6761,6 @@ msgstr ""
 "例如：日期為 %(date)s 的定期發生憑證"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "損益科目"
-
-#. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
 msgstr "相關單據生成此發票報表"
@@ -10609,12 +10570,25 @@ msgstr "基於當前幣別的應收或應付款的餘額"
 #~ msgid "Display accounts"
 #~ msgstr "顯示帳號"
 
+#~ msgid "Invoices Created Within Past 15 Days"
+#~ msgstr "過去15天開的發票"
+
 #~ msgid "Open For Unreconciliation"
 #~ msgstr "打開反核銷"
 
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "應收款科目"
+
 #~ msgid "Go to next partner"
 #~ msgstr "下一個業務夥伴"
 
+#~ msgid "Sales by Account Type"
+#~ msgstr "銷售科目類型"
+
+#~ msgid "Sales by Account"
+#~ msgstr "銷售科目"
+
 #~ msgid "Tax codes"
 #~ msgstr "稅編碼"
 
@@ -10639,6 +10613,12 @@ msgstr "基於當前幣別的應收或應付款的餘額"
 #~ msgid "Create an Account based on this template"
 #~ msgstr "基於此模板建立科目"
 
+#~ msgid "Dashboard"
+#~ msgstr "儀表盤"
+
+#~ msgid "Income Accounts"
+#~ msgstr "損益科目"
+
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "導入會計科目表"
 
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index b090b7e5609..4f5e86290ee 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <group col="4">
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e355c677e6d..2132eecb463 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -30,13 +30,13 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
                         <filter icon="terp-camera_test" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-today" string="Overdue Account" domain="[('date','&lt;',time.strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts with a past deadline."/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
                         <field name="partner_id"/>
                         <field name="user_id" widget="selection"/>
                     </group>
@@ -220,16 +220,17 @@
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
                     <group>
+                        <field name="name" string="Analytic Line"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
                         <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
                         <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                        <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="account_id"/>
-                        <field name="user_id">
-                            <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group string="Group By..." expand="0">
@@ -325,12 +326,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Journals">
-                  <group>
-                      <field name="code"/>
-                      <field name="name"/>
-                      <field name="type"/>
-                  </group>
-                  <newline/>
+                    <group>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
+                        <field name="type"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -392,75 +392,6 @@
             action="action_account_analytic_journal_tree"
             id="account_analytic_journal_print" parent="account.next_id_40"/>
 
-        #
-        # Statistics [where is this object in py file ?]
-        #
-
-        <!--<record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.form</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">form</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <form string="Analytic Entries Stats" version="7.0">-->
-        <!--            <group col="4">-->
-        <!--                <field name="name"/>-->
-        <!--                <field name="account_id"/>-->
-        <!--                <field name="journal_id"/>-->
-        <!--            </group>-->
-        <!--        </form>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.tree</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">tree</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <tree string="Analytic Entries Stats">-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="month"/>-->
-        <!--            <field name="account_id"/>-->
-        <!--            <field name="journal_id"/>-->
-        <!--            <field name="quantity"/>-->
-        <!--            <field name="revenue"/>-->
-        <!--            <field name="cost"/>-->
-        <!--        </tree>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.graph</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">graph</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <graph string="Analytic Entries Stats" type="bar">-->
-        <!--            <field name="name"/>-->
-        <!--            <field name="month"/>-->
-        <!--            <field name="cost" operator="+"/>-->
-        <!--            <field name="revenue" operator="+"/>-->
-        <!--            <field group="True" name="journal_id"/>-->
-        <!--        </graph>-->
-        <!--    </field>-->
-        <!--</record>-->
-        <!---->
-        <!--<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">-->
-        <!--    <field name="name">report.hr.timesheet.invoice.journal.search</field>-->
-        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
-        <!--    <field name="type">search</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <search string="Analytic Entries Stats">-->
-        <!--            <group>-->
-        <!--                <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>-->
-        <!--                   <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>-->
-        <!--                   <separator orientation="vertical"/>-->
-        <!--                <field name="name"/>-->
-        <!--                   <field name="month"/>-->
-        <!--                <field name="account_id"/>-->
-        <!--            </group>-->
-        <!--        </search>-->
-        <!--    </field>-->
-        <!--</record>-->
 
         <act_window
             context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 408e76fdcb9..da60b59a8f4 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -34,37 +34,16 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
-              <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
+                <group>
+                    <field name="day" string="Day"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                            name="month"
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries of last 30 days"/>
-                    <filter icon="terp-go-week"
-                            string="    7 Days    "
-                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Analytic Entries during last 7 days"/>
+                    <filter string="My Entries" icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     <separator orientation="vertical"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
-                    <field name="user_id">
-                    <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
-                    </field>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 92906604f63..f2b0cceddc0 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -68,6 +68,10 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group>
+                    <field name="date"/>
+                    <field name="date_created"/>
+                    <field name="date_maturity"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
                             context="{'year':'current_year'}"
@@ -95,10 +99,6 @@
                     <field name="partner_id"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
                  </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c464d1cfc46..452bf6d1c34 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -55,19 +55,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
-              <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                <group>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
@@ -84,25 +73,25 @@
                            help = "Open and Paid Invoices"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-personal" string="Customer"
-                            name="customer"
-                            domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
-                            help="Customer Invoices And Refunds"/>
+                           name="customer"
+                           domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
+                           help="Customer Invoices And Refunds"/>
                     <filter icon="terp-personal"
-                            string="Supplier"
-                            domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
-                            help="Supplier Invoices And Refunds"/>
-                   <separator orientation="vertical"/>
-                   <filter icon="terp-dolar" string="Invoice"
-                            domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
-                            help="Customer And Supplier Invoices"/>
-                   <filter icon="terp-dolar_ok!"
-                            string="Refund"
-                            domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
-                            help="Customer And Supplier Refunds"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                   <field name="user_id" />
-                   <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
+                           string="Supplier"
+                           domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
+                           help="Supplier Invoices And Refunds"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-dolar" string="Invoice"
+                           domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
+                           help="Customer And Supplier Invoices"/>
+                    <filter icon="terp-dolar_ok!"
+                           string="Refund"
+                           domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"
+                           help="Customer And Supplier Refunds"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="user_id" />
+                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -136,7 +125,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 587d068ca1b..c9c667ae70e 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -151,10 +151,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
@@ -217,10 +214,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-                    <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-                    <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
+                    <field name="name" string="Year"/>
                     <field name="month"/>
                </search>
             </field>
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index eceb1e5c760..a4538a90055 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -36,12 +36,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Treasury Analysis">
-                <group colspan="10" col="12">
+                <group>
                     <field name="fiscalyear_id"/>
                     <field name="period_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
-                 <newline/>
+                <newline/>
             </search>
         </field>
     </record>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 0c28155b76d..cf939c2ccfa 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -20,26 +20,22 @@
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <group col="8" colspan="4">
+                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" name="open" string="Open" domain="[('state','in',('open','draft'))]" help="Contracts in progress"/>
                         <filter icon="terp-gtk-media-pause" name="pending" string="Pending" domain="[('state','=','pending')]" help="Pending contracts to renew with your customer"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]"
                             name="renew"
                             help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
-                        <filter icon="terp-go-month"
-                             string=" +1 Month"
-                             domain="[('date','&lt;=', (datetime.date.today() + relativedelta(months=1)).strftime('%%Y-%%m-%%d')),('date','>=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Analytic Accounts with a past deadline in one month." />
-
                         <separator orientation="vertical"/>
-                        <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
-                        <field name="partner_id">
-                            <filter help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
-                        </field>
-                        <field name="user_id">
-                            <filter help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
-                        </field>
-
+                        <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                        <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index c4e8c16f70a..beb4dcbd34e 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -47,20 +47,20 @@
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <group>
-                    <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater than today or None" domain = "['|', ('date_stop', '&gt;', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
-                    <separator orientation="vertical"/>
-                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="date_stop"/>
+                        <separator orientation="vertical"/>
+                        <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="product_id"/>
+                        <field name="partner_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
-						<filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
-						<separator orientation="vertical"/>
-						<filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
+                        <filter string="Partner" icon="terp-partner"  context="{'group_by':'partner_id'}" help="Partner"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Product" icon="terp-accessories-archiver"  context="{'group_by':'product_id'}" help="Product" />
                         <filter string="Analytic Account" icon="terp-folder-green"  context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
                          <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"  context="{'group_by':'company_id'}" groups="base.group_multi_company" />
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index cd1467afd9e..045a0eb0cbb 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -196,7 +196,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Plans">
-                <field name="name"/>
+                <field name="name" string="Analytic Plan"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 01144c153e5..8efe929e471 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -64,7 +64,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Asset Category">
-                <field name="name"/>
+                <field name="name" string="Asset Category"/>
+                <separator orientation="vertical"/>
                 <field name="journal_id"/>
             </search>
         </field>
@@ -204,12 +205,14 @@
         <field name="arch" type="xml">
             <search string="Account Asset">
                 <group col="10" colspan="12">
+                    <field name="name" string="Asset"/>
+                    <separator orientation="vertical"/>
+                    <field name="purchase_date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="category_id"/>
-                    <field name="purchase_date"/>
                     <field name="partner_id"/>
                 </group>
             </search>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index c2f931862f5..f06e857cf7a 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -44,16 +44,8 @@
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <group col="10" colspan="12">
-                    <filter string="Year" icon="terp-go-year" name="year"
-                        domain="[('purchase_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Assets purchased in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                        domain="[('purchase_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in current month"/>
-                    <filter icon="terp-go-month" string="Month-1" separator="1"
-                        domain="[('purchase_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Assets purchased in last month"/>
+                    <field name="purchase_date"/>
+                    <field name="depreciation_date"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
                     <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
@@ -63,12 +55,10 @@
                     <separator orientation="vertical"/>
                     <field name="asset_id"/>
                     <field name="asset_category_id"/>
-                    <field name="depreciation_date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="partner_id"/>
-                    <field name="purchase_date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
@@ -94,7 +84,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_asset_asset_report_search"/>
-        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">From this report, you can have an overview on all depreciation. The tool search can also be used to personalise your Assets reports and so, match this analysis to your needs;</field>
     </record>
     
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index d806760a85b..a3185db2c92 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -118,41 +118,42 @@
     </record>
 
     <record id="view_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">bank.statement.line.filter</field>
-      <field name="model">account.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
-            <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
-            <separator orientation="vertical"/>
-            <field name="journal_id"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-          </group>
-          <newline/>
-          <group string="Extended Filters..." expand="0">
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="1">
-            <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">bank.statement.line.filter</field>
+        <field name="model">account.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
+                    <separator orientation="vertical"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" icon="terp-document-new" help="Draft Statement Lines."/>
+                    <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test" help="Confirmed Statement Lines."/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group string="Extended Filters..." expand="0">
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="1">
+                    <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_bank_statement_line" model="ir.actions.act_window">
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index d02f4e8b015..2e939ae7b58 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -18,8 +18,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Budgetary Position">
-                    <field name="code"/>
-                    <field name="name"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
             </field>
@@ -180,17 +179,18 @@
            <field name="arch" type="xml">
                <search string="Budget">
                    <group>
-                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
-                       <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
-                       <field name="code" />
-                       <field name="state"/>
-                       <field name="date_from"/>
-                       <field name="date_to"/>
-                   </group>
-               </search>
-           </field>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"/>
+                        <filter string="To Approve" icon="terp-camera_test" domain="[('state','=','confirm')]" help="To Approve Budgets" />
+                        <separator orientation="vertical"/>
+                        <field name="state"/>
+                    </group>
+                </search>
+            </field>
         </record>
 
         <record model="ir.actions.act_window" id="act_crossovered_budget_view">
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index f70dae8ffcd..bb2e833ce25 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -7,27 +7,29 @@
 
     <!-- CODA Bank Account Configuration -->
     <record id="view_coda_bank_account_search" model="ir.ui.view">
-      <field name="name">coda.bank.account.search</field>
-      <field name="model">coda.bank.account</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-          <search string="CODA Bank Account Configuration">
-              <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
-              <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
-              <separator orientation="vertical"/>
-              <field name="name"/>
-              <field name="bank_id"/>
-              <field name="description1"/>
-              <field name="journal"/>
-              <field name="currency" widget="selection"/>
-              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-              <newline/>
-              <group expand="0" string="Group By...">
-                <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-                <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
-              </group>
-          </search>
-      </field>
+        <field name="name">coda.bank.account.search</field>
+        <field name="model">coda.bank.account</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="CODA Bank Account Configuration">
+                <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]"
+                    string="CODA Bank Account"/>
+                <separator orientation="vertical"/>
+                <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
+                <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
+                <separator orientation="vertical"/>
+                <field name="bank_id"/>
+                <field name="journal"/>
+                <field name="currency" widget="selection"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+                </group>
+            </search>
+        </field>
     </record>
     <record id="view_coda_bank_account_list" model="ir.ui.view">
       <field name="name">coda.bank.account.list</field>
@@ -382,28 +384,31 @@
     </record>
 
     <record id="view_coda_bank_statement_search" model="ir.ui.view">
-      <field name="name">coda.bank.statement.search</field>
-      <field name="model">coda.bank.statement</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search CODA Bank Statements">
-          <group col="8" colspan="4">
-            <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
-            <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
-            <separator orientation="vertical"/>
-            <field name="name"/>
-            <field name="date"/>
-            <field name="period_id"/>
-            <field name="coda_bank_account_id"/>
-            <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Group By...">
-            <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-            <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.search</field>
+        <field name="model">coda.bank.statement</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search CODA Bank Statements">
+                <group col="8" colspan="4">
+                    <field name="name"
+                        string="CODA Bank Statement"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Normal" domain="[('type','=','normal')]" icon="terp-folder-green"/>
+                    <filter string="Info" domain="[('type','=','info')]" icon="terp-folder-yellow"/>
+                    <separator orientation="vertical"/>
+                    <field name="period_id"/>
+                    <field name="coda_bank_account_id"/>
+                    <field name="journal_id" widget="selection" domain="[('type', '=', 'bank')]"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                    <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record model="ir.actions.act_window" id="action_coda_bank_statements">
@@ -471,39 +476,42 @@
     </record>
 
     <record id="view_coda_bank_statement_line_filter" model="ir.ui.view">
-      <field name="name">coda.bank.statement.line.filter</field>
-      <field name="model">coda.bank.statement.line</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Search Bank Transactions">
-          <group col='6' colspan='4'>
-            <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
-            <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
-            <separator orientation="vertical"/>
-            <field name="statement_id"/>
-            <field name="val_date"/>
-            <field name="amount"/>
-            <field name="globalisation_id" string="Glob. Id"/>
-            <field name="globalisation_amount" string="Glob. Amount"/>
-            <field name="name"/>
-            <field name="type"/>
-          </group>
-          <newline/>
-          <group expand="0" string="Extended Filters...">
-            <field name="coda_bank_account_id"/>
-            <field name="account_id"/>
-            <field name="partner_id"/>
-            <field name="ref"/>
-            <field name="note"/>
-          </group>
-          <newline/>
-          <group string="Group By..." expand="0">
-            <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
-            <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
-            <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
-          </group>
-        </search>
-      </field>
+        <field name="name">coda.bank.statement.line.filter</field>
+        <field name="model">coda.bank.statement.line</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Search Bank Transactions">
+                <group col='6' colspan='4'>
+                    <field name="name"
+                        filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]"
+                        string="Bank Transaction"/>
+                    <separator orientation="vertical"/>
+                    <field name="val_date"/>
+                    <separator orientation="vertical"/>
+                    <filter name="debit" string="Debit" domain="[('amount','&gt;',0)]" icon="terp-folder-green" help="Debit Transactions."/>
+                    <filter name="credit" string="Credit" domain="[('amount','&lt;',0)]" icon="terp-folder-orange" help="Credit Transactions."/>
+                    <separator orientation="vertical"/>
+                    <field name="statement_id"/>
+                    <field name="globalisation_id" string="Glob. Id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Extended Filters...">
+                    <field name="coda_bank_account_id"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="amount"/>
+                    <field name="globalisation_amount" string="Glob. Amount"/>
+                    <field name="type"/>
+                    <field name="note"/>
+                </group>
+                <newline/>
+                <group string="Group By..." expand="0">
+                    <filter string="Bank Account" context="{'group_by':'coda_bank_account_id'}" icon="terp-folder-green"/>
+                    <filter string="Statement" context="{'group_by':'statement_id'}" icon="terp-folder-orange"/>
+                    <filter string="Fin.Account" context="{'group_by':'account_id'}" icon="terp-folder-yellow"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_coda_bank_statement_line" model="ir.actions.act_window">
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 89423327d68..c2e89202553 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,11 +71,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Followup">
-                   <group>
-                        <field name="name"/>
+                    <group>
+                        <field name="name" string="Followup"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                   </group>
-               </search>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 5ba0e147bf8..9627d12aa88 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -34,41 +34,42 @@
                </graph>
            </field>
       </record>
-	 <record id="view_account_followup_stat_search" model="ir.ui.view">
-        <field name="name">account_followup.stat.search</field>
-        <field name="model">account_followup.stat</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Follow-ups Sent">
-              <group>
-              <filter icon="terp-go-year" string="This Fiscal year"
-			              name="fiscalyear"
-			              domain="[('period_id','in','current_year')]"
+        <record id="view_account_followup_stat_search" model="ir.ui.view">
+            <field name="name">account_followup.stat.search</field>
+            <field name="model">account_followup.stat</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Follow-ups Sent">
+                    <group>
+                        <field name="date_move"/>
+                        <field name="date_move_last"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-go-year" string="This Fiscal year"
+                            name="fiscalyear"
+                            domain="[('period_id','in','current_year')]"
                             help="Follow up Entries with period in current year"/>
-              <separator orientation="vertical"/>
-              <filter icon="terp-camera_test" string="Not Litigation"
-              			   domain="[('blocked','=', False)]"
-                           help = "Including journal entries marked as a litigation"/>
-              <separator orientation="vertical"/>
-              <field name="partner_id"/>
-              <field name="balance" />
-              <field name="date_move" />
-              <field name="date_move_last" />
-              </group>
-              <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
-                    <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
-                </group>
-            </search>
-        </field>
-    </record>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test" string="Not Litigation"
+                            domain="[('blocked','=', False)]"
+                            help = "Including journal entries marked as a litigation"/>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="balance"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Litigation" icon="terp-camera_test"  context="{'group_by':'blocked'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Followup Level" icon="terp-stock_effects-object-colorize" name="followup_level" context="{'group_by':'followup_id'}" />
+                        <filter string="Latest Followup Date" icon="terp-go-month" context="{'group_by':'date_followup'}" />
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
+                        <filter string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="action_followup_stat" model="ir.actions.act_window">
             <field name="name">Follow-ups Sent</field>
             <field name="res_model">account_followup.stat</field>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 8a592f01ac2..32b6383a8cc 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -36,21 +36,22 @@
                   parent="account.menu_finance_periodical_processing_billing"
                   sequence="10"/>
 
-           <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
+        <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
             <field name="name">account_followup.stat.by.partner.search</field>
             <field name="model">account_followup.stat.by.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Partner to Remind">
-                   <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
-                   <separator orientation="vertical"/>
-                   <field name="partner_id"/>
-                   <field name="max_followup_id"/>
-                   <field name="date_followup"/>
-                   <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="date_followup"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Balance > 0" domain="[('balance','&gt;',0)]" icon="terp-dolar" name="balance_positive"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="max_followup_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
-           </record>
+        </record>
 
        <!-- Screen2 -->
            <record id="account_followup_stat_by_partner_tree" model="ir.ui.view">
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 8e18ec51d5b..e9789b8199e 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -74,7 +74,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Messages">
-                <field name="name"/>
+                <field name="name" string="Message"/>
+                <separator orientation="vertical"/>
                 <field name="msg"/>
             </search>
         </field>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e99f552389e..aa4cd18308f 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -47,12 +47,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Mode">
-                    <field name="name"/>
+                    <field name="name"
+                        string="Payment Mode"/>
+                    <separator orientation="vertical"/>
                     <field name="journal" widget='selection'/>
                     <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
                     </group>
                 </search>
             </field>
@@ -208,13 +210,16 @@
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <group>
+                        <field name="reference"
+                            string="Payment Order"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_done"/>
+                        <separator orientation="vertical"/>
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirmed" domain="[('state','=','open')]" icon="terp-camera_test"/>
                         <filter string="Done" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                         <separator orientation="vertical"/>
-                        <field name="reference"/>
                         <field name="mode" widget='selection'/>
-                        <field name="date_done"/>
                         <field name="state"/>
                     </group>
                     <newline/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 586d06449c8..6177da71eed 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -123,17 +123,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
                         <field name="period_id"/>
                     </group>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 9f5e7d78d66..702b65f5fb1 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -49,18 +49,8 @@
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
               <group>
-                    <filter icon="terp-go-year" string="Year" 
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="current month"/>
-                    <filter icon="terp-go-month" string="Month-1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="last month"/>
+                    <field name="date"/>
+                    <field name="date_due"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
@@ -81,10 +71,8 @@
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="journal_id" widget="selection"/>
-                    <field name="pay_now"/>
                     <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
+                    <field name="pay_now"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
@@ -115,7 +103,7 @@
         <field name="res_model">sale.receipt.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_sale_receipt_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ef043891a10..cfed906e431 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -9,17 +9,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
@@ -42,17 +41,16 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                         <field name="period_id"/>
                     </group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 739d8efe993..5de7636c0c1 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,21 +8,20 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Supplier"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -40,21 +39,20 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group>
+                        <field name="number" string="Voucher"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" help="To Review"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="number"/>
                         <field name="partner_id" string="Customer"/>
-                    </group>
-                    <newline/>
-                    <group>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                         <field name="period_id"/>
                     </group>
-                   <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index f21836aeee5..55c55398f4e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -63,17 +63,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
-                   <group>
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
-                    <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                </group>
+                    <group>
+                        <field name="name" string="Audittrail Rule"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft  Rule"/>
+                        <filter icon="terp-camera_test" string="Subscribed" domain="[('state','=','subscribed')]" help="Subscribed Rule"/>
+                        <separator orientation="vertical"/>
+                        <field name="object_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -170,18 +171,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
-                 <group>
-                    <field name="name"/>
-                    <field name="object_id"/>
-                    <field name="user_id"  widget="selection"/>
-                </group>
-                <newline/>
-                  <group expand="0" string="Group By...">
-                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
-                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
-                </group>
+                    <group>
+                        <field name="name" string="Audittrail Log"/>
+                        <separator orientation="vertical"/>
+                        <field name="object_id"/>
+                        <field name="user_id"  widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d33f453c662..da58c54cd73 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -94,6 +94,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
+                   <field name="email" string="Email"/>
+                   <separator orientation="vertical"/>
+                   <field name="event_date"/>
+                   <separator orientation="vertical"/>
                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review"
                        domain="[('state','=', 'needs-action')]"
                        help="Invitations To Review" />
@@ -107,11 +111,9 @@
                        domain="[('state','=', 'delegated')]"
                        help="Delegated Invitations" />
                    <separator orientation="vertical"/>
-                   <field name="email"/>
                    <field name="user_id" string="Responsible"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type"/>
-                   <field name="event_date"/>
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible" icon="terp-personal" domain="[]"
@@ -435,6 +437,8 @@
             <field name="arch" type="xml">
                 <search string="Search Events">
                        <group>
+                           <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
+                           <separator orientation="vertical"/>
                            <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
@@ -443,9 +447,6 @@
                                domain="[('state','=','confirmed')]"
                                help="Confirmed Events" />
                            <separator orientation="vertical"/>
-                           <field name="name" string="Summary"/>
-                           <field name="location" string="Location"/>
-                           <separator orientation="vertical"/>
                            <field name="user_id"/>
                            <separator orientation="vertical"/>
                            <field name="show_as"/>
@@ -465,7 +466,6 @@
                             <separator orientation="vertical" />
                             <filter string="Date" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date'}" />
-
                         </group>
                 </search>
             </field>
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 5cc2296cbcf..92290c2dd95 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-23 09:07+0000\n"
+"PO-Revision-Date: 2012-06-25 05:03+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:14+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -122,7 +122,7 @@ msgstr "Salesforceのインポート"
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooksのlppidsの為に"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -131,6 +131,8 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"初めてopenERPを利用する場合は、簡素化されたインターフェイスを選択されることをお勧めします。設定後いつでもユーザープリファレンスから設定変更ができま"
+"す。"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -187,16 +189,18 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"これは新規ユーザーのデフォルトのプリファレンスを設定し、既存のすべてのものを更新します。　その後に、ユーザーはユーザー設定フォームで自由に設定変更ができま"
+"す。"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "どのように顧客を呼びますか"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks lppids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index e54c08d2291..e9b698d562b 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -39,6 +39,7 @@ The user can also publish notes.
         'board_view.xml',
         'board_data_admin.xml',
         'board_data_home.xml',
+        'board_mydashboard_view.xml'
     ],
     'demo_xml': [
         'board_demo.xml'
diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/board_mydashboard_view.xml
new file mode 100644
index 00000000000..7a517c36ed7
--- /dev/null
+++ b/addons/board/board_mydashboard_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!--My Dashboard-->
+        <record model="ir.ui.view" id="board_my_dash_view">
+            <field name="name">My Dashboard</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="My Dashboard" layout="manual"  version="7.0">
+                    <board style="2-1">
+                        <column>
+                        </column>
+                    </board>
+                </form>
+            </field>
+        </record>
+
+        <!--My Dashboard Action-->
+        <record model="ir.actions.act_window" id="open_board_my_dash_action">
+            <field name="name">My Dashboard</field>
+            <field name="res_model">board.board</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="usage">menu</field>
+            <field name="view_id" ref="board_my_dash_view"/>
+            <field name="help">
+                This is your personal dashboard.
+                To customize it, go to any view in OpenERP, fill in the desired search filter,
+                and click on 'Add to Dashboard' in the search options.
+                The view will appear as an element in your dashboard.
+                &lt;p&gt;
+                You can drag and drop the elements to get your preferred dashboard layout.
+                Click on the cross (in the upper right corner) to remove an element.
+            </field>
+        </record> 
+
+        <!--My Dashboard Menu-->
+        <menuitem 
+            id="menu_board_my_dash"
+            parent="base.menu_reporting_dashboard"
+            action="open_board_my_dash_action"
+            sequence="5"/>
+    </data>
+</openerp>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 231d1956cca..f556b461835 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -8,7 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Dashboard">
-                <field name="name"/>
+                <field name="name" string="Dashboard"/>
                 <field name="line_ids"/>
             </search>
         </field>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 53adcd97e16..02025ab5261 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -158,16 +158,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Calendars">
+                    <field name="name" string="Calendar"/>
+                    <separator orientation="vertical"/>
                     <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
                     <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
                     <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
+                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)" string="MY"/>
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <field name="collection_id"/>
+                    <field name="type"/>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 768c0147020..1b8148fe43b 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -1,111 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
      <data>
-        <!-- crm user dashboard -->
-        <record model="ir.ui.view" id="crm_case_my_open_oppor">
-            <field name="name">Opportunities</field>
-            <field name="model">crm.lead</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
-                    <field name="name" string="Opportunity"/>
-                    <field name="partner_id" string="Customer"/>
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" sum="Total of Planned Revenue"/>
-                    <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                    <field name="date_deadline" invisible="1"/>
-                    <field name="state" groups="base.group_no_one"/>
-                </tree>
-            </field>
-        </record>
+        <!-- CRM dashboard -->
         <record model="ir.actions.act_window" id="act_my_oppor">
-            <field name="name">My Open Opportunities</field>
+            <field name="name">My Opportunities</field>
             <field name="res_model">crm.lead</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')]</field>
-            <field name="context">{'default_user_id': uid, 'default_type': 'opportunity'}</field>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_my_oppor_tree_view">
-            <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="crm_case_my_open_oppor"/>
-            <field name="act_window_id" ref="act_my_oppor"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="act_my_oppor_form_view">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="crm_case_form_view_oppor"/>
-            <field name="act_window_id" ref="act_my_oppor"/>
-        </record>
-
-        <record id="view_report_crm_oppor_graph" model="ir.ui.view">
-            <field name="name">crm.lead.report.graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="Opportunity Analysis" type="bar">
-                    <field name="stage_id"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="act_my_oppor_stage">
-             <field name="name">Planned Revenue By Stage</field>
-             <field name="res_model">crm.lead.report</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">graph,tree,form</field>
-             <field name="view_id" ref="view_report_crm_oppor_graph"/>
-             <field name="domain">[('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&amp;', ('state', '=', 'done'), ('date_closed','&gt;=',datetime.date.today().strftime('%Y-%m-01'))]</field>
-             <field name="context">{'search_default_Stage':1}</field>
-        </record>
-
-        <record model="ir.ui.view" id="board_crm_form">
-            <field name="name">Sales Dashboard Form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales Dashboard" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action string="My Opportunities" name="%(act_my_oppor)d" creatable="true"/>
-                        </column>
-                        <column>
-                            <action string="My Planned Revenues by Stage" name="%(act_my_oppor_stage)d"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="open_board_crm">
-            <field name="name">CRM</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_crm_form"/>
+            <field name="domain">[('user_id','=',uid),('type', '=', 'opportunity'),('state','not in',('cancel','done'))]</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_oppor"/>
         </record>
 
-        <!-- crm mananger dashboard -->
-        <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
-            <field name="name">Opportunities By Categories - Graph</field>
-            <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
-                    <field name="categ_id"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="act_oppor_categ">
-            <field name="name">Opportunities By Categories</field>
-            <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form</field>
-            <field name="view_id" ref="view_crm_opportunity_categ_graph"/>
-            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
-            <field name="context">{'search_default_Category':1}</field>
+        <record model="ir.actions.act_window" id="act_crm_tag_tree_view_leads_all">
+            <field name="name">New Leads</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('user_id','=',uid),('state','=','draft'),('type','=','lead')]</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
         </record>
 
         <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
@@ -119,6 +29,7 @@
                 </graph>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="act_opportunity_stage">
             <field name="name">Opportunities By Stage</field>
             <field name="res_model">crm.lead.report</field>
@@ -129,28 +40,41 @@
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
+        <!--Planned Revenue By User line graph-->
         <record model="ir.ui.view" id="view_crm_opportunity_user_stage_graph">
             <field name="name">Opportunities By Stage Per User - Graph</field>
             <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Opportunities By Stage" type="bar">
+                <graph string="Opportunities By Stage" type="line">
                     <field name="stage_id"/>
                     <field name="planned_revenue" operator="+"/>
                     <field name="user_id" group="True"/>
                 </graph>
             </field>
         </record>
+
+        <!--Planned Revenue By User line graph action-->
         <record model="ir.actions.act_window" id="act_oppor_stage_user">
             <field name="name">Planned Revenue By User and Stage</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
-            <field name="domain">[('state','!=','cancel')]</field>
+            <field name="domain">[('state','!=','cancel'),('opening_date','&gt;',datetime.date.today().strftime("%Y-%m-%d"))]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
+        <record model="ir.actions.act_window" id="crm_case_confirmed_meet">
+            <field name="name">Meetings</field>
+            <field name="res_model">crm.meeting</field>
+            <field name="view_mode">calendar,tree,form,gantt</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
+            <field name="context">{"calendar_default_user_id":uid}</field>
+            <field name="domain">[('state','=','open'),('date','&gt;',datetime.date.today().strftime("%Y-%m-%d %H:%M:%S"))]</field>
+            <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+        </record>
+
         <record model="ir.ui.view" id="board_crm_statistical_form">
             <field name="name">CRM - Statistical Dashboard Form</field>
             <field name="model">board.board</field>
@@ -159,29 +83,33 @@
                 <form string="Statistics Dashboard" version="7.0">
                     <board style="1-1">
                         <column>
-                            <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
-                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
+                            <action string="New Leads" name="%(act_crm_tag_tree_view_leads_all)d"/>
+                            <action string="My Opportunities" name="%(act_my_oppor)d"/>
+                            <action string="My Next Meetings" name="%(crm_case_confirmed_meet)d"/>
                         </column>
                         <column>
                             <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
+                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
                         </column>
                     </board>
                 </form>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="open_board_statistical_dash">
-            <field name="name">CRM Manager</field>
+            <field name="name">CRM</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
-        <menuitem 
+
+        <menuitem
             id="menu_board_statistics_dash"
             parent="base.menu_reporting_dashboard"
             action="open_board_statistical_dash"
-            sequence="11"
+            sequence="10"
             groups="base.group_sale_manager"/>
 
     </data>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 21c7f9e31ab..8fc6beabe8b 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -271,7 +271,59 @@
             <field name="city">Grand-Rosière</field>
             <field eval="1367" name="zip"/>
             <field name="country_id" ref="base.be"/>
+            <field name="color">8</field>
         </record>
+        <!-- Some messages linked to the previous opportunity -->
+        <record id="message_email0" model="mail.message">
+            <field name="subject">Kitchen design</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Email0 inquiry]]></field>
+            <field name="type">email</field>
+            <field name="state">sent</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_note0" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Internal note0]]></field>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_note0_comment0" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[comment on note0]]></field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_note0_comment1" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[comment1 on note0]]></field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        <record id="message_email1" model="mail.message">
+            <field name="subject">Your inquiry</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_rdroundfundingunits25"></field>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[hello, outgoing email]]></field>
+            <field name="type">email</field>
+            <field name="state">received</field>
+            <field name="user_id" ref="base.user_root"></field>
+        </record>
+        
         <record id="crm_case_unifliege" model="crm.lead">
             <field eval="1" name="active"/>
             <field name="type">opportunity</field>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index fd3a398845d..cbcd5b3b3bd 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -45,7 +45,7 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">kanban,tree,form,graph,calendar</field>
           <field name="domain">[('type','=','opportunity')]</field>
-          <field name="context">{'search_default_new':1, 'search_default_open':1, 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+          <field name="context">{'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
           <field name="view_id" eval="False"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
           <field name="help">With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 93d6053635c..4fa4d778082 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
-                    <field name="name"/>
+                    <field name="name" string="Stage Name"/>
+                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="type"/>
                 </search>
@@ -312,6 +313,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
+                <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
+                <field name="subjects"/>     
+                <separator orientation="vertical"/>
+                <field name="create_date"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"
                     name="new" help="New Leads"
@@ -324,39 +331,21 @@
                     string="Pending"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-today" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                    help="Todays' Leads" />
-                <filter icon="terp-go-week" string="7 Days"
-                    help="Leads creating during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
-                />
-                <separator orientation="vertical"/>
-                <field name="name" string="Lead / Customer"
-                    filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="user_id">
-                    <filter icon="terp-personal-"
+                <filter string="Unassigned Leads"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
-                </field>
-                <field name="subjects"/>
-                <field name="section_id" widget="selection"
-                    context="{'invisible_section': False}">
-                    <filter icon="terp-personal+"
+                <filter string="Leads Assigned to Me or My Team(s)"
+                        icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="My Sales Team(s)"/>
-                    <filter icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
+                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <field name="section_id" widget="selection"
+                    context="{'invisible_section': False}"/>
+                <field name="country_id" context="{'invisible_country': False}"/>
                 <separator orientation="vertical"/>
-                <field name="country_id" context="{'invisible_country': False}">
-                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                </field>
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -375,6 +364,15 @@
                     <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
+                <separator orientation="vertical"/>
+                <group string="Display">
+                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
            </search>
         </field>
     </record>
@@ -567,6 +565,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
+                <field name="name" string="Opportunity / Customer"
+                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <separator orientation="vertical"/>
                 <filter icon="terp-check"
                     string="New"  help="New Opportunities"
                     name="new"
@@ -579,25 +580,20 @@
                     string="Pending"  help="Pending Opportunities"
                     name="pending"
                     domain="[('state','=','pending')]"/>
-                <separator orientation="vertical"/>
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="user_id">
-                    <filter icon="terp-personal-"
+                <filter string="Unassigned Opportunities"
+                        icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
-                </field>
-                <field name="section_id"
-                    context="{'invisible_section': False, 'default_section_id': self}">
-                    <filter icon="terp-personal+"
+               <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
                         domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                         context="{'invisible_section': False}"
-                        help="My Sales Team(s)" />
-                    <filter icon="terp-personal+"
-                        context="{'invisible_section': False}"
-                        domain="[]"
-                        help="Show Sales Team"/>
-                </field>
+                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                <separator orientation="vertical"/>
+                <field name="user_id"/>
+                <field name="country"/>
+                <field name="partner_id"/>
+                <field name="section_id"
+                    context="{'invisible_section': False, 'default_section_id': self}"/>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="16">
                     <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
@@ -614,6 +610,13 @@
                     <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
+                <group string="Display">
+                    <filter string="Show Sales Team"
+                        icon="terp-personal+"
+                        context="{'invisible_section': False}"
+                        domain="[]"
+                        help="Show Sales Team"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index c855fae26cc..85e9864115a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -285,12 +285,14 @@
                 <search string="Search Meetings">
                        <group>
                            <field name="name" string="Meeting / Partner"
-                               filter_domain="['|', ('name','ilike',self), ('partner_id','ilike', self)]"/>
-                           <field name="user_id">
-                               <filter icon="terp-personal"
+                               filter_domain="['|',('name','ilike',self),('partner_id','ilike', self)]"/>
+                           <separator orientation="vertical"/>
+                           <filter string="My Meetings"
+                                   icon="terp-personal"
                                    domain="[('user_id','=',uid)]"
                                    help="My Meetings" />
-                           </field>
+                           <separator orientation="vertical"/>   
+                           <field name="user_id"/>
                            <field name="partner_id"/>
                        </group>
                 </search>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index b4e65d9aa0a..e2204d66efc 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -105,7 +105,7 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain">[('state','!=','done')]</field>
         <field name="context" eval="'{\'default_state\':\'open\'}'"/>
-        <field name="search_view_id" ref="crm.view_crm_case_scheduled_phonecalls_filter"/>
+        <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help">Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0722a278fb0..966387608ed 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -177,82 +177,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
+               <field name="name" string="Phonecalls"/>
                <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
-               <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]"
-                       context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal"
-                       domain="[]" context="{'group_by':'user_id'}" />
-                   <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
-                       domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" help="Date of Call" />
-               </group>
-           </search>
-        </field>
-    </record>
-    <!-- Scheduled a phonecall search view-->
-    <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
-        <field name="name">CRM - Scheduled Calls Search</field>
-        <field name="model">crm.phonecall</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Scheduled Phonecalls">
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <field name="date"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-go-today" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
-                    ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
-                   name="today"
-                   help="Todays's Phonecalls"
-               />
-               <filter icon="terp-go-week"
-                   string="7 Days"
-                   help="Phonecalls during last 7 days"
-                   domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-               />
-
+               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
+               <filter string="Unassigned Phonecalls"
+                       icon="terp-personal-"
+                       domain="[('user_id','=',False)]"
+                       help="Unassigned Phonecalls"/>
+               <filter string="Phone Calls Assigned to Me or My Team(s)"
+                        icon="terp-personal+"
+                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       help="Phone Calls that are assigned to me or to my team(s)" />
                <separator orientation="vertical"/>
-               <field name="name"/>
                <field name="partner_id"/>
-               <field name="user_id">
-                   <filter icon="terp-personal-"
-                       domain="[('user_id','=',False)]"
-                       help="Unassigned Phonecalls" />
-               </field>
+               <field name="user_id"/>
                <field name="section_id"
-                   widget="selection" string="Sales Team">
-                   <filter icon="terp-personal+"
-                       domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="My Sales Team(s)" />
-               </field>
+                   widget="selection" string="Sales Team"/>
                <newline/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]"
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index e89e0c1a8d8..2c62ae2ead3 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -69,17 +69,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Type for this month" />
-                           <separator orientation="vertical"/>
-                           <field name="section_id"
-                               widget="selection" />
-                           <field name="category2_id"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
+                        <field name="section_id" widget="selection" />
+                        <field name="category2_id"/>
                         <field name="nbr"/>
                         <field name="state"/>
                    </group>
@@ -163,13 +158,9 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Team and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Team and Stage for this month" />
-                           <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
@@ -238,19 +229,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Section, Category and Stage for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Section, Category and Stage for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-
-                   </group>
+                    </group>
                </search>
             </field>
         </record>
@@ -332,18 +318,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
-                   <group>
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by User for this year" />
-                           <filter string="This Month" icon="terp-go-month"
-                               domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by User for this month" />
-                           <separator orientation="vertical"/>
+                    <group>
+                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <field name="month"/>
                         <field name="section_id" widget="selection"/>
                         <field name="nbr"/>
                         <field name="state"/>
-                   </group>
+                    </group>
                </search>
             </field>
     </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index d153eed4714..142d44432f0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -72,17 +72,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-personal"
                             name="lead"
                             string="Lead"
@@ -110,18 +99,15 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)" icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical" />
+                        <field name="section_id"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index c91999319ce..3f28fb8730e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -52,17 +52,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Phone calls made in current year"/>
-                        <separator orientation="vertical" />
-                        <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Phone calls made in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Phone calls made in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-gtk-go-back-rtl"
                             string="Todo"
                             domain="[('state','in',('draft','open'))]"
@@ -75,17 +64,16 @@
                             string="Not Held"
                             domain="[('state','=','pending')]"
                             help="Phone calls which are in pending state"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)" />
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                                help="Phone calls that are assigned to one of the sale teams I manage"/>
+                        <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 8ca4e4755ee..4b2cf008958 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -39,6 +39,9 @@
                     <field name="category_id" position="after">
                         <field name="section_id" completion="1" widget="selection"/>
                     </field>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="country_id"/>
+                    </xpath>
                 </field>
         </record>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index acff477535c..db479343281 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -196,6 +196,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
+                    <field name="name" string="Claims"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New" name="current"
                         domain="[('state','=','draft')]"
                         help="New Claims" />
@@ -209,14 +211,13 @@
                         domain="[('state','=','pending')]"
                         help="All pending Claims"
                     />
+                    <filter string="Unassigned Claims"
+                            icon="terp-personal-"
+                            domain="[('user_id','=', False)]"
+                            help="Unassigned Claims" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
-                            <filter icon="terp-personal-"
-                                domain="[('user_id','=', False)]"
-                                help="Unassigned Claims" />
-                    </field>
+                    <field name="user_id" widget="selection"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 62beda00c8a..e92102f889d 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -54,20 +54,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                       <filter string="Year" icon="terp-go-year" name="year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                               help="Claims created in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Claims created in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Claims created in last month"/>
-
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -77,27 +63,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
@@ -116,6 +97,7 @@
                         <field name="priority" />
                         <field name="type_action" />
                         <newline/>
+                        <field name="create_date" />
                         <field name="date_closed" />
                         <field name="date_deadline" />
                     </group>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index eb7bcade10b..dfe58162d83 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -163,6 +163,8 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
+                            <field name="name" string="Fund Description"/>
+                            <separator orientation="vertical" />
                             <filter icon="terp-check" string="New"
                                 domain="[('state','=','draft')]" name="current"
                                 help="New Funds" />
@@ -174,20 +176,19 @@
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
                             <separator orientation="vertical" />
-                            <field name="state"/>
-                            <field name="name"
-                                string="Fund Description" />
-                            <field name="user_id"
-                                widget="selection">
-                                <filter icon="terp-personal-"
+                            <filter string="Unassigned"
+                                    icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
-                            </field>
-                            <field name="section_id" widget="selection" string="Sales Team">
-                                <filter icon="terp-personal+"
+                            <filter string="Assigned to Me or to My Sales Team(s)" 
+                                    icon="terp-personal+"
                                     domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="My Sales Team(s)" />
-                            </field>
+                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
+                            <separator orientation="vertical" />
+                            <field name="state"/>
+                            <field name="user_id" 
+                                widget="selection"/>
+                            <field name="section_id" widget="selection" string="Sales Team"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
@@ -197,14 +198,12 @@
                             <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Category" help="Fund Category"
                                 icon="terp-stock_symbol-selection" domain="[]"
                                 context="{'group_by':'categ_id'}" />
                             <filter string="Payment Mode" help="Payment Mode"
                                 icon="terp-dolar" domain="[]"
                                 context="{'group_by':'type_id'}" />
-                            <separator orientation="vertical" />
                             <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
                                 context="{'group_by':'state'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index afdcf56d50e..5a3ed924567 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -78,19 +78,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Funds raised in current year"/>
-                        <separator orientation="vertical" />
-
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Funds raised in current month"/>
-
-                       <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Funds raised in last month"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-document-new"
                             string="New"
                             domain="[('state','=','draft')]"/>
@@ -100,23 +87,22 @@
                         <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter string="My Sales Team(s)"
+                                icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                                icon="terp-go-home"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id.company_id','=',uid)]"
                                 help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <separator orientation="vertical"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" string="Salesperson"/>
                     </group>
                     <newline/>
                     <group  expand="0" string="Extended Filters...">
@@ -128,6 +114,7 @@
                             domain="[('state','=','cancel')]"/>
                         <separator orientation="vertical"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="create_date"/>
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4612fdf20a5..2a004b32d3e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -149,6 +149,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
+                    <field name="name" string="Query"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="New"
                         name="current"
                         domain="[('state','=','draft')]"
@@ -163,25 +167,14 @@
                         domain="[('state','=','pending')]"
                         help="All pending Helpdesk Request"
                     />
+                    <filter string="Assigned to Me or My Sales Team(s)"
+                            icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','&gt;=',current_date), ('date','&lt;=',current_date)]"
-                        help="Todays's Helpdesk Requests"
-                        />
-                    <filter icon="terp-go-week"
-                        string="7 Days"
-                        help="Helpdesk requests during last 7 days"
-                        domain="[('date','&lt;',current_date), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                    <separator orientation="vertical"/>
-                    <field name="name" string="Query"/>
                     <field name="partner_id" />
                     <field name="user_id" widget="selection"/>
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
-                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="My Sales Team(s)" />
-                    </field>
+                    <field name="section_id" widget="selection" string="Sales Team"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index fdf8d5ad0f9..6060c6c1f90 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -54,47 +54,35 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Helpdesk requests occurred in current year"/>
-                        <separator orientation="vertical" />
-
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in current month"/>
-                        <filter icon="terp-go-month" string="Month-1"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests occurred in last month"/>
-                        <separator orientation="vertical" />
                         <filter string="New" icon="terp-check"
                         domain="[('state','=','draft')]" />
                         <filter string="Open" icon="terp-camera_test"
                         domain="[('state','=','open')]" />
                         <filter string="Closed" icon="terp-dialog-close"
                         domain="[('state','=','cancel')]" />
-                        <separator orientation="vertical" />
-                        <field name="section_id" string="Sales Team"
-                            context="{'invisible_section': False}">
-                            <filter icon="terp-personal+"
+                        <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                        <filter string="My Sales Team(s)"
+                            icon="terp-personal+"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id','=',uid)]"
                             help="My Sales Team(s)" />
-                        </field>
-                        <field name="company_id" groups="base.group_multi_company">
-                            <filter icon="terp-go-home"
+                        <filter string="My Company"
+                            icon="terp-go-home"
                             context="{'invisible_section': False}"
                             domain="[('section_id.user_id.company_id','=',uid)]"
                             help="My company"/>
-                        </field>
-                        <field name="user_id" string="Salesperson">
-                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" string="Salesperson"/>
+                        <field name="section_id" string="Sales Team"
+                            context="{'invisible_section': False}"/>   
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
                         <newline/>
+                        <field name="create_date"/>
                         <field name="date_closed" string="Close Date"/>
                     </group>
                     <newline/>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 18b31c009ad..a34a9139c3c 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -10,11 +10,6 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open'))]"/>
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 635a74052e9..38e4a16ad85 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -12,10 +12,13 @@
                             <action string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
                                 view_mode="tree,form"/>
+                             <action string="Files by Month"
+                                name="%(document.action_view_files_by_month_graph)d"
+                                view_mode="graph,tree"/>
                         </column>
                         <column>
-                            <action string="File Size by Month"
-                                name="%(document.action_view_size_month)d"
+                            <action string="Files by user"
+                                name="%(document.action_view_files_by_user_graph)d"
                                 view_mode="graph,tree"/>
                         </column>
                      </board>
@@ -25,71 +28,18 @@
 
 
         <record model="ir.actions.act_window" id="open_board_document_manager">
-            <field name="name">Document Dashboard</field>
+            <field name="name">Knowledge</field>
              <field name="res_model">board.board</field>
              <field name="view_type">form</field>
              <field name="view_mode">form</field>
-
             <field name="view_id" ref="board_document_manager_form"/>
          </record>
+        
+         <menuitem id="menu_reports_document"
+                   parent="base.menu_reporting_dashboard"
+                   sequence="55"
+                   action="open_board_document_manager"
+                   icon="terp-graph"/>
 
-        <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
-         <menuitem
-            name="Knowledge"
-            id="menu_reports_document"
-            parent="base.menu_reporting_dashboard"
-            sequence="45"
-            groups="base.group_system"/>
-
-
-         <menuitem
-            parent="menu_reports_document"
-            action="open_board_document_manager"
-            sequence="1"
-            id="menu_reports_document_manager"
-            icon="terp-graph"/>
-
-        <record model="ir.ui.view" id="board_document_manager_form1">
-            <field name="name">board.document.manager.form1</field>
-             <field name="model">board.board</field>
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-                <form string="Document board" layout="manual" version="7.0">
-                     <board style="2-1">
-                        <column>
-                            <action string="Wall of Shame"
-                                name="%(document.action_view_wall)d"
-                                view_mode="tree"/>
-
-                        </column>
-                        <column>
-                            <action string="Files by Users"
-                                name="%(document.action_view_user_graph)d"
-                                view_mode="graph,tree"/>
-
-                            <action string="Files by Month"
-                                name="%(document.action_view_files_by_month_graph)d"
-                                view_mode="graph,tree"/>
-                        </column>
-                     </board>
-                 </form>
-            </field>
-        </record>
-
-
-        <record model="ir.actions.act_window" id="open_board_document_manager1">
-            <field name="name">Statistics by User</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_document_manager_form1"/>
-        </record>
-
-        <menuitem
-            parent="menu_reports_document"
-            action="open_board_document_manager1"
-            sequence="1"
-            id="menu_reports_document_manager1"
-            icon="terp-graph"/>
      </data>
  </openerp>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 82919ab02cb..da4b6c2284d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -39,8 +39,8 @@
             <field name="model">document.storage</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Document storage">
-                    <field name="name" />
+                <search string="Search Document Storage">
+                    <field name="name" string="Document Storage"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -171,13 +171,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
+                    <field name="name" string="Document Directory"/>
+                    <separator orientation="vertical"/>
                     <filter string="Static" domain="[('type','=','directory')]"/>
                     <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name" />
-                    <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
+                    <field name="user_id" />
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -291,15 +292,18 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-                <field name="create_uid" position="replace">
-                    <field name="user_id">
-                            <filter icon="terp-personal"
-                                domain="[('user_id','=',uid)]"
-                                help="Filter on my documents" />
-                        </field>
+                <xpath expr="//filter[@name='my_documents_filter']" position="replace">
+                    <filter name="my_documents_filter" 
+                            string="My Document(s)"
+                            icon="terp-personal"
+                            domain="[('user_id','=',uid)]"
+                            help="Filter on my documents"/>
+                </xpath>
+                <xpath expr="//field[@name='create_uid']" position="replace">
+                    <field name="user_id"/>
                     <field name="parent_id" />
                     <field name="index_content"/>
-                </field>
+                </xpath>
             </field>
     </record>
 
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 34b61f01c01..7b09f131178 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -64,41 +64,8 @@ class report_document_user(osv.osv):
                  group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname
              )
         """)
-report_document_user()
 
 
-
-class report_files_partner(osv.osv):
-    _name = "report.files.partner"
-    _description = "Files details by Partners"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'file_size': fields.integer('File Size', readonly=True),
-        'nbr':fields.integer('# of Files', readonly=True),
-        'partner':fields.char('Partner',size=64,readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-     }
-    def init(self, cr):
-         tools.drop_view_if_exists(cr, 'report_files_partner')
-         cr.execute("""
-            CREATE VIEW report_files_partner as (
-                SELECT min(f.id) AS id,
-                       COUNT(*) AS nbr,
-                       to_char(date_trunc('month', f.create_date),'YYYY') AS name,
-                       to_char(date_trunc('month', f.create_date),'MM') AS month,
-                       SUM(f.file_size) AS file_size,
-                       p.name AS partner
-
-                FROM ir_attachment f
-                  LEFT JOIN res_partner p ON (f.partner_id=p.id)
-                WHERE f.datas_fname IS NOT NULL
-                GROUP BY p.name, date_trunc('month', f.create_date)
-             )
-         """)
-report_files_partner()
-
 class report_document_file(osv.osv):
     _name = "report.document.file"
     _description = "Files details by Directory"
@@ -122,37 +89,5 @@ class report_document_file(osv.osv):
              )
         """)
 
-report_document_file()
-
-class report_document_wall(osv.osv):
-    _name = "report.document.wall"
-    _description = "Users that did not inserted documents since one month"
-    _auto = False
-    _columns = {
-        'name': fields.date('Month', readonly=True),
-        'user_id':fields.many2one('res.users', 'Owner',readonly=True),
-        'user':fields.char('User',size=64,readonly=True),
-        'month': fields.char('Month', size=24,readonly=True),
-        'last':fields.datetime('Last Posted Time', readonly=True),
-             }
-
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_document_wall')
-        cr.execute("""
-            create or replace view report_document_wall as (
-               select max(f.id) as id,
-               to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last,
-               f.user_id as user_id, f.user_id as user,
-               to_char(f.create_date,'Month') as month
-               from ir_attachment f
-               where f.create_date in (
-                   select max(i.create_date)
-                   from ir_attachment i
-                   inner join res_users u on (i.user_id=u.id)
-                   group by i.user_id) group by f.user_id,f.create_date
-                   having (CURRENT_DATE - to_date(to_char(f.create_date,'YYYY-MM-DD'),'YYYY-MM-DD')) > 30
-             )
-        """)
-report_document_wall()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e6e1847cd56..e688707086a 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,22 +41,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                        <group>
+                    <group>
+                        <field name="name"
+                            filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]"
+                            string="Users File"/>
                         <separator orientation="vertical"/>
-                            <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
-                            <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="month"/>
-                            <field name="user"/>
-                            <field name="directory"/>
-                        </group>
+                        <field name="month"/>
+                    </group>
                </search>
             </field>
         </record>
 
-     <!--   <menuitem name="Document Management" id="menu_action_view_my_document"/>
-        <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>-->
 
         <record model="ir.actions.act_window" id="action_view_all_document_tree1">
             <field name="name">All Users files</field>
@@ -67,74 +62,20 @@
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
-      <!--  <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>-->
 
-<!--        -->
-        <record model="ir.ui.view" id="view_document_wall_form">
-            <field name="name">report.document.wall.form</field>
-            <field name="model">report.document.wall</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wall of Shame">
-                    <field name="user_id" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="last"/>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_document_wall_tree">
-            <field name="name">report.document.wall.tree</field>
-            <field name="model">report.document.wall</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Wall of Shame">
-                    <field name="user_id" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="last"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_wall">
-            <field name="name">Wall of Shame</field>
-            <field name="res_model">report.document.wall</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!--<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>-->
-
-<!--***************************************************************************************-->
-
-        <record model="ir.ui.view" id="view_document_by_resourcetype_graph">
-            <field name="name">report.document.resource.graph</field>
-            <field name="model">report.document.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files by Resource Type" type="pie">
-                    <field name="type" />
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-
-<!--***************************************************************************************-->
-
-    <record model="ir.ui.view" id="view_size_month">
+        <record model="ir.ui.view" id="view_size_month">
             <field name="name">report.document.user.graph</field>
             <field name="model">report.document.file</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="File Size by Month" type="bar">
+                <graph string="File Size by Month" type="line">
                     <field name="month"/>
                     <field name="file_size" operator="+"/>
                 </graph>
             </field>
-    </record>
+        </record>
 
-    <record model="ir.ui.view" id="view_size_month_tree">
+        <record model="ir.ui.view" id="view_size_month_tree">
             <field name="name">report.document.user.tree</field>
             <field name="model">report.document.file</field>
             <field name="type">tree</field>
@@ -145,6 +86,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_view_size_month">
             <field name="name">File Size by Month</field>
             <field name="res_model">report.document.file</field>
@@ -153,20 +95,15 @@
             <field name="view_mode">tree</field>
         </record>
 
-<!--***************************************************************************************-->
-
 
-    <record model="ir.ui.view" id="view_files_by_month_graph">
+        <record model="ir.ui.view" id="view_files_by_month_graph">
             <field name="name">report.file.month.graph</field>
             <field name="model">report.document.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Files by Month" type="bar">
+                <graph string="Files by Month" type="pie">
                     <field name="month" />
                     <field name="nbr" operator="+"/>
-<!--                    <field name="name" operator="+"/>-->
-<!--                    <field name="file_size" operator="+"/>-->
-
                 </graph>
             </field>
         </record>
@@ -184,87 +121,33 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
-            <field name="name">Files by Month</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_files_by_month_graph"></field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
-
-
-<!--***************************************************************************************-->
-
-    <record model="ir.ui.view" id="view_user_graph">
-            <field name="name">report.document.user.graph</field>
+        <record model="ir.ui.view" id="view_files_by_user_graph">
+            <field name="name">report.file.user.graph</field>
             <field name="model">report.document.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Files by users" type="bar">
+                <graph string="Files by User" type="pie">
                     <field name="user" />
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_view_user_graph">
-            <field name="name">Files By Users</field>
+        <record model="ir.actions.act_window" id="action_view_files_by_user_graph">
+            <field name="name">Files by User</field>
             <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_user_graph"></field>
+            <field name="view_id" ref="view_files_by_user_graph"></field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
         </record>
 
-
-<!--***************************************************************************************-->
-
-        <record model="ir.ui.view" id="view_files_by_partner_graph">
-            <field name="name">view.files.partner.graph</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files By Partner" type="bar">
-                    <field name="partner"/>
-                    <field name="nbr"/>
-
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_files_by_partner_tree">
-            <field name="name">view.files.partner.tree</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Files per Month">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="partner"/>
-                    <field name="nbr"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_files_by_partner_form">
-            <field name="name">view.files.partner.form</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <tree string="Files per Month">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="partner"/>
-                    <field name="nbr"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_files_by_partner">
-            <field name="name">Files Per Partner</field>
-            <field name="res_model">report.files.partner</field>
-            <field name="view_id" ref="view_files_by_partner_graph"></field>
+        <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
+            <field name="name">Files by Month</field>
+            <field name="res_model">report.document.user</field>
+            <field name="view_id" ref="view_files_by_month_graph"></field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
         </record>
-        </data>
- </openerp>
+
+    </data>
+</openerp>
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index 36f0aa86dff..a82b9acd838 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -15,11 +15,6 @@ access_res_partner_group_user,res.partner user,base.model_res_partner,base.group
 access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0
 access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1
 access_report_document_user_group_document_manager,report.document.user document manager,model_report_document_user,base.group_system,1,0,0,0
-access_report_files_partner_group_document_manager,report.files.partner document manager,model_report_files_partner,base.group_system,1,0,0,0
 access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0
-access_report_document_wall_group_document_manager,report.document.wall document manager,model_report_document_wall,base.group_system,1,0,0,0
-access_report_document_wall_group_system,report.document.wall group system,model_report_document_wall,base.group_system,1,0,0,0
-access_report_files_partner_group_document,report.files.partner document manager,model_report_files_partner,base.group_document_user,1,0,0,0
 access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0
-access_report_document_wall_group_document,report.document.wall document manager,model_report_document_wall,base.group_document_user,1,0,0,0
 access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 8962da0a1f3..404e60588e3 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -38,8 +38,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
@@ -139,8 +140,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
-                    <field name="name" />
-                    <field name="namespace" />
+                    <field name="name"
+                    filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]"
+                    string="Document Property"/>
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_no_one">
                         <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 7bb86132af9..7b64254dfd8 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -128,13 +128,10 @@
            <field name="arch" type="xml">
                <search string="Templates">
                     <group>
-                        <field name="name"/>
-                        <field name="model_id"/>
-                        <field name="email_to"/>
+                        <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
                         <separator orientation="vertical"/>
+                        <field name="model_id"/>
                         <field name="lang"/>
-                        <field name="subject"/>
-                        <field name="report_name"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 6bdea66e45e..a00b4b20f04 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <!--  Need to merge this action in associations -->
-
+        <!-- Events dashboard -->
         <record model ="ir.ui.view" id="view_report_event_reg_graph">
             <field name="name">Registration Event report</field>
             <field name="model">report.event.registration</field>
@@ -26,13 +25,23 @@
             <field name="view_id" ref="view_report_event_reg_graph"/>
         </record>
 
-       <record model="ir.actions.act_window" id="act_event_view">
-           <field name="name">Next Events</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">event.event</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-       </record>
+        <record model="ir.actions.act_window" id="act_event_view">
+            <field name="name">Next Events</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.event</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','not in',('cancel','done'))]</field>
+        </record>
+
+        <record model="ir.actions.act_window" id="act_event_view_registration">
+            <field name="name">New Registration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
 
         <record model="ir.ui.view" id="board_associations_manager_form">
             <field name="name">board.associations.manager.form</field>
@@ -42,13 +51,11 @@
                 <form string="Association Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action string="Next Events"
-                                name="%(act_event_view)d"
-                                domain="[('state','not in',('cancel','done'))]"/>
+                            <action string="Next Events" name="%(act_event_view)d"/>
+                            <action string="New Registrations" name="%(act_event_view_registration)d"/>
                         </column>
                         <column>
-                            <action string="Events Filling Status"
-                                name="%(act_event_reg)d"/>
+                            <action string="Events Filling By Status" name="%(act_event_reg)d"/>
                         </column>
                     </board>
                 </form>
@@ -56,20 +63,17 @@
         </record>
 
         <record model="ir.actions.act_window" id="open_board_associations_manager">
-            <field name="name">Event Dashboard</field>
+            <field name="name">Events</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_associations_manager_form"/>
         </record>
-        <menuitem id="menus_event_dashboard" name="Events"
-            parent="base.menu_reporting_dashboard" sequence="25"/>
-        <menuitem
-            name="Event Dashboard" parent="menus_event_dashboard"
-            action="open_board_associations_manager"
-            sequence="1"
-            id="menu_board_associations_manager"
-            icon="terp-graph"/>
 
+        <menuitem id="menu_board_associations_manager"
+                  parent="base.menu_reporting_dashboard"
+                  action="open_board_associations_manager"
+                  sequence="40"
+                  icon="terp-graph"/>
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ffb15eb8cb6..ed539e7bf39 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,21 +265,21 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group>
+                        <field name="name" string="Events"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
-                        <separator orientation="vertical"/>
+                        <filter icon="terp-personal"
+                              string="My Events"
+                                help="My Events"
+                              domain="[('user_id','=',uid)]"/>
                         <filter icon="terp-go-today" string="Upcoming"
                                 name="upcoming"
                                 domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
                                 help="Upcoming events from today" />
-                        <field name="name"/>
+                        <separator orientation="vertical"/>
                         <field name="type" widget="selection"/>
-                        <field name="user_id" widget="selection">
-                        <filter icon="terp-personal"
-                              string="My Events"
-                                help="My Events"
-                              domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -337,6 +337,7 @@
             <field name="arch" type="xml">
                 <tree string="Registration" >
                     <field name="create_date"/>
+                    <field name="partner_id"/>
                     <field name="name"/>
                     <field name="email"/>
                     <field name="event_id" />
@@ -448,19 +449,18 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group>
+                        <field name="name" string="Participant"
+                            filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
-                        <separator orientation="vertical"/>
-                        <field name="event_id" widget="selection"/>
-                        <field name="name" string="Participant"
-                            filter_domain="['|','|', ('name','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
-                        <field name="user_id">
                         <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
-                        </field>
-                        <field name="origin"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" widget="selection"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 71d656740fe..7ae6c0fae2e 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -53,38 +53,21 @@
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <group>
-                    <filter string="Year" icon="terp-go-year" name="year"
-                          domain="[('event_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('event_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                          help="Events happening this year"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Month" icon="terp-go-month" name="this_month"
-                          domain="[('event_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happening in current month"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                          domain="[('event_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Events happened in last month"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-document-new"
-                        string="New"
-                        domain="[('event_state','=','draft')]"
-                        help="Events which are in New state"/>
-                    <filter icon="terp-check"
-                        string="Confirm"
-                        domain="[('event_state','=','confirm')]"
-                        help="Events which are in confirm state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test"
-                          string="Confirmed Registrations"
-                          help="Registrations in confirmed or done state"
-                          context="{'no_of_draft_invisible':1}"/>
-                    <separator orientation="vertical"/>
-                    <field name="event_id" string="Event"/>
-                    <field name="user_id" widget="selection">
+                        <filter icon="terp-document-new"
+                            string="New"
+                            domain="[('event_state','=','draft')]"
+                            help="Events which are in New state"/>
+                        <filter icon="terp-check"
+                            string="Confirm"
+                            domain="[('event_state','=','confirm')]"
+                            help="Events which are in confirm state"/>
                         <filter icon="terp-personal"
-                        string="My Events"
-                        help="My Events"
-                        domain="[('user_id','=',uid)]"/>
-                    </field>
+                            string="My Events"
+                            help="My Events"
+                            domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="event_id" string="Event"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -92,7 +75,6 @@
                         <field name="event_date"/>
                     </group>
                     <newline/>
-
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
@@ -114,6 +96,12 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
                     </group>
+                    <group expand="0" string="Display">
+                        <filter icon="terp-camera_test"
+                              string="Show Confirmed Registrations"
+                              help="Registrations in confirmed or done state"
+                              context="{'no_of_draft_invisible':1}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 7c89babf3da..9567f7746f3 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -79,12 +79,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
+                    <field name="name" string="Incoming Mail Server"/>
+                    <separator orientation="vertical"/>
                     <filter string="IMAP" icon="terp-folder-green" domain="[('type','=','imap')]" help="Server type IMAP."/>
                     <filter string="POP" icon="terp-folder-orange" domain="[('type','=','pop')]" help="Server type POP."/>
                     <separator orientation="vertical"/>
                     <filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index d7fb8b0e91a..1135b55034a 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -48,7 +48,7 @@ You can manage:
         'process/hr_process.xml',
         'hr_installer.xml',
         'hr_data.xml',
-        'hr_board.xml',
+        'board_hr_view.xml',
         'res_config_view.xml',
     ],
     'demo_xml': [
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
new file mode 100644
index 00000000000..6c40edd8d1e
--- /dev/null
+++ b/addons/hr/board_hr_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="board_hr_form" model="ir.ui.view">
+        <field name="name">board.hr.form</field>
+        <field name="model">board.board</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Human Resources Dashboard" layout="manual" version="7.0">
+                <board style="2-1">
+                    <column/>
+                    <column/>
+                </board>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_board_hr" model="ir.actions.act_window">
+        <field name="name">Human Resources</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="usage">menu</field>
+        <field name="view_id" ref="board_hr_form"/>
+    </record>
+    <menuitem id="menu_hr_dashboard" 
+              parent="base.menu_reporting_dashboard" 
+              action="open_board_hr" 
+              sequence="50"/>
+    <menuitem id="menu_hr_reporting" 
+              parent="base.menu_reporting" 
+              name="Human Resources" 
+              sequence="40" />
+</data>
+</openerp>
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
deleted file mode 100644
index 22687d27c69..00000000000
--- a/addons/hr/hr_board.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-    <!-- This board view will be complete by other hr_* modules-->
-    <record id="board_hr_form" model="ir.ui.view">
-        <field name="name">board.hr.form</field>
-        <field name="model">board.board</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="My Board" layout="manual" version="7.0">
-                <board style="2-1">
-                    <column/>
-                    <column/>
-                </board>
-            </form>
-        </field>
-    </record>
-    <record id="open_board_hr" model="ir.actions.act_window">
-        <field name="name">Human Resources Dashboard</field>
-        <field name="res_model">board.board</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="usage">menu</field>
-        <field name="view_id" ref="board_hr_form"/>
-    </record>
-
-    <menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
-    <menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard"  name="Human Resources" sequence="35"/>
-    <menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
-
-    <!-- This board view will be complete by other hr_* modules-->
-    <record id="board_hr_manager_form" model="ir.ui.view">
-        <field name="name">board.hr.manager.form</field>
-        <field name="model">board.board</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="HR Manager Board" layout="manual" version="7.0">
-                <board style="2-1">
-                    <column/>
-                    <column/>
-                </board>
-            </form>
-        </field>
-    </record>
-    <record id="open_board_hr_manager" model="ir.actions.act_window">
-        <field name="name">HR Manager Dashboard</field>
-        <field name="res_model">board.board</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="usage">menu</field>
-        <field name="view_id" ref="board_hr_manager_form"/>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index d6fd393edf8..1935cbbd03d 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -41,7 +41,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
-                    <field name="name"/>
+                    <field name="name" string="Department"/>
+                    <separator orientation="vertical"/>
                     <field name="manager_id" />
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c5fd64e586c..5915511d385 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -105,20 +105,20 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="name" string="Employees"/>
+                    <separator orientation="vertical"/>
+                    <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
-                    <field name="category_ids"/>
                     <field name="parent_id"/>
-                    <newline />
+                    <field name="category_ids"/>
+                    <newline/>
                     <group expand="0" string="Group By...">
-                    <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
-                    <separator orientation="vertical" />
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
              </field>
@@ -410,6 +410,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
+                    <field name="name" string="Job"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"  
                             domain="[('state','=','open')]" 
                             string="In Position"
@@ -417,14 +419,12 @@
                     <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="In Recruitment"
                         help="In Recruitment"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="department_id" widget="selection">
-                    </field>
+                    <field name="department_id" widget="selection"/>
                     <newline />
                     <group expand="0" string="Group By...">
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index 44cb5bcc2da..382d8ca7a6d 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -409,12 +409,6 @@ msgid "Working Address"
 msgstr "عنوان العمل"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "لوحة معلومات مدير الموارد البشرية"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "اقسام الطفل"
@@ -834,6 +828,9 @@ msgstr ""
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "الاجازات/ مغادرات الادارة"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "لوحة معلومات مدير الموارد البشرية"
+
 #~ msgid "Employee Passport Information"
 #~ msgstr "معلومات عن موظف الجوازات"
 
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index 8840d539127..ac02c9d428f 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr "Служебен адрес"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Табло мениджър ЧР"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
@@ -803,6 +797,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Прогрес на настройките"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Табло мениджър ЧР"
+
 #~ msgid "Current"
 #~ msgstr "Текущ"
 
diff --git a/addons/hr/i18n/bn.po b/addons/hr/i18n/bn.po
index 45de6e608a8..40cd0d4d9af 100644
--- a/addons/hr/i18n/bn.po
+++ b/addons/hr/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 83e53a7e9e4..09ca4e73941 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr "Adresa zaposlenja"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Pododjeljenja"
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index 711077cd2e5..847d0cf7fc8 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -416,12 +416,6 @@ msgid "Working Address"
 msgstr "Adreça de treball"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Taulell director RRHH"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departaments fills"
@@ -927,6 +921,9 @@ msgstr ""
 #~ msgid "Expected Employees"
 #~ msgstr "Empleats previstos"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Taulell director RRHH"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "Nombre total d'empleats necessaris per a aquest treball."
 
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index e6e6942be00..a32263a9edb 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
@@ -403,12 +403,6 @@ msgid "Working Address"
 msgstr "Pracovní adresa"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Nástěnka správce HR"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Dětské oddělení"
@@ -781,6 +775,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Průběh náboru"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Nástěnka správce HR"
+
 #~ msgid "Configure"
 #~ msgstr "Nastavit"
 
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index b2e37c54c43..ba68ff24a13 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index f3b7886f694..deffd2e4c50 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -424,12 +424,6 @@ msgid "Working Address"
 msgstr "Arbeitgeberanschrift"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Pinnwand Personalleitung"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "untergeordnete Abteilungen"
@@ -920,6 +914,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Verlinkt mit dem Abteilungsleiter"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Pinnwand Personalleitung"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Vorgehen Konfiguration"
 
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index cdb7f8d1d45..d1451554a1c 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -394,12 +394,6 @@ msgid "Working Address"
 msgstr "Διεύθυνση Εργασίας"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Υπο- τμήματα"
diff --git a/addons/hr/i18n/en_AU.po b/addons/hr/i18n/en_AU.po
index 7b5e463c3b9..ec8215f8368 100644
--- a/addons/hr/i18n/en_AU.po
+++ b/addons/hr/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index 3ce25860d53..e764d663582 100644
--- a/addons/hr/i18n/en_GB.po
+++ b/addons/hr/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -414,12 +414,6 @@ msgid "Working Address"
 msgstr "Working Address"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "HR Manager Dashboard"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
@@ -796,6 +790,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "It is linked with manager of Department"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "HR Manager Dashboard"
+
 #~ msgid "Categories structure"
 #~ msgstr "Categories structure"
 
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index e7a2b7cf18e..73ecd398fe1 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -421,12 +421,6 @@ msgid "Working Address"
 msgstr "Dirección de trabajo"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero director RRHH"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos hijos"
@@ -975,6 +969,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Está vinculado con el director del departamento."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero director RRHH"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index ca32378a760..c01a58a1a54 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr "Dirección de trabajo"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos hijos"
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index ede0fe99bab..650adcc375b 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -417,12 +417,6 @@ msgid "Working Address"
 msgstr "Dirección de trabajo"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero director RRHH"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos hijos"
@@ -805,6 +799,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Proceso de selección"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero director RRHH"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
diff --git a/addons/hr/i18n/es_CR.po b/addons/hr/i18n/es_CR.po
index 9453feb99e3..5618e4ac2b6 100644
--- a/addons/hr/i18n/es_CR.po
+++ b/addons/hr/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr
@@ -422,12 +422,6 @@ msgid "Working Address"
 msgstr "Dirección de trabajo"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero director RRHH"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos hijos"
@@ -732,6 +726,9 @@ msgstr ""
 #~ msgid "Expected Employees"
 #~ msgstr "Empleados previstos"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero director RRHH"
+
 #~ msgid "Categories structure"
 #~ msgstr "Estructura de categorías"
 
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index bbe7c705e83..09f4d872ce3 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -422,12 +422,6 @@ msgid "Working Address"
 msgstr "Dirección de trabajo"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablero Director Recursos Humanos"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos Inferiores"
@@ -860,6 +854,9 @@ msgstr ""
 #~ msgid "Expected Employees"
 #~ msgstr "Empleados previstos"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablero Director Recursos Humanos"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Organigrama Jerárquico"
 
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 994f4b49a41..29b346688a3 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr "Tööaadress"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Alamosakonnad"
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index a0002294366..672e7146bb9 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -399,12 +399,6 @@ msgid "Working Address"
 msgstr "Työosoite"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Henkilöstöpäällikön Työpöytä"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Alaosastot"
@@ -892,6 +886,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguraation eteneminen"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Henkilöstöpäällikön Työpöytä"
+
 #~ msgid "Status Description"
 #~ msgstr "Statuksen kuvaus"
 
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index f5bcb0f7ea4..85741cfffcd 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -419,12 +419,6 @@ msgid "Working Address"
 msgstr "Adresse professionnelle"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tableau de bord du directeur des ressources humaines"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Sous-départements"
@@ -958,6 +952,9 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Avancement de la configuration"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tableau de bord du directeur des ressources humaines"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "Nombre total de salariés nécessaires pour ce travail."
 
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index 76637e2000c..1396e2f0486 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index d3519531a8e..ec1ad07181f 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -416,12 +416,6 @@ msgid "Working Address"
 msgstr "Enderez do traballo"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Taboleiro Director RRHH"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos fillos"
@@ -804,6 +798,9 @@ msgstr ""
 #~ "Permítelle crear e xestionar a avaliación periódica e revisión da "
 #~ "productividade dos empregados."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Taboleiro Director RRHH"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Xestión de vacacións / ausencias"
 
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index 2793adc05c3..5238ff8e571 100644
--- a/addons/hr/i18n/gu.po
+++ b/addons/hr/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index 47742bcada6..0675a5ffc46 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index b1aad05bba9..67416a5bcd6 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: hr\n"
 
 #. module: hr
@@ -418,12 +418,6 @@ msgid "Working Address"
 msgstr "Poslovna adresa"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Nadzorna ploča upravitelja HR"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Podređeni odjeli"
@@ -926,6 +920,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Postupak regrutiranja"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Nadzorna ploča upravitelja HR"
+
 #~ msgid "Categories structure"
 #~ msgstr "Struktura kategorija"
 
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index b04780b980a..42effb62e6e 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -409,12 +409,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index e6935d03848..aef8ced876c 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -399,12 +399,6 @@ msgid "Working Address"
 msgstr "Munkahely címe"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "HR menedzser vezérlőpult"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Alrészlegek"
@@ -732,6 +726,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "Kép"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "HR menedzser vezérlőpult"
+
 #~ msgid "Categories structure"
 #~ msgstr "Kategóriák strukturája"
 
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index 4028b863ab7..83e9e5b5001 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -420,12 +420,6 @@ msgid "Working Address"
 msgstr "Alamat Kerja"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Dasbor Manager HR"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departemen Anak"
@@ -884,6 +878,9 @@ msgstr ""
 #~ msgid "Required number of employees in total for that job."
 #~ msgstr "Dibutuhkan sejumlah karwayan untuk pekerjaan ini"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Dasbor Manager HR"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "Susunan Subordinat"
 
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 9c6cef19a93..54ea44b5d83 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -416,12 +416,6 @@ msgid "Working Address"
 msgstr "Indirizzo di lavoro"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Dashboard manager Ris. Umane"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Dipartimenti secondari"
@@ -927,6 +921,9 @@ msgstr ""
 #~ msgid "Image"
 #~ msgstr "Imagine"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Dashboard manager Ris. Umane"
+
 #~ msgid "Attendances"
 #~ msgstr "Presenze"
 
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index 1d55bf70a80..3e4c2799d92 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -399,12 +399,6 @@ msgid "Working Address"
 msgstr "勤務先住所"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "人事マネジャのダッシュボード"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "下位部門"
@@ -706,6 +700,9 @@ msgstr ""
 #~ msgid "Expected Employees"
 #~ msgstr "従業員候補"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "人事マネジャのダッシュボード"
+
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "下位の階層構造"
 
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index af56e12d5d1..741facadde0 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr "사무실 주소"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "차일트 부서"
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index 5769cf62066..1f9674891d4 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 097ac71e0d5..66ba2ea0d5d 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr "Darbovietės adresas"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Žemesnieji padaliniai"
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index ddccb725516..dac8d1c37a3 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -412,12 +412,6 @@ msgid "Working Address"
 msgstr "Darbavietas Adrese"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Personāla Vadītāja Rīku Panelis"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Apakšnodaļas"
@@ -915,6 +909,9 @@ msgstr ""
 #~ msgid "Expected Employees"
 #~ msgstr "Gaidāmie Darbinieki"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Personāla Vadītāja Rīku Panelis"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for human resource management. You can manage:\n"
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index b8b71574ff8..2ed59e21d52 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -418,14 +418,6 @@ msgid "Working Address"
 msgstr "Службена Адреса"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-"Главна Табла за приказ на информациите поврзани со Менаџерите на Човечките "
-"Ресурси"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Под-Сектор"
@@ -810,6 +802,11 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Процес на Вработување"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr ""
+#~ "Главна Табла за приказ на информациите поврзани со Менаџерите на Човечките "
+#~ "Ресурси"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Раководење/Поставување на Празниците / Отсуствата"
 
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 225ad5e9b5b..44151d80e15 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -74,6 +74,10 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Албан Тушаал нь ажлын байр болон шаардлагыг тодорхойлдог. Ажлын байруудад "
+"хэдэн ажилтан байгаа, ирээдүйд хэдэн ажилтантай болох гэх мэтийг хянаж "
+"хөтлөх боломжтой. Түүнчлэн ажлын байранд ажилтан авах үед өргөдөл гаргагчийг "
+"үнэлэхтэй холбоотой ярилцлагын асуулт зэрэгийг хавсаргах боломжтой."
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
@@ -161,7 +165,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Өнгөний Индекс"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -411,12 +415,6 @@ msgid "Working Address"
 msgstr "Ажлын хаяг"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Хүний нөөцийн менежерийн хянах самбар"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Хүү хэлтэсүүд"
@@ -490,7 +488,7 @@ msgstr "Ажилтны маягт дээр холбоо барих хаяг ши
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Хянах самбар"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -540,7 +538,7 @@ msgstr "Хувийн мэдээлэл"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Хот"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
@@ -550,7 +548,7 @@ msgstr "Пасспортын дугаар"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Ажлын гар утас"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -595,7 +593,7 @@ msgstr "Үндэстэн"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Амралт, чөлөө"
 
 #. module: hr
 #: view:board.board:0
@@ -908,6 +906,9 @@ msgstr ""
 #~ "Ажилтны бүтээмжийн стандарт, үечилсэн үнэлгээг хөтлөх, үүсгэх боломжийг "
 #~ "олгоно."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Хүний нөөцийн менежерийн хянах самбар"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Амралт, чөлөө / Амралт, чөлөөний удирдлага"
 
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index 31e4bbeb932..7dd1c1ef719 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr "Adresse arbeid"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Underavdelinger"
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 23f9b319c93..e3db2b1ca20 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -417,12 +417,6 @@ msgid "Working Address"
 msgstr "Werkadres"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "HR manager dashboard"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Sub-afdelingen"
@@ -916,6 +910,9 @@ msgstr ""
 #~ "Laat u de periodieke evaluaties en functioneringsgesprekken van medewerkers "
 #~ "maken en beheren"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "HR manager dashboard"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Configuratievoortgang"
 
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index 00a2b92398b..44ee0fd59df 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index bcb504df9c8..380b6daec22 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -395,12 +395,6 @@ msgid "Working Address"
 msgstr "Adres do pracy"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Konsola Dyrektora kadr"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Działy podrzędne"
@@ -888,3 +882,6 @@ msgstr ""
 #~ "Lets you create and manage the periodic evaluation and performance review of "
 #~ "employees."
 #~ msgstr "Pozwala ci zarządzać okresowymi ocenami i osiągnięciami pracowników."
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Konsola Dyrektora kadr"
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index e730b62c0d2..11dcdca4c9b 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -421,12 +421,6 @@ msgid "Working Address"
 msgstr "Endereço de Trabalho"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Painel do Gestor de RH"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos Descendentes"
@@ -802,6 +796,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Processo de Recrutamento"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Painel do Gestor de RH"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progresso da Configuração"
 
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index f7f392663a9..10b29cc27a2 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -396,12 +396,6 @@ msgid "Working Address"
 msgstr "Endereço comercial"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Painel do Gerente de RH"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamentos filho (Subordinados)"
@@ -861,6 +855,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Está associado ao gerente do Departamento"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Painel do Gerente de RH"
+
 #~ msgid "Status Description"
 #~ msgstr "Descrição do status"
 
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index a26c493ac32..4dadb4f94eb 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -420,12 +420,6 @@ msgid "Working Address"
 msgstr "Adresa de la serviciu"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Tablou de bord Manager Resurse Umane"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Departamente Subordonate"
@@ -953,6 +947,9 @@ msgstr ""
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "Managementul Concediilor / Liberelor"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Tablou de bord Manager Resurse Umane"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for human resource management. You can manage:\n"
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index f37f8c8a661..5dbf20102a4 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -419,12 +419,6 @@ msgid "Working Address"
 msgstr "Рабочий адрес"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Инфо-панель менеджера отдела кадров"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Подчиненные подразделения"
@@ -998,6 +992,9 @@ msgstr ""
 #~ msgid "Periodic Evaluations"
 #~ msgstr "Периодические собеседования"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Инфо-панель менеджера отдела кадров"
+
 #~ msgid "No of Employee"
 #~ msgstr "Число сотрудников"
 
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 06ece4aa7ae..19eebe1c02d 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr "Pracovná adresa"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index 32d9813d1c0..d174d2aa48a 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr "Delovni naslov"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Podrejeni oddelki"
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index f4357b53752..99d054946a4 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index f7249d858ff..ab929ddae13 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -396,12 +396,6 @@ msgid "Working Address"
 msgstr "Adresa Posla"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Pod Odeljenja"
@@ -780,6 +774,9 @@ msgstr ""
 #~ "Omogućava ti da kreiraš i upravljaš sa periodičnom procenama i performansama "
 #~ "pregleda zapošljenih."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguracioni Proces"
 
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index 83fef687b95..f32af555d5a 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -413,12 +413,6 @@ msgid "Working Address"
 msgstr "Adresa Posla"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Pod Odeljenja"
@@ -758,6 +752,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "Proces Zapošljavanja"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguracioni Proces"
 
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 52964d2e5fd..ab2b55d9874 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -417,12 +417,6 @@ msgid "Working Address"
 msgstr "adress"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "Personalchefens infopanel"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Underavdelning"
@@ -851,6 +845,9 @@ msgstr ""
 #~ msgid "Number of Employees"
 #~ msgstr "Antal anställda"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "Personalchefens infopanel"
+
 #~ msgid "Expected Employees"
 #~ msgstr "Väntade anställda"
 
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 6429e4e7fc9..5ffd98ff445 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -392,12 +392,6 @@ msgid "Working Address"
 msgstr "ที่อยู่ที่ทำงาน"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index aad9b400fa2..9631280228f 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 7c8fa91b1f4..911913a4b01 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -414,12 +414,6 @@ msgid "Working Address"
 msgstr "İş Adresi"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "İK Yönetici Kontrol Paneli"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Alt Bölümler"
@@ -934,6 +928,9 @@ msgstr ""
 #~ "Error ! You cannot select a department for which the employee is the manager."
 #~ msgstr "Hata ! Personelin müdür olduğu bir bölümü seçemezsiniz."
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "İK Yönetici Kontrol Paneli"
+
 #~ msgid "Required number of Employees in total for that job."
 #~ msgstr "O iş için gerekli toplam Personel sayısı"
 
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index ca77650ba5c..0f669e827c3 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr ""
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr ""
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index d975ce5fdda..bd8a5eca23b 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -19,8 +19,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -419,12 +419,6 @@ msgid "Working Address"
 msgstr "Địa chỉ làm việc"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "bàng tổng quan nguồn nhân lực"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "phòng/ ban cấp dưới"
@@ -942,6 +936,9 @@ msgstr ""
 #~ msgid "It is linked with manager of Department"
 #~ msgstr "Liên kết giũa người quản lý và phòng ban"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "bàng tổng quan nguồn nhân lực"
+
 #~ msgid "Holidays / Leaves Management"
 #~ msgstr "ngày nghỉ / quản lý nhân viên nghỉ"
 
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index d9c1b6ea882..c9cdba0e65c 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -397,12 +397,6 @@ msgid "Working Address"
 msgstr "工作地址"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "人力资源经理仪表盘"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "子部门"
@@ -974,3 +968,6 @@ msgstr ""
 
 #~ msgid "Subordonate Hierarchy"
 #~ msgstr "隶属结构"
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "人力资源经理仪表盘"
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 82d0de304cd..3c81422ce28 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:58+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -391,12 +391,6 @@ msgid "Working Address"
 msgstr "辦公地址"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_board_hr_manager
-#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
-msgid "HR Manager Dashboard"
-msgstr "人力資源經理儀錶板"
-
-#. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "下級部門"
@@ -740,6 +734,9 @@ msgstr ""
 #~ msgid "Recruitment Process"
 #~ msgstr "招聘進度"
 
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "人力資源經理儀錶板"
+
 #~ msgid "Categories structure"
 #~ msgstr "分類結構"
 
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 92e2a8bcbed..d3047f424ec 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -54,12 +54,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
-                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <field name="name" string="Attendance"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
+                    <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
-                    <field name="name"/>
                     <field name="action"/>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 142cb6b7667..ab93bd9c0c9 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -39,23 +39,22 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group>
-                   <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
-                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
-                   <separator orientation="vertical"/>
-                   <field name="name"/>
-                   <field name="employee_id"/>
-                   <field name="working_hours"/>
-                   <field name="date_start"/>
-                   <field name="date_end"/>
+                       <field name="name" string="Contracts"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_start"/>
+                       <field name="date_end"/>
+                       <separator orientation="vertical"/>
+                       <field name="employee_id"/>
+                       <field name="working_hours"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
-                   <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
-                   <separator orientation="vertical"/>
-                   <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
-                   <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                       <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
+                       <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                    </group>
                </search>
             </field>
@@ -164,7 +163,7 @@
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                    <group>
-                    <field name="name"/>
+                       <field name="name" string="Contract Type"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index f25c669a973..7ed11beb98c 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record model="ir.actions.act_window" id="action_hr_evaluation_interview_board">
             <field name="name">Interview Requests</field>
             <field name="res_model">hr.evaluation.interview</field>
@@ -16,9 +17,9 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <xpath expr="/form/board/column[1]" position="inside">
-                <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
-            </xpath>
+                <xpath expr="/form/board/column[2]" position="inside">
+                    <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 982ea1c4000..90de785a34a 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -9,7 +9,8 @@
             <field name="arch" type="xml">
                 <search string="Appraisal Plan">
                    <group>
-                       <field name="name"/>
+                       <field name="name" string="Appraisal Plans"/>
+                       <separator orientation="vertical"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
@@ -227,29 +228,22 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                    <group>
-                    <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
-                    <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-week" string="7 Days" help="Appraisal to close within the next 7 days"
-                        domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                        help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
-                    <filter icon="terp-go-month" name="next_month" string=" Month+1" 
-                         domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
-                         help="Appraisal during next month"/>
-                    <separator orientation="vertical"/>
-                    <field name="employee_id" />
-                    <field name="plan_id" widget="selection" />
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
+                        <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id" />
+                        <field name="plan_id" widget="selection" />
                     </group>
                     <newline/>
                     <group expand='0' string='Group by...'>
-                    <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
-                    <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
-                    <separator orientation="vertical"/>
-                    <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
+                        <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
+                        <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
                    </group>
                </search>
             </field>
@@ -327,9 +321,9 @@
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                    <group>
-                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
+                        <field name="date_deadline"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 5bb8981f735..af0e8156f7f 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 753b33fa706..b6f76777f54 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -46,17 +46,6 @@
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
             	<group>
-            		<filter icon="terp-go-year" string="Year"
-                        name="year"
-                    	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
-                    <separator orientation="vertical"/>						
-                    <filter icon="terp-go-month" string=" Month " name="month" 
-                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Evaluation done in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " 
-                        domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Evaluation done in last month"/>
-                    <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
                    	<filter string="Final Validation" icon="terp-camera_test" domain="[('state','=','progress')]"
@@ -73,6 +62,7 @@
                     <field name="deadline"/>
                     <separator orientation="vertical"/>
                     <field name="state"/>
+                    <field name="create_date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index cbf8b322b36..2a1d302e094 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -56,7 +56,6 @@ re-invoice your customer's expenses if your work by project.
         'security/ir_rule.xml',
         'report/hr_expense_report_view.xml',
         'board_hr_expense_view.xml',
-        'board_hr_expense_manager_view.xml',
         'hr_expense_installer_view.xml',
     ],
     'demo_xml': [
diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml
deleted file mode 100644
index 0f09c9a3290..00000000000
--- a/addons/hr_expense/board_hr_expense_manager_view.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="action_employee_expense" model="ir.actions.act_window">
-            <field name="name">All Employee Expenses</field>
-            <field name="res_model">hr.expense.expense</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('state','in',('confirm', 'accepted'))]</field>
-            <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
-        </record>
-
-        <record id="board_hr_manager_expense_form" model="ir.ui.view">
-            <field name="name">board.hr.manager.expense.form</field>
-            <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-      		<xpath expr="/form/board/column" position="inside">
-				 <action name="%(action_employee_expense)d" string="All Employee Expenses"/>
-			</xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e57f20734eb..6df675552b0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -29,6 +29,7 @@
             <field name="arch" type="xml">
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="employee_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
@@ -135,22 +136,17 @@
             <field name="arch" type="xml">
                 <search string="Expense">
                     <group>
-                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
-                      <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
-                        help="Confirmed Expense"/>
-                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
-                        help="Expenses to Invoice"/>
+                      <field name="name" string="Expenses"/>
                       <separator orientation="vertical"/>
-                      <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
+                      <field name="date"/>
+                      <separator orientation="vertical"/>
+                      <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
+                      <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+                      <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <field name="employee_id"/>
-                      <field name="date"/>
-                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
-                    </field>
-                      <field name="name"/>
-                      <field name="user_id"  string="User">
-                      </field>
+                      <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
+                      <field name="user_id"  string="User"/>
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index e6b51958e1c..1299f4e9ce5 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -53,23 +53,10 @@
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
               <group>
-                <filter icon="terp-go-year" string="Year" name="year"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                      help="Expenses during current year"/>
-                    <separator orientation="vertical"/>					  
-                  <filter icon="terp-go-month" string="Month"
-                      name="month"
-                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during current month"/>
-                <filter icon="terp-go-month" string="    Month-1    " 
-                      domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                      help="Expenses during last month"/>
-                  <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
-                    help = "Confirm Expenses"/>
+                      help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
                       help = "Approved Expenses"/>
-                    <separator orientation="vertical"/>
                     <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
                       help = "Invoiced Expenses"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index e60f53d7d1e..09809e488ba 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -65,7 +65,6 @@ Note that:
         'wizard/hr_holidays_summary_department_view.xml',
         'wizard/hr_holidays_summary_employees_view.xml',
         'board_hr_holidays_view.xml',
-        'board_hr_manager_holidays_view.xml',
         ],
     'demo_xml': ['hr_holidays_demo.xml',],
     'test': ['test/test_hr_holiday.yml',
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 178602725ae..eb3b671af6b 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record model="ir.actions.act_window" id="action_hr_holidays_leaves_by_month">
             <field name="name">My Leaves</field>
             <field name="res_model">hr.holidays.status</field>
@@ -10,6 +11,7 @@
             <field name="context">{}</field>
             <field name="domain">[]</field>
         </record>
+
         <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
             <field name="model">board.board</field>
@@ -17,9 +19,10 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[1]" position="inside">
-                 <action name="%(action_hr_holidays_leaves_by_month)d" string="Leaves"/>
+                    <action name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves"/>
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
deleted file mode 100644
index dfb4924c631..00000000000
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
-            <field name="name">Leaves to Approve</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirm', 'validate', 'validate1'))]</field>
-            <field name="view_id" ref="hr_holidays.view_holiday_allocation_tree"/>
-        </record>
-
-        <record id="board_hr_holidays_manager_form" model="ir.ui.view">
-            <field name="name">board.hr.holidays.manager.form</field>
-            <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                  <xpath expr="/form/board/column" position="inside">
-                    <action name="%(action_view_holiday_status_manager_board)d" string="All Employee Leaves"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4342fb145e5..7db5a41b7e8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,22 +8,17 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
+                        <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                        <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                         <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
-                        <filter icon="terp-go-month" name="This Month" string="Month" domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" name="This Month-1" string=" Month-1"
-                         domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Leaves during last month"/>
                         <separator orientation="vertical"/>
-                        <field name="employee_id">
-                            <filter icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
-                        </field>
-                        <field name="department_id" widget="selection">
-                            <filter icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
-                        </field>
+                        <field name="employee_id"/>
+                        <field name="department_id" widget="selection"/>
                         <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -249,7 +244,6 @@
             </field>
         </record>
 
-        <!-- My leave dashboard -->
         <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
@@ -358,7 +352,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
@@ -424,7 +419,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
-                    <field name="name"/>
+                    <field name="name" string="Leave Types"/>
+                    <separator orientation="vertical"/>
                     <field name="categ_id" widget="selection"/>
                 </search>
             </field>
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index d556b94cb06..b15b1781542 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -533,11 +533,6 @@ msgid "Active"
 msgstr "نشط"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "أجازات للتحقق من صحة"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "خطأ ! لايمكنك انشاء تسلسل هرمي عودي  للعاملين"
@@ -875,6 +870,9 @@ msgstr "للموافقة"
 #~ msgid "Casual Leave"
 #~ msgstr "اجازة عرضية"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "أجازات للتحقق من صحة"
+
 #~ msgid "This area is automaticly filled by the user who validate the leave"
 #~ msgstr ""
 #~ "يتم مليء هذه المنطقة تلقائيًا من المستخدم الذي تم التحقق من صلاحية أجازته"
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 1cb6ecbd7b7..e38cd03174c 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr "Активен"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Отпуски за одобрение"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -857,3 +852,6 @@ msgstr "За одобрение"
 
 #~ msgid "Sick Leave"
 #~ msgstr "Отпуск по болест"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Отпуски за одобрение"
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index 701d4febd17..404c9e32ca4 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index 03b3205bbd9..160b49cc32a 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -540,11 +540,6 @@ msgid "Active"
 msgstr "Actiu"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Absències per validar"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -899,6 +894,9 @@ msgstr "Per aprovar"
 #~ msgid "Casual Leave"
 #~ msgstr "Absència ocasional"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Absències per validar"
+
 #~ msgid ""
 #~ "If you tick this checkbox, the system will allow, for this section, the "
 #~ "employees to take more leaves than the available ones."
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 967e1b7944f..0fd861b54af 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_holidays
@@ -540,11 +540,6 @@ msgid "Active"
 msgstr "Aktivní"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Uvolnění k ověření"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -962,6 +957,9 @@ msgstr "Ke schválení"
 #~ "Pokud je pravdivé, pak Přidělení/Požadavek musí být ověřen druhým "
 #~ "ověřovatelem"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Uvolnění k ověření"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Rozšířené filtry..."
 
diff --git a/addons/hr_holidays/i18n/da.po b/addons/hr_holidays/i18n/da.po
index 8d41951aafa..d118018970a 100644
--- a/addons/hr_holidays/i18n/da.po
+++ b/addons/hr_holidays/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index a7de3edea4e..282c5d75638 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -558,11 +558,6 @@ msgid "Active"
 msgstr "Aktiv"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Zu genehmigende Urlaubsanträge"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -1006,5 +1001,8 @@ msgstr "Zu Genehmigen"
 #~ "Dieser Bereich wird autom. mit dem Benutzer ausgefüllt, der dem Benutzer "
 #~ "seinen Urlaub genehmigen muss."
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Zu genehmigende Urlaubsanträge"
+
 #~ msgid "Sick Leave"
 #~ msgstr "Fehltage Krankheit"
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 50cbd4b1c0e..543345a6dda 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -525,11 +525,6 @@ msgid "Active"
 msgstr "Ενεργό"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index 9495b2a144f..60249de359c 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -540,11 +540,6 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Ausencias por validar"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -903,6 +898,9 @@ msgstr "Para aprobar"
 #~ "Este espacio es rellenado automáticamente por el usuario que valida la "
 #~ "ausencia"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Ausencias por validar"
+
 #~ msgid ""
 #~ "When the holiday request is created the state is 'Draft'.\n"
 #~ " It is confirmed by the user and request is sent to admin, the state is "
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index a5d228adfbd..db90b867ca7 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/es_CR.po b/addons/hr_holidays/i18n/es_CR.po
index c04db8b7aae..973ca29a37d 100644
--- a/addons/hr_holidays/i18n/es_CR.po
+++ b/addons/hr_holidays/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr_holidays
@@ -561,11 +561,6 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Ausencias por validar"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
@@ -899,6 +894,9 @@ msgstr "Para aprobar"
 #~ "Si es verdadero, las asignaciones/peticiones deben ser validadas por un "
 #~ "segundo validador"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Ausencias por validar"
+
 #~ msgid ""
 #~ "If you tick this checkbox, the system will allow, for this section, the "
 #~ "employees to take more leaves than the available ones."
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index 0485afe102b..18b17c8098b 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index ca14a3fa6ae..20e524fafcd 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr "Aktiivne"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 8307e13ef53..a9b2f500afa 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "Aktiivinen"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index cf19d1abe0b..3401dc4550e 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -559,11 +559,6 @@ msgid "Active"
 msgstr "Actif"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Congés à valider"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -997,3 +992,6 @@ msgstr "À approuver"
 #~ "congés (si la demande est acceptée).\n"
 #~ "    - Il y a 2 moyens d'imprimer les vacances de l'employé :\n"
 #~ ".\n"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Congés à valider"
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
index 2da1901bf4b..9df36005551 100644
--- a/addons/hr_holidays/i18n/gu.po
+++ b/addons/hr_holidays/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "સક્રિય"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index 791563f0724..3ea70cea7b9 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "सक्रिय"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index b79b8077c14..45bf9ad258c 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index eeb4e7b5e27..3763f5ac568 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -541,11 +541,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index 91c7af998d4..9b978f36b4c 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "aktív"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 0a280d19520..60a3df91298 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -546,11 +546,6 @@ msgid "Active"
 msgstr "Aktif"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Cuti untuk Divalidasi"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -909,6 +904,9 @@ msgstr "Untuk Disetujui"
 #~ msgid "Extended Filters..."
 #~ msgstr "Filter Tambahan"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Cuti untuk Divalidasi"
+
 #~ msgid "Casual Leave"
 #~ msgstr "Cuti Biasa"
 
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 4bc6ee2d96a..f0c951a054d 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -531,11 +531,6 @@ msgid "Active"
 msgstr "Attivo"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index c37e26582ac..18729539955 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -534,11 +534,6 @@ msgid "Active"
 msgstr "有効"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "承認すべき休暇"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "エラー：従業員の反復した階層構造を作ることはできません。"
@@ -857,6 +852,9 @@ msgstr "承認する"
 #~ "validator"
 #~ msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "承認すべき休暇"
+
 #~ msgid ""
 #~ "If you tick this checkbox, the system will allow, for this section, the "
 #~ "employees to take more leaves than the available ones."
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index decc1094ae2..7dee2f289a0 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "활성"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 76c30b5b2a5..0a34e11ba7c 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 101f5d3869d..adf2d08d629 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index 94d4b4dcc92..a022b320f6b 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -49,7 +49,7 @@ msgstr "Бүлэглэх..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Хуваарилах горим"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,department_id:0
@@ -59,7 +59,7 @@ msgstr "Хэлтэс"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "зөвшөөрөх хүсэлт"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -69,12 +69,12 @@ msgstr "Татгалзах"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Ажилчдын ангилал"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " сар-1"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -143,7 +143,7 @@ msgstr "Зөвшөөрсөн"
 #. module: hr_holidays
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Сүүлийн холболт"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -184,7 +184,7 @@ msgstr "Амралт, чөлөө"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Батлах шаардлагатай Чөлөөний хүсэлтүүд"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
@@ -223,7 +223,7 @@ msgstr "Хяналт"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Анхаар !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -382,7 +382,7 @@ msgstr "Амралтын Төрөл хайх"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "Ажилчин эсвэл ангиллаас сонгох хэрэгтэй."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -426,7 +426,7 @@ msgstr "Цайвар ягаан"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -494,7 +494,7 @@ msgstr "Амралт, чөлөө"
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
 msgid "Meeting"
-msgstr ""
+msgstr "Уулзалт"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -521,7 +521,7 @@ msgstr "Хэрэглэгч"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "Эхлэх өдөр нь дууах өдрөөс өмнө байх ёстой."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
@@ -529,11 +529,6 @@ msgid "Active"
 msgstr "Идэвхтэй"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -551,7 +546,7 @@ msgstr "Эхний зөвшөөрөл"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "Төлөгдөөгүй"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 7ca12141094..fef2be48c1e 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -557,11 +557,6 @@ msgid "Active"
 msgstr "Actief"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Goed te keuren verlof"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Fout ! U kunt geen recursieve werknemershiërarchie aanmaken."
@@ -1000,6 +995,9 @@ msgstr "Goed te keuren"
 #~ "Dit gebied wordt automatisch gevuld door de gebruiker die het verlof "
 #~ "goedkeurt"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Goed te keuren verlof"
+
 #~ msgid ""
 #~ "If you tick this checkbox, the system will allow, for this section, the "
 #~ "employees to take more leaves than the available ones."
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index 5dd88108c44..74ca2e0d23e 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 94dd3f6fa51..442d88b94be 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -527,11 +527,6 @@ msgid "Active"
 msgstr "Aktywny"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index 4ef9e4824bc..fb1ae02bcdf 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -551,11 +551,6 @@ msgid "Active"
 msgstr "Ativo"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Ausências por Validar"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Erro ! Não pode criar uma Hierarquia recursiva de Funcionários."
@@ -985,6 +980,9 @@ msgstr "Para aprovar"
 #~ msgstr ""
 #~ "Esta área é automaticamente preenchido pelo utilizador que validar o leave"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Ausências por Validar"
+
 #~ msgid ""
 #~ "If its True then its Allocation/Request have to be validated by second "
 #~ "validator"
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index 0937252f595..e6501508fa6 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "Ativo"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index 7bc1520fec5..6c895ccbec4 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -561,11 +561,6 @@ msgid "Active"
 msgstr "Activ(a)"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Concedii de validat"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Eroare ! Nu puteti crea Ierarhii recursive ale Angajatilor."
@@ -1005,6 +1000,9 @@ msgstr "De aprobat"
 #~ "Daca este Adevarat, atunci Alocarea/Cererea trebuie sa fie validata de catre "
 #~ "un al doilea validator"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Concedii de validat"
+
 #~ msgid ""
 #~ "If you tick this checkbox, the system will allow, for this section, the "
 #~ "employees to take more leaves than the available ones."
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index d3f77fbc332..eedfac61f13 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -526,11 +526,6 @@ msgid "Active"
 msgstr "Активно"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "Отгулы на утверждение"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -867,6 +862,9 @@ msgstr ""
 #~ "validator"
 #~ msgstr "Если это истина, то заявка должна быть утверждения второй проверкой"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "Отгулы на утверждение"
+
 #~ msgid ""
 #~ "If you tick this checkbox, the system will allow, for this section, the "
 #~ "employees to take more leaves than the available ones."
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index fa22fb3b261..1de03976383 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr "Aktivno"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index a1ea145f705..277e0e45f67 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index f852c987cf0..4c278b4be7f 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index c184004e1cd..94d99fd1ec5 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 75890f2f078..aa946469160 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr "Aktiv"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 6e13f119b39..3a2bd6cd35b 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "เปิดใช้งาน"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "ใบลาที่รอตรวจ"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
@@ -850,6 +845,9 @@ msgstr "ให้การอนุมัติ"
 #~ msgid "Draft"
 #~ msgstr "ฉบับร่าง"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "ใบลาที่รอตรวจ"
+
 #~ msgid "Casual Leave"
 #~ msgstr "ลาป่วย"
 
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index abf10258fbb..c3fae04b051 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 98c11cc5c1a..b812ee9f397 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr "Aktif"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 861f5660310..b2649a72436 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index 05f4ac72f08..5174ec049b7 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -523,11 +523,6 @@ msgid "Active"
 msgstr "Hoạt động"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index a303883c205..6784fa93d24 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -532,11 +532,6 @@ msgid "Active"
 msgstr "生效"
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr "准假等待生效"
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "错误！您不能创建循环的员工等级。"
@@ -936,6 +931,9 @@ msgstr "待审批"
 #~ "validator"
 #~ msgstr "如果为真，分配 / 申请要二次审核才能生效。"
 
+#~ msgid "Leaves To Validate"
+#~ msgstr "准假等待生效"
+
 #~ msgid ""
 #~ "If you tick this checkbox, the system will allow, for this section, the "
 #~ "employees to take more leaves than the available ones."
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 0b9ae4908f9..b4a3ba93760 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -522,11 +522,6 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
-msgid "Leaves To Validate"
-msgstr ""
-
-#. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4770e82481e..03fd4762262 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -93,8 +93,7 @@
             <field name="arch" type="xml">
                 <search string="Payroll Structures">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                     </group>
                     <newline/>
                 </search>
@@ -212,8 +211,8 @@
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <group col="8" colspan="4">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="slip_id"/>
                         <field name="amount_select"/>
                     </group>
@@ -383,13 +382,14 @@
             <field name="arch" type="xml">
                 <search string="Search Payslips">
                     <group>
+                        <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                         <separator orientation="vertical"/>
-                        <field name="number"/>
                         <field name="employee_id"/>
-                        <field name="name"/>
-                        <field name="date_from"/>
                         <field name="payslip_run_id"/>
                     </group>
                     <newline/>
@@ -464,8 +464,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" string="Salary Rule Categories" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
                </search>
             </field>
         </record>
@@ -520,7 +519,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Contribution Registers">
-                    <field name="name"/>
+                    <field name="name" string="Contribution Registers"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </search>
             </field>
@@ -650,8 +650,8 @@
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
                     <group col="8">
-                        <field name="name"/>
-                        <field name="code"/>
+                        <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="category_id"/>
                         <field name="condition_range_min"/>
                     </group>
@@ -691,12 +691,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Batches">
-                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
-                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
+                    <field name="name" string="Payslip Batches"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
+                    <filter name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index acc48224afa..e06a43588c4 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -60,10 +60,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                	<newline/>
+                <filter name='done_filter' position="after">
+                    <separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
-                </field>
+                </filter>
             </field>
         </record>
 
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index e9054416eea..468d3a8d66e 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -30,13 +30,14 @@
     <record id="board_hr_applicants_status_form" model="ir.ui.view">
         <field name="name">board.hr.applicants.status.form</field>
         <field name="model">board.board</field>
-        <field name="inherit_id" ref="hr.board_hr_manager_form"/>
+        <field name="inherit_id" ref="hr.board_hr_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-          <xpath expr="/form/board/column" position="inside">
-            <action name="%(action_applicants_status)d" string="Applicants Status"/>
-          </xpath>
+            <xpath expr="/form/board/column[1]" position="inside">
+                <action name="%(action_applicants_status)d" string="Applicants To be Processed"/>
+            </xpath>
         </field>
     </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 112adb9b5fb..3a75b6df7c1 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -8,7 +8,6 @@
             <field name="res_model">hr.applicant</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_filter_inprogress':1,'search_default_filter_new':1}</field>            
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 63263d78c9d..f31778b7874 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -192,29 +192,25 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-document-new" string="New" name="filter_new" 
+               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+               <separator orientation="vertical"/>
+               <filter icon="terp-document-new" string="New" 
                    domain="[('state','=','draft')]"
-                   help="All Initial Jobs"
-               />
-               <filter icon="terp-camera_test" string="In Progress" name="filter_inprogress"
+                   help="All Initial Jobs"/>
+               <filter icon="terp-camera_test" string="In Progress" 
                    domain="[('state','=','open')]"
-                   help="Open Jobs"
-               />
+                   help="Open Jobs"/>
                <filter icon="terp-gtk-media-pause" string="Pending"
                    domain="[('state','=','pending')]"
-                   help="Pending Jobs"
-               />
-               <separator orientation="vertical"/>
+                   help="Pending Jobs"/>
+               <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
                     context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]"
                     help="Filter and view on next actions and date"/>
                <separator orientation="vertical"/>
-               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
-               </field>
+               <field name="user_id"/>
                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 16281eeb918..5ddbe5045ab 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -50,19 +50,6 @@
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Recruitment performed in current year"/>
-                    <separator orientation="vertical"/>	
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment performed in current month"/>
-                    <filter icon="terp-go-month"
-                        string="    Month-1    "
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Recruitment during last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="New"
                         icon="terp-document-new"
                         domain="[('state','=','draft')]"
@@ -71,23 +58,22 @@
                         icon="terp-camera_test"
                         domain="[('state', '=' ,'open')]"
                         help = "In progress recruitment"/>
-                       <filter string="Pending"
-                           icon="terp-gtk-media-pause"
-                           domain="[('state','=','pending')]"
-                           help = "Pending recruitment"/>
+                    <filter string="Pending"
+                        icon="terp-gtk-media-pause"
+                        domain="[('state','=','pending')]"
+                        help = "Pending recruitment"/>
                     <filter string="Hired"
-                           icon="terp-camera_test"
-                           domain="[('state','=','done')]"
-                           help = "Hired employees"/>
-                      <separator orientation="vertical"/>
-                      <field name="job_id"/>
+                        icon="terp-camera_test"
+                        domain="[('state','=','done')]"
+                        help = "Hired employees"/>
+                    <filter icon="terp-personal"
+                        string="My Recruitment"
+                        help="My Recruitment"
+                        domain="[('user_id','=',uid)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="job_id"/>
                     <field name="department_id" widget="selection"/>
-                    <field name="user_id" string="Responsible">
-                        <filter icon="terp-personal"
-                            string="My Recruitment"
-                            help="My Recruitment"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
+                    <field name="user_id" string="Responsible"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -116,9 +102,7 @@
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
-
-
-                </search>
+            </search>
         </field>
     </record>
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 4c5c22d9894..53def628bfe 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -60,11 +60,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="account_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 7e11fdad723..65b8905fca0 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -45,7 +45,6 @@ reports, etc.""",
         'wizard/hr_timesheet_analytic_profit_view.xml',
         'wizard/hr_timesheet_invoice_create_view.xml',
         'wizard/hr_timesheet_invoice_create_final_view.xml',
-        'board_hr_timesheet_invoice.xml',
     ],
     'demo': [
         'hr_timesheet_invoice_demo.xml',
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
deleted file mode 100644
index 7327ca66f63..00000000000
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
-
-        <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
-            <field name="name">Costs to invoice</field>
-            <field name="res_model">report.account.analytic.line.to.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-
-       <!--  <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.invoice</field>
-            <field name="model">board.board</field>
-             <field name="type">form</field>
-            <field name="inherit_id" ref="account.board_account_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/board/column/action[@string='Draft Customer Invoices']" position="before">
-                    <action name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close"/>
-                    <action name="%(act_my_account)d" string="Accounts to invoice"/>
-                </xpath>
-            </field>
-        </record> -->
-
-        <!-- Need to merge in above view -->
-        <!--<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.invoice</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.board_account_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/board/column/action[@string='Aged income']" position="after">
-                    <action name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
-                </xpath>
-            </field>
-        </record> -->
-
-        <record id="view_timesheet_uninvoiced_line_tree" model="ir.ui.view">
-            <field name="name">timesheet.uninvoiced.line.tree</field>
-            <field name="model">report.timesheet.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Uninvoiced line with billing rate">
-                    <field name="date"/>
-                    <field name="account_id"/>
-                    <field name="user_id" />
-                    <field name="name"/>
-                    <field name="cost"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_timesheet_uninvoiced_line" model="ir.actions.act_window">
-            <field name="name">Uninvoice lines with billing rate</field>
-            <field name="res_model">report.timesheet.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="domain">[('invoice_id','=',False)]</field>
-            <field name="view_id" ref="view_timesheet_uninvoiced_line_tree"/>
-        </record>
-
-        <record id="board_hr_timesheet_uninvoiced_form" model="ir.ui.view">
-            <field name="name">board.hr.timesheet.uninvoiced.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.board_hr_manager_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/board/column" position="inside">
-                    <action name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice Lines With Billing Rate"/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index c18ac4de667..51743733cd5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -150,7 +150,7 @@
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Type of invoicing"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index a43dc30197e..633275d5a10 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "الموعد النهائي"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "الحسابات للفاتورة"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "شريك"
@@ -290,7 +285,6 @@ msgstr "المستخدم او اسم اليومية"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "القيم الى الفاتورة"
@@ -941,11 +935,6 @@ msgid "Product"
 msgstr "المنتج"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "الخطوط بدون فواتير مع معدل  الفواتير"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "٪"
@@ -1175,6 +1164,9 @@ msgstr ""
 #~ msgid "Final Invoice"
 #~ msgstr "الفاتورة النهائية"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "الحسابات للفاتورة"
+
 #, python-format
 #~ msgid "You can not modify an invoiced analytic line!"
 #~ msgstr "لا يمكنك تصنيف الخط التحليلي للفاتورة"
@@ -1200,6 +1192,9 @@ msgstr ""
 #~ msgid "Balance product needed"
 #~ msgstr "الحاجة الى ميزانية المنتج"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "الخطوط بدون فواتير مع معدل  الفواتير"
+
 #~ msgid "Invoice on analytic lines"
 #~ msgstr "الفاتورة على الخطوط التحليلية"
 
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index 5811db3b269..6a5d1606f12 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr "Краен срок"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Контрагент"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Превърни \"разходи\" на фактура"
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "Продукт"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index 156571da4af..535e047a703 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index 11646bcbee1..4afc7ec859a 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "Data límit"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Comptes a facturar"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
@@ -290,7 +285,6 @@ msgstr "Nom del usuari o diari"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -946,11 +940,6 @@ msgid "Product"
 msgstr "Producte"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "No factura línies amb cost"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1329,6 +1318,12 @@ msgstr ""
 #~ "Empleneu els camps empresa i tarifa del compte analític:\n"
 #~ "%s"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "No factura línies amb cost"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Comptes a facturar"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Factura final del compte analítica"
 
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 75eb15a014f..99ff4b0ba2e 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/da.po b/addons/hr_timesheet_invoice/i18n/da.po
index 35a57ba2c56..f0b73f83161 100644
--- a/addons/hr_timesheet_invoice/i18n/da.po
+++ b/addons/hr_timesheet_invoice/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 8027e1c5fa8..051912e0faf 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -65,7 +65,7 @@ msgstr "tägliche Zeiterfassung aktuelles Jahr"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Re-open project"
-msgstr "Porjekt wiedereröffnen"
+msgstr "Projekt wiedereröffnen"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "Frist"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Abzurechnende Analytische Konten"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Partner"
@@ -290,7 +285,6 @@ msgstr "Benutzer oder Journalname"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Abzurechnende Kosten"
@@ -956,11 +950,6 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Storno Rechnungszeile mit Abrechnungsquote"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1300,9 +1289,15 @@ msgstr "Zeiterfassung der letzten 7 Tage"
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Schlussrechnung für Analytisches Konto"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Abzurechnende Analytische Konten"
+
 #~ msgid "Reinvoice Costs"
 #~ msgstr "Weiterberechnung"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Storno Rechnungszeile mit Abrechnungsquote"
+
 #, python-format
 #~ msgid ""
 #~ "Please fill in the partner and pricelist field in the analytic account:\n"
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index c3d98e2dc6b..a0fa29f0f7f 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -251,11 +251,6 @@ msgid "Deadline"
 msgstr "Χρονικό Όριο"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Συνεργάτης"
@@ -292,7 +287,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -936,11 +930,6 @@ msgid "Product"
 msgstr "Προϊόν"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 254d74a9174..eb2f6727ebe 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Cuentas a facturar"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
@@ -290,7 +285,6 @@ msgstr "Nombre del Usuario o Diario"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -946,11 +940,6 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "No facturar líneas con coste"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1303,6 +1292,9 @@ msgstr ""
 #~ msgid "Invoicing"
 #~ msgstr "A facturar"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Cuentas a facturar"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Factura final para la cuenta analítica"
 
@@ -1337,3 +1329,6 @@ msgstr ""
 #~ "company"
 #~ msgstr ""
 #~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "No facturar líneas con coste"
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index ec75a64cef9..2fa3e77fe46 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -931,11 +925,6 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
diff --git a/addons/hr_timesheet_invoice/i18n/es_CR.po b/addons/hr_timesheet_invoice/i18n/es_CR.po
index 8fdd83c4698..0ee3c65f379 100644
--- a/addons/hr_timesheet_invoice/i18n/es_CR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr_timesheet_invoice
@@ -250,11 +250,6 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Cuentas a facturar"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
@@ -291,7 +286,6 @@ msgstr "Nombre del Usuario o Diario"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -954,11 +948,6 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "No facturar líneas con coste"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1167,6 +1156,12 @@ msgstr "Año"
 msgid "Timesheet lines during last 7 days"
 msgstr "Lineas de hojas de diario durante los últimos 7 días"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Cuentas a facturar"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "No facturar líneas con coste"
+
 #, python-format
 #~ msgid "Analytic account incomplete"
 #~ msgstr "Cuenta analítica incompleta"
diff --git a/addons/hr_timesheet_invoice/i18n/es_EC.po b/addons/hr_timesheet_invoice/i18n/es_EC.po
index 5c81b10b86c..b2e66d2ba2a 100644
--- a/addons/hr_timesheet_invoice/i18n/es_EC.po
+++ b/addons/hr_timesheet_invoice/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -250,11 +250,6 @@ msgid "Deadline"
 msgstr "Fecha límite"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Cuentas a facturar"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Cliente"
@@ -291,7 +286,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costos a facturar"
@@ -943,11 +937,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
@@ -1152,3 +1141,6 @@ msgstr ""
 #: view:report.timesheet.line:0
 msgid "Timesheet lines during last 7 days"
 msgstr ""
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Cuentas a facturar"
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index a8b507f141e..f399636621e 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr "Tähtaeg"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Kulud arveldamiseks"
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "Toode"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index 012084e01fe..fa164655d95 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Laskutettavat tilit"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -935,11 +929,6 @@ msgid "Product"
 msgstr "Tuote"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1228,3 +1217,6 @@ msgstr ""
 
 #~ msgid "Create invoices"
 #~ msgstr "Luo laskut"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Laskutettavat tilit"
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 149a7fc480e..6afdb14aefa 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "Echéance"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Comptes à facturer"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
@@ -290,7 +285,6 @@ msgstr "Utilisateur ou nom du journal"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Coûts à facturer"
@@ -957,11 +951,6 @@ msgid "Product"
 msgstr "Produit"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Lignes non-facturées avec le taux de facturation"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1292,6 +1281,9 @@ msgstr "Lignes des feuilles de temps des 7 derniers jours"
 #~ msgid "Reactivate Account"
 #~ msgstr "Réactiver le compte"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Comptes à facturer"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Facture finale pour le compte analytique"
 
@@ -1317,6 +1309,9 @@ msgstr "Lignes des feuilles de temps des 7 derniers jours"
 #~ "Erreur ! La monnaie doit être la même que la monnaie de la société "
 #~ "sélectionnée"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Lignes non-facturées avec le taux de facturation"
+
 #, python-format
 #~ msgid ""
 #~ "Please fill in the partner and pricelist field in the analytic account:\n"
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index 75aa35c0092..16837ac91f6 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr "Rok"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Partner"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Troškovi za fakturiranje"
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index ca1fd1105fd..768c4be3dac 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -244,11 +244,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -285,7 +280,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -908,11 +902,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index 746126f98aa..00596ba933f 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -250,11 +250,6 @@ msgid "Deadline"
 msgstr "Határidő"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Számlázandó gyűjtőkódok"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Partner"
@@ -291,7 +286,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Kiszámlázandó költségek"
@@ -948,11 +942,6 @@ msgid "Product"
 msgstr "Termék"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Nem számlázott sorok számlázási rátával"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1207,6 +1196,9 @@ msgstr ""
 #~ msgid "Reactivate Account"
 #~ msgstr "Gyűjtőkód újraaktíválása"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Számlázandó gyűjtőkódok"
+
 #~ msgid ""
 #~ "\n"
 #~ "Module to generate invoices based on costs (human resources, expenses, "
@@ -1232,6 +1224,9 @@ msgstr ""
 #~ msgid "Analytic account incomplete"
 #~ msgstr "Nem adott meg gyűjtőkódot!"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Nem számlázott sorok számlázási rátával"
+
 #, python-format
 #~ msgid ""
 #~ "Please fill in the partner and pricelist field in the analytic account:\n"
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index d6ff1597e34..581780c37f7 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index 48f2c4f7cfb..b32105671bd 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "Scadenza"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Conti da Fatturare"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Partner"
@@ -290,7 +285,6 @@ msgstr "Nome Utente o Giornale"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costi da Fatturare"
@@ -941,11 +935,6 @@ msgid "Product"
 msgstr "Prodotto"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Linee non fatturate con tasso di fatturazione"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1296,6 +1285,12 @@ msgstr ""
 #~ "Per favore compilare il partner e il campo listino nel conto analitico:\n"
 #~ "%s"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Linee non fatturate con tasso di fatturazione"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Conti da Fatturare"
+
 #~ msgid ""
 #~ "\n"
 #~ "Module to generate invoices based on costs (human resources, expenses, "
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
index 23865a6e70a..bfb8cd16222 100644
--- a/addons/hr_timesheet_invoice/i18n/ja.po
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr "期限"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "請求するアカウント"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "パートナ"
@@ -289,7 +284,6 @@ msgstr "ユーザあるいはジャーナルの名称"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "請求書へ計上する経費"
@@ -314,7 +308,7 @@ msgstr "状態"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Data Insufficient!"
-msgstr "日付の指定が足りません。"
+msgstr "データ不足です。"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -412,7 +406,7 @@ msgstr "印刷日"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Bill Tasks Works"
-msgstr "課金が"
+msgstr "請求タスク作業"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -936,11 +930,6 @@ msgid "Product"
 msgstr "製品"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "請求料率を持つ未請求の行"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1146,5 +1135,11 @@ msgstr "年"
 msgid "Timesheet lines during last 7 days"
 msgstr "過去7日間の勤務表の行"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "請求するアカウント"
+
 #~ msgid "Do you want to display work details on the invoice ?"
 #~ msgstr "この請求書の作業明細を表示しますか。"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "請求料率を持つ未請求の行"
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index 1e66d669777..3a321d4c428 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr "마감시한"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "파트너"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgid "Product"
 msgstr "상품"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 969e9978c82..ff0436a865e 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 451d7f300b0..a84fc215aaf 100644
--- a/addons/hr_timesheet_invoice/i18n/lv.po
+++ b/addons/hr_timesheet_invoice/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/mn.po b/addons/hr_timesheet_invoice/i18n/mn.po
index 3d05b0d012e..e4b47c70bba 100644
--- a/addons/hr_timesheet_invoice/i18n/mn.po
+++ b/addons/hr_timesheet_invoice/i18n/mn.po
@@ -23,8 +23,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -259,11 +259,6 @@ msgid "Deadline"
 msgstr "Тогтсон өдөр"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Нэхэмжлэл үүсгэх дансууд"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Харилцагч"
@@ -300,7 +295,6 @@ msgstr "Хэрэглэгч болон журналын нэр"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Нэхэмжлэх үнийн дүн"
@@ -952,11 +946,6 @@ msgid "Product"
 msgstr "Бараа"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Тооцооны үнэ бүхий нэхэмжлээгүй мөрүүд"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1169,6 +1158,9 @@ msgstr ""
 #~ msgid "Sale Pricelist"
 #~ msgstr "Борлуулалтын үнийн жагсаалт"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Нэхэмжлэл үүсгэх дансууд"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Аналитик дансны эцсийн нэхэмжлэл"
 
@@ -1214,6 +1206,9 @@ msgstr ""
 #~ msgid "Invoicing"
 #~ msgstr "Нэхэмжилж байгаа"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Тооцооны үнэ бүхий нэхэмжлээгүй мөрүүд"
+
 #~ msgid "Invoice on analytic lines"
 #~ msgstr "Аналитик мөрүүдийг үндэслэн нэхэмжлэх"
 
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index 557bb39050d..a47be5c87d3 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -250,11 +250,6 @@ msgid "Deadline"
 msgstr "Deadline"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Te factureren klanten"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Relatie"
@@ -272,7 +267,7 @@ msgstr "De tijd van elk verricht werk zal getoond worden op de factuur"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr "Roosters"
+msgstr "Urenstaten"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
@@ -291,7 +286,6 @@ msgstr "Gebruiker of dagboeknaam"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Nog te ontvangen facturen"
@@ -960,11 +954,6 @@ msgid "Product"
 msgstr "Product"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Niet-gefactureerde regels met factuurtarief"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1290,6 +1279,9 @@ msgstr "Urenstaatregels in afgelopen 7 dagen"
 #~ msgid "Balance product"
 #~ msgstr "Saldo product"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Te factureren klanten"
+
 #, python-format
 #~ msgid "You can not modify an invoiced analytic line!"
 #~ msgstr "U kunt een gefactureerde kostenplaatsboeking niet wijzigen!"
@@ -1311,6 +1303,9 @@ msgstr "Urenstaatregels in afgelopen 7 dagen"
 #~ "Val aub de relatie en prijslijst velden in bij de kostenplaats:\n"
 #~ "%s"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Niet-gefactureerde regels met factuurtarief"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index 6c52eabcc56..b2162e53c23 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 8a0b41aa9d0..dc73068a124 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -233,7 +233,7 @@ msgstr "Dzienna karta czasu pracy na konto"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:64
 #, python-format
 msgid "Analytic Account incomplete"
-msgstr ""
+msgstr "Niekompletne konto analityczne"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "Termin"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -290,7 +285,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Koszty do faktury"
@@ -315,7 +309,7 @@ msgstr "Stan"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Zbyt mało danych!"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -354,7 +348,7 @@ msgstr "Pozycje do fakturowania"
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:128
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
@@ -386,7 +380,7 @@ msgstr "Zysk karty czasu pracy"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:68
 #, python-format
 msgid "Partner incomplete"
-msgstr ""
+msgstr "Niekomplenty partner"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,name:0
@@ -471,7 +465,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:220
 #, python-format
 msgid "Invoices"
-msgstr ""
+msgstr "Faktury"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -654,7 +648,7 @@ msgstr "Data"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:69
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
-msgstr ""
+msgstr "Wypełnij pole adresu dla partnera: %s."
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -724,7 +718,7 @@ msgstr "Ma"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.cost.ledger,date2:0
@@ -896,7 +890,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
 #, python-format
 msgid "At least one line has no product !"
-msgstr ""
+msgstr "Co najmniej jedna pozycja nie ma produktu !"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,date:0
@@ -933,11 +927,6 @@ msgid "Product"
 msgstr "Produkt"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -982,7 +971,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No Records Found for Report!"
-msgstr ""
+msgstr "Nie znaleziono rekordów dla raportu!"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_max:0
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index 0bdfa54c14b..54768835d2e 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -249,11 +249,6 @@ msgid "Deadline"
 msgstr "Prazo Limite"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Contas a Faturar"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
@@ -290,7 +285,6 @@ msgstr "Utilizador ou Nome diário"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Custos a Faturar"
@@ -951,11 +945,6 @@ msgid "Product"
 msgstr "Artigo"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Linhas de  re-fatura com taxa de faturamento"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1345,3 +1334,9 @@ msgstr "Linhas da folha de horas durante os últimos 7 dias"
 
 #~ msgid "Do you want to display work details on the invoice ?"
 #~ msgstr "Deseja exibir os detalhes do trabalho na fatura?"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Contas a Faturar"
+
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Linhas de  re-fatura com taxa de faturamento"
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 7b0705750c0..b713991aa8c 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr "Prazo final"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Custos para fatura"
@@ -932,11 +926,6 @@ msgid "Product"
 msgstr "Produto"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index f8999a32911..14affe21d78 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -13,19 +13,19 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: view:report_timesheet.user:0
 msgid "Timesheet by user"
-msgstr "Foaie de pontaj pe utilizator"
+msgstr "Fisa de pontaj dupa utilizator"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Timesheet lines in this year"
-msgstr ""
+msgstr "Linii fise de pontaj din acest an"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -40,7 +40,7 @@ msgstr "Profit"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
 msgid "Create invoice from timesheet final"
-msgstr "Creare factura din foaia de pontaj finala"
+msgstr "Creare factura din fisa de pontaj finala"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -55,22 +55,22 @@ msgstr "    7 zile    "
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Income"
-msgstr "Venituri"
+msgstr "Venit"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily Timesheets for this year"
-msgstr ""
+msgstr "Fise de pontaj zilnice pentru anul acesta"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Redeschideti proiectul"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
 msgid "Timesheet per day"
-msgstr "Foaie de pontaj pe zi"
+msgstr "Fisa de pontaj pe zi"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -84,7 +84,7 @@ msgstr "Martie"
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
 msgid "Name of entry"
-msgstr "Numele intrarii"
+msgstr "Numele inregistrarii"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,pricelist_id:0
@@ -93,13 +93,13 @@ msgid ""
 "deduced by this pricelist on the product."
 msgstr ""
 "Produsul de facturat este definit in formularul angajatului, pretul va fi "
-"dedus din aceasta lista de preturi pe produs."
+"dedus din aceasta lista de preturi pentru produs."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:129
 #, python-format
 msgid "You cannot modify an invoiced analytic line!"
-msgstr ""
+msgstr "Nu puteti modifica o linie analitica a facturii!"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
@@ -118,7 +118,7 @@ msgstr "Anul acesta"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
 msgid "Display time in the history of works"
-msgstr "Afisaj timp in istoricul activitatilor"
+msgstr "Afisajeaza perioada in istoricul activitatilor"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -145,12 +145,12 @@ msgstr "Cont"
 #: field:hr.timesheet.invoice.create,time:0
 #: field:hr.timesheet.invoice.create.final,time:0
 msgid "Time spent"
-msgstr "Timp consumat"
+msgstr "Timp petrecut"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Suma facturată"
+msgstr "Suma facturata"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -160,7 +160,7 @@ msgstr "Linie nefacturata cu rata facturarii"
 #. module: hr_timesheet_invoice
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Numarul Facturii trebuie sa fie unic per Companie!"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -176,6 +176,7 @@ msgstr "Suma"
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
 msgstr ""
+"Valoare gresita a creditului sau debitului in inregistrarea contabila !"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
@@ -186,12 +187,12 @@ msgstr "Detaliile fiecarei activitati prestate vor aparea pe factura"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertizare !"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
-msgstr "Creare factura din foaia de pontaj"
+msgstr "Creati factura din fisa de pontaj"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -211,29 +212,29 @@ msgstr "Linii nefactuate cu rata facturarii"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Group By..."
-msgstr "Grupare dupa..."
+msgstr "Grupati dupa..."
 
 #. module: hr_timesheet_invoice
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Comunicare Structurata BBA Nevalida !"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Create Invoices"
-msgstr "Creare facturi"
+msgstr "Creati Facturi"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet per account"
-msgstr "Foaia de pontaj zilnica per cont"
+msgstr "Fisa de pontaj zilnica per cont"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:64
 #, python-format
 msgid "Analytic Account incomplete"
-msgstr "Cont analitic incomplet"
+msgstr "Cont Analitic incomplet"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
@@ -246,12 +247,7 @@ msgstr "Cont analitic"
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,date_deadline:0
 msgid "Deadline"
-msgstr "Scadenta"
-
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Conturi de facturat"
+msgstr "Termen limita"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -271,14 +267,12 @@ msgstr "Timpul fiecarei activitati efectuate va fi afisat pe factura"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
 msgid "Timesheets"
-msgstr "Foi de pontaj"
+msgstr "Fise de pontaj"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
 msgid "hr.timesheet.analytic.cost.ledger"
-msgstr ""
-"hr.timesheet.analytic.cost.ledger (resurse umane.fisa de "
-"pontaj.analitic.cost.registru)"
+msgstr "ru.registru.fisa de pontaj.cost.analitic"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,date_from:0
@@ -292,7 +286,6 @@ msgstr "Nume Utilizator sau Jurnal"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Costuri de facturat"
@@ -300,7 +293,7 @@ msgstr "Costuri de facturat"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by user in this month"
-msgstr ""
+msgstr "Fisa de pontaj dupa utilizator in aceasta luna"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,account_id:0
@@ -328,12 +321,12 @@ msgstr "Debit"
 #: view:hr.timesheet.analytic.cost.ledger:0
 #: view:hr.timesheet.analytic.profit:0
 msgid "Print"
-msgstr "Imprima"
+msgstr "Tipariti"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
 msgid "It allows to set the discount while making invoice"
-msgstr "Va permite setarea discountului in timp ce faceti factura"
+msgstr "Va permite setarea reducerii in timp ce faceti factura"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,price:0
@@ -347,7 +340,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Force to use a special product"
-msgstr ""
+msgstr "Impune utilizarea unui produs special"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -378,7 +371,7 @@ msgid ""
 "an automatic invoice rate on analytic accounts."
 msgstr ""
 "Completati acest camp daca planuiti sa generati automat facturi bazate pe "
-"costurile din acest cont analitic: foi de pontaj, cheltuieli,... Puteti "
+"costurile din acest cont analitic: fise de pontaj, cheltuieli,... Puteti "
 "configura o rata automata a facturii in conturile analitice."
 
 #. module: hr_timesheet_invoice
@@ -387,7 +380,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
 msgid "Timesheet Profit"
-msgstr "Beneficii foi de pontaj"
+msgstr "Profit Fisa de pontaj"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:68
@@ -398,7 +391,7 @@ msgstr "Partener incomplet"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,name:0
 msgid "Display detail of work in the invoice line."
-msgstr "Afisarea detaliilor activitatii in linia facturii."
+msgstr "Afisati detaliile activitatii in linia facturii."
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -418,7 +411,7 @@ msgstr "Data imprimarii"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Bill Tasks Works"
-msgstr "Facturare activitati sarcini"
+msgstr "Facturati Activitati Sarcini"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -435,27 +428,27 @@ msgstr "Teoretic"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "Configuration Error"
-msgstr ""
+msgstr "Eroare de configurare"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
 msgid "Analytic lines to invoice report"
-msgstr "Linii analitice de factura raport"
+msgstr "Raport Linii analitice de facturat"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Invoice on Timesheet & Costs"
-msgstr ""
+msgstr "Facturi pe Fisele de pontaj & Costuri"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
 msgid "Timesheet by User"
-msgstr "Foaie de pontaj dupa Utilizator"
+msgstr "Fisa de pontaj dupa Utilizator"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
 msgid "Timesheet by Invoice"
-msgstr "Foaie de pontaj dupa Factura"
+msgstr "Fisa de pontaj dupa Factura"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
@@ -471,7 +464,7 @@ msgstr "Reducere (%)"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
 msgid "Yes (100%)"
-msgstr "DA (100%)"
+msgstr "Da (100%)"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:55
@@ -492,7 +485,7 @@ msgstr "Decembrie"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Invoice contract"
-msgstr ""
+msgstr "Facturati contractul"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
@@ -501,6 +494,9 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Contul selectat din Inregistrarea in Jurnal solicita furnizarea unei monede "
+"secundare. Ar trebui sa stergeti moneda secundara din cont sau sa selectati "
+"o vizualizare multi-moneda in jurnal."
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -515,12 +511,12 @@ msgstr "Luna"
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "Currency"
-msgstr "Valuta"
+msgstr "Moneda"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Elementele Jurnalului"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,product:0
@@ -529,7 +525,8 @@ msgid ""
 "Keep empty to use the real product that comes from the cost."
 msgstr ""
 "Completati acest camp doar daca doriti sa impuneti folosirea unui anumit "
-"produs.Lasati necompletat pentru a folosi produsul real care reiese din cost."
+"produs. Lasati necompletat pentru a folosi produsul real care reiese din "
+"cost."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -539,7 +536,7 @@ msgstr "Utilizatori"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
-msgstr "Foi de pontaj neatribuite utilizatorilor"
+msgstr "Fise de pontaj neatribuite utilizatorilor"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
@@ -558,12 +555,14 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Data Inregistrarii in Jurnal nu se afla in perioada definita! Ar trebui sa "
+"schimbati data sau sa eliminati aceasta restrictie din jurnal."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "No income account defined for product '%s'"
-msgstr ""
+msgstr "Nu exista nici un cont de venituri definit pentru acest produs '%s'"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -573,7 +572,7 @@ msgstr "Rata factura dupa utilizator"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account:0
 msgid "Timesheet by account"
-msgstr "Foaie de pontaj dupa cont"
+msgstr "Fisa de pontaj dupa cont"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -588,7 +587,7 @@ msgstr "Total facturat"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period to"
-msgstr "Perioada la"
+msgstr "Perioada pana la"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
@@ -637,18 +636,18 @@ msgstr "Iunie"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,date:0
 msgid "Display date in the history of works"
-msgstr "Afisare data in istoricul activitatilor"
+msgstr "Afisati data in istoricul activitatilor"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
 #: view:report_timesheet.account:0
 msgid "Timesheet per account"
-msgstr "Foaie de pontaj per cont"
+msgstr "Fisa de pontaj per cont"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
 msgid "Timesheet by Account"
-msgstr "Foaie de pontaj dupa cont"
+msgstr "Fisa de pontaj dupa Cont"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,date:0
@@ -661,7 +660,7 @@ msgstr "Data"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:69
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
-msgstr "Va rugam completati campul Adresa din formularul Partenerului: %s."
+msgstr "Va rugam completati campul Adresa in formularul Partenerului: %s."
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -675,7 +674,7 @@ msgstr "Noiembrie"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
@@ -701,7 +700,7 @@ msgstr "Utilizator"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr "J.C. /Mutare nume"
+msgstr "J.C. /Nume mutare"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -720,7 +719,7 @@ msgstr "Ianuarie"
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Nu puteti crea elemente ale jurnalului intr-un cont inchis."
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -753,6 +752,7 @@ msgstr "Sold"
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+"Nu puteti crea elemente ale jurnalului intr-un cont de tipul vizualizare."
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity:0
@@ -778,7 +778,7 @@ msgstr "Cont General"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
 msgid "Print Timesheet Profit"
-msgstr "Imprimare profit fioaie de pontaj"
+msgstr "Imprimati Profitul Fisei de pontaj"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -812,7 +812,7 @@ msgstr "Septembrie"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Nu puteti crea o linie analitica in vizualizarea contului."
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
@@ -825,6 +825,8 @@ msgstr "Factura"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nu puteti modifica o inregistrare dintr-o fisa de pontaj "
+"Confirmata/Efectuata !."
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -833,17 +835,17 @@ msgstr ""
 #: view:hr.timesheet.invoice.create:0
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Cancel"
-msgstr "Anuleaza"
+msgstr "Anulati"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Close"
-msgstr "Inchide"
+msgstr "Inchideti"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,price:0
 msgid "Display cost of the item you reinvoice"
-msgstr "Afiseaza costul articolului pe care il refacturati"
+msgstr "Afisati costul articolului pe care il refacturati"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -854,7 +856,7 @@ msgid ""
 "speed up your invoicing."
 msgstr ""
 "OpenERP va permite sa creati tipuri predefinite de facturare. S-ar putea ca "
-"dumneavoastra sa trebuiasca sa atribuiti frecvent discounturi datorita unui "
+"dumneavoastra sa trebuiasca sa atribuiti frecvent reduceri datorita unui "
 "contract specific sau a unui acord cu un client. Din acest meniu, puteti "
 "crea tipuri suplimentare de facturare pentru a grabi facturarea."
 
@@ -864,7 +866,7 @@ msgstr ""
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr "Linie fioaie de pontaj"
+msgstr "Linie Fisa de pontaj"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -886,7 +888,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Compania trebuie sa fie aceeasi pentru contul si perioada asociata."
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
@@ -904,7 +906,7 @@ msgstr "Catre"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
 msgid "Create Invoice"
-msgstr ""
+msgstr "Creati Factura"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
@@ -920,22 +922,22 @@ msgstr "Data reala a fiecarei activitati va fi afisata pe factura"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Customer Pricelist"
-msgstr ""
+msgstr "Lista de preturi Client"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheets to invoice"
-msgstr "Foi de pontaj de facturat"
+msgstr "Fise de pontaj de facturat"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.cost.ledger,date1:0
 msgid "Start of period"
-msgstr "Începutul perioadei"
+msgstr "Inceputul perioadei"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
 msgid "Daily Timesheet by Account"
-msgstr "Foi de pontaj zilnice dupa cont"
+msgstr "Fise de pontaj Zilnice dupa Cont"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,product:0
@@ -947,11 +949,6 @@ msgid "Product"
 msgstr "Produs"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "Nefacturare linii cu rata facturarii"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -993,23 +990,24 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily Timesheets of this month"
-msgstr ""
+msgstr "Fise de pontaj Zilnice din luna aceasta"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No Records Found for Report!"
-msgstr "Nu au fost gasite inregistrari pentru raport!"
+msgstr "Nu au fost gasite Inregistrari pentru Raport!"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_max:0
 msgid "Keep empty if this contract is not limited to a total fixed price."
 msgstr ""
+"Lasati necompletat daca acest contract nu este limitat unui pret total fix."
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
 msgid "Timesheet by invoice"
-msgstr "Foi de pontaj dupa factura"
+msgstr "Fisa de pontaj dupa factura"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -1047,7 +1045,7 @@ msgstr "Nume"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily timesheet by account"
-msgstr "Foaia de pontaj zilnica dupa cont"
+msgstr "Fisa de pontaj zilnica dupa cont"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,sale_price:0
@@ -1057,7 +1055,7 @@ msgstr "Pret de vanzare"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
-msgstr "Foi de pontaj pe zi"
+msgstr "Fise de pontaj pe zi"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -1071,18 +1069,18 @@ msgstr "Aprilie"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Invoicing Data"
-msgstr "Date facturare"
+msgstr "Date pentru facturare"
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
 msgid "Discount in percentage"
-msgstr "Discount in procente"
+msgstr "Reducere in procente"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
 #, python-format
 msgid "Invoice is already linked to some of the analytic line(s)!"
-msgstr ""
+msgstr "Factura este deja legata la unele linii analitice!"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -1092,7 +1090,7 @@ msgstr "Tipuri de facurare"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
 msgid "Timesheets per account"
-msgstr "Foi de pontaj per cont"
+msgstr "Fise de pontaj per cont"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,name:0
@@ -1108,7 +1106,7 @@ msgstr "Unitati"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.user:0
 msgid "Timesheet by user in this year"
-msgstr ""
+msgstr "Fise de pontaj dupa utilizator in acest an"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
@@ -1118,17 +1116,17 @@ msgstr "Tip de facturare"
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
 msgid "Analytic Lines to Invoice"
-msgstr "Linii analitice de facturare"
+msgstr "Linii Analitice de Facturat"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Timesheet lines in this month"
-msgstr ""
+msgstr "Linii Fise de pontaj in luna aceasta"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Invoicing Statistics"
-msgstr ""
+msgstr "Statistica Facturare"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,manager_id:0
@@ -1158,7 +1156,7 @@ msgstr "An"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Timesheet lines during last 7 days"
-msgstr ""
+msgstr "Linii fise de pontaj in ultimele 7 zile"
 
 #~ msgid "Visible name"
 #~ msgstr "Nume vizibil"
@@ -1176,6 +1174,9 @@ msgstr ""
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "Factura finala pentru contul analitic"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "Conturi de facturat"
+
 #~ msgid "Balance product"
 #~ msgstr "Sold produs"
 
@@ -1237,6 +1238,9 @@ msgstr ""
 #~ msgid "Balance product needed"
 #~ msgstr "Este nevoie de soldul produsului"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "Nefacturare linii cu rata facturarii"
+
 #~ msgid "Invoice on analytic lines"
 #~ msgstr "Factura in liniile analitice"
 
@@ -1253,3 +1257,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Costul fiecărei activităti efectuate va fi tipărit pe factura. Probabil că "
 #~ "nu doriti să bifati această optiune."
+
+#~ msgid "Do you want to display work details on the invoice ?"
+#~ msgstr "Doriti sa afisati detaliile activitatii in factura ?"
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index b21307487e8..4aafe4e30da 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr "Срок"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "Счета к выставлению"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Расходы для выставления счетов"
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "Продукция"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1201,3 +1190,6 @@ msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "Состояние"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Счета к выставлению"
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 26648b352c7..18f10cbaa31 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "Proizvod"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
diff --git a/addons/hr_timesheet_invoice/i18n/sq.po b/addons/hr_timesheet_invoice/i18n/sq.po
index c0d37975eb9..6886337fbd2 100644
--- a/addons/hr_timesheet_invoice/i18n/sq.po
+++ b/addons/hr_timesheet_invoice/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/sr@latin.po b/addons/hr_timesheet_invoice/i18n/sr@latin.po
index fea269e314b..bc3b739b2fd 100644
--- a/addons/hr_timesheet_invoice/i18n/sr@latin.po
+++ b/addons/hr_timesheet_invoice/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 845563c32e1..4363f9356a2 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -931,11 +925,6 @@ msgid "Product"
 msgstr "Product"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index 88bf366af02..8f11f9e1fe3 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 1a864d78bc6..61b06d4e524 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr "Son Teslim Tarihi"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Ortak"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Faturalanacak Maliyetler"
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "Ürün"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index 824e4dbc17c..fc0efab1058 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr "Кінцевий термін"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "Кошти для інвойсування"
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "Товар"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/vi.po b/addons/hr_timesheet_invoice/i18n/vi.po
index 2eb159f1b8e..2f996cd4cc3 100644
--- a/addons/hr_timesheet_invoice/i18n/vi.po
+++ b/addons/hr_timesheet_invoice/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -248,11 +248,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -289,7 +284,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -930,11 +924,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index 4d3d61b3bdc..27d1cbd6809 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr "截止日期"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr "开发票"
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "业务伙伴"
@@ -288,7 +283,6 @@ msgstr "用户或者账簿名称"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr "成本发票"
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr "产品"
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr "未开票明细和开票税率"
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr "%"
@@ -1256,6 +1245,9 @@ msgstr "7天内的计工单"
 #~ msgid "Invoice analytic lines"
 #~ msgstr "发票辅助核算明细"
 
+#~ msgid "Uninvoice lines with billing rate"
+#~ msgstr "未开票明细和开票税率"
+
 #, python-format
 #~ msgid "Balance product needed"
 #~ msgstr "需要结余产品"
@@ -1267,6 +1259,9 @@ msgstr "7天内的计工单"
 #~ msgid "Reactivate Account"
 #~ msgstr "重新激活"
 
+#~ msgid "Accounts to invoice"
+#~ msgstr "开发票"
+
 #~ msgid "Final invoice for analytic account"
 #~ msgstr "辅助核算项的最终发票"
 
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index c21cce96add..e959870c490 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:00+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -247,11 +247,6 @@ msgid "Deadline"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
-msgid "Accounts to invoice"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr ""
@@ -288,7 +283,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
 msgid "Costs to invoice"
 msgstr ""
@@ -929,11 +923,6 @@ msgid "Product"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
-msgid "Uninvoice lines with billing rate"
-msgstr ""
-
-#. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
 msgid "%"
 msgstr ""
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 be090dfcdbb..0167d4b959e 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
@@ -47,26 +47,14 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
-                      <filter icon="terp-go-year" string="This Year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet lines in this year"/>
-                      <filter icon="terp-go-month" string="This Month"
-                          name="month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Timesheet lines in this month"/>
-                    <filter icon="terp-go-week"
-                              string="    7 Days    "
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                              help="Timesheet lines during last 7 days"/>
-                      <separator orientation="vertical"/>
-                      <field name="user_id" widget="selection">
-                          <filter icon="terp-personal"
+                      <filter icon="terp-personal"
                               string="Non Assigned timesheets to users"
                               help="Non Assigned timesheets to users"
                               domain="[('user_id','=',False)]"/>
-                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="user_id" widget="selection"/>
                       <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="product_id"/>
+                      <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -162,13 +150,10 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <group>
+                        <field name="name" string="Timesheet by users"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -298,14 +283,11 @@
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <group>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
@@ -370,14 +352,11 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <group>
+                        <field name="name" string="Timesheet by account"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id"/>
+                        <field name="month"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index c196beae880..f545edcb899 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -114,13 +114,11 @@
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                    <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
+                        <field name="name" string="Analytic Lines"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
                         <field name="product_id"/>
                         <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="month"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 74530b81859..2b165334739 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -2,30 +2,18 @@
 <openerp>
     <data>
 
-        <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
-            <field name="name">Timesheets</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr_timesheet_sheet.sheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
-        </record>
-        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
+        <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.sheet.graph</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">tree</field>
+            <field name="type">graph</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
-                    <field name="date_from"/>
-                    <field name="user_id"/>
-                    <field name="department_id" invisible="1"/>
+                <graph orientation="horizontal" string="Available Attendance" type="bar">
                     <field name="name"/>
-                    <field name="total_attendance" widget="float_time"/>
-                    <field name="total_timesheet" widget="float_time"/>
-                    <field name="state"/>
-                </tree>
+                    <field name="total_attendance" operator="+"/>
+                </graph>
             </field>
         </record>
+
         <record id="action_week_attendance_graph" model="ir.actions.act_window">
             <field name="name">My Total Attendances By Week</field>
             <field name="res_model">hr_timesheet_sheet.sheet</field>
@@ -34,6 +22,7 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="hr_timesheet_sheet.view_hr_timesheet_sheet_graph"/>
         </record>
+
         <record id="board_hr_week_attendace_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.sheet.form</field>
             <field name="model">board.board</field>
@@ -45,5 +34,6 @@
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 3ed1b943ced..f62016fb026 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -2,18 +2,6 @@
 <openerp>
     <data>
 
-       <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
-         <field name="name">hr.timesheet.sheet.graph</field>
-         <field name="model">hr_timesheet_sheet.sheet</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Timesheets" type="bar">
-                 <field name="name"/>
-                 <field name="total_attendance" operator="+"/>
-                 <field name="total_timesheet" operator="+"/>
-             </graph>
-         </field>
-        </record>
         <record id="hr_timesheet_account_form" model="ir.ui.view">
             <field name="name">hr.timesheet.account.form</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
@@ -167,11 +155,12 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group>
+                        <field name="date_from"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id"/>
-                        <field name="date_from"/>
                         <field name="department_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -238,7 +227,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="date" position="after">
+                <field name="user_id" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>
@@ -254,8 +243,8 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
-                <field name="action" position="after">
-                    <field name="sheet_id" />
+                <field name="employee_id" position="after">
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
@@ -341,17 +330,6 @@
                 </tree>
             </field>
         </record>
-        <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.sheet.graph</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Available Attendance" type="bar">
-                    <field name="name"/>
-                    <field name="total_attendance" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 9d394e9353d..8d1493e11a4 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -258,7 +258,6 @@ msgstr " شهر "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index d62eb10f4f9..4c1cc6c1936 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr " Месец "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index 2302c1b36b7..5503e49ded1 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 78062958efa..10197f69bd5 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -264,7 +264,6 @@ msgstr " Mes "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 9b200bfcbe2..31600d54baf 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/da.po b/addons/hr_timesheet_sheet/i18n/da.po
index a9386ebb05a..d09cb027165 100644
--- a/addons/hr_timesheet_sheet/i18n/da.po
+++ b/addons/hr_timesheet_sheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 248eb5b1824..b7cbc2db114 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -267,7 +267,6 @@ msgstr " Monat "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 05585c38e45..21aeac74b18 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -258,7 +258,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index 9efa9b7e4be..9a93be55c6c 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -265,7 +265,6 @@ msgstr " Mes "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index a47c4807a38..9b2b9af6a88 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -255,7 +255,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/es_CR.po b/addons/hr_timesheet_sheet/i18n/es_CR.po
index 6633798e3e9..65153383a9f 100644
--- a/addons/hr_timesheet_sheet/i18n/es_CR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 "Language: \n"
 
 #. module: hr_timesheet_sheet
@@ -267,7 +267,6 @@ msgstr " Mes "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index e5946f6ac67..9b02e085e3e 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index d1d0eca2986..ca28f3d498f 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -258,7 +258,6 @@ msgstr " Kuukausi "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index 31aaae6b929..511f417c225 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -268,7 +268,6 @@ msgstr " Mois "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index 2b184a63e55..e69b5c85f89 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index 0eeae3beea5..ae27ef19b88 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -272,7 +272,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index 28a77e822db..070b7bb4401 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -264,7 +264,6 @@ msgstr " Hónap "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 7b1cfa8c0ee..aefcdd8fc70 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index 8d6e0b6d7ad..fd3bdd7c87b 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -256,7 +256,6 @@ msgstr " Mese "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
index 9e1d2895fe7..4e14d2c2bc0 100644
--- a/addons/hr_timesheet_sheet/i18n/ja.po
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -257,7 +257,6 @@ msgstr " 月 "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index 92fbf537da4..8b89348700c 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index eefa0f8ee47..d8453de4948 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index dc66a04069e..83668529a3e 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 84782368154..0a5ff7bc896 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -27,8 +27,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -277,7 +277,6 @@ msgstr " Сар "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index b1f15618572..fa515565ab9 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -266,7 +266,6 @@ msgstr " Maand "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index 511b49bfbde..9b0341e192a 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 8502c4ebc3d..055380692ef 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr " Miesiąc "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index ecb0f334cb4..6d75d35fccd 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -263,7 +263,6 @@ msgstr " Mês "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index b56b2cdd04a..3fba221abfd 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -255,7 +255,6 @@ msgstr " Mês "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index 0744ff93d6c..4fa54be0f76 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -265,7 +265,6 @@ msgstr " Luna "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index 86e76dcf573..04784e68bd4 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -260,7 +260,6 @@ msgstr " Месяц "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index 54a42ed507a..cf5817955ef 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index e11cd4f5b34..5837c11d338 100644
--- a/addons/hr_timesheet_sheet/i18n/sq.po
+++ b/addons/hr_timesheet_sheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index e3040eea19c..612d0ee64cc 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index e35519321e0..1359be03f08 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 9d064207ba0..c7695729d72 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 0d6837c2d28..04af8459ab8 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index c69acafe056..d233e7d302d 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -254,7 +254,6 @@ msgstr " Tháng "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index 1207586b287..235bf419d51 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -255,7 +255,6 @@ msgstr " 月份 "
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index 6d08be40d2c..e1b33791b37 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-16 04:57+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:46+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -253,7 +253,6 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 #: view:res.company:0
 msgid "Timesheets"
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 447c3be6966..8b102b19f72 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -41,22 +41,8 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>							
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
-                            <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="user_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -81,7 +67,6 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 7c06971c7d2..fe497b6f46c 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -49,20 +49,6 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current year"/>
-                        <separator orientation="vertical"/>								
-                        <filter icon="terp-go-month" string=" Month "
-                                name="month"
-                                domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                                help="Timesheet in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('date_current','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Timesheet of last month"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new"
                                 string="Draft"
                                 domain="[('state','=','draft')]"/>
@@ -70,11 +56,11 @@
                                 string="Confirmed"
                                 domain="[('state','=','confirm')]"/>
                         <filter icon="terp-dialog-close"
-                                    string="Done"
-                                    domain="[('state','=','done')]"/>
+                                string="Done"
+                                domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="account_id"/>
-                      <field name="user_id" />
+                        <field name="user_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -87,6 +73,7 @@
                         <separator orientation="vertical"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <newline/>
+                        <field name="date_current"/>
                         <field name="date_to"/>
                         <field name="date_from"/>
                     </group>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 10f703101ff..0aabaa42276 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -8,7 +8,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas Categories">
-                <field name="name"/>
+                <field name="name" string="Category"/>
             </search>
         </field>
     </record>
@@ -108,12 +108,13 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group>
+                    <field name="name" string="Idea"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
                     <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
                     <filter icon="terp-check" string="Accepted"
                         domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="category_ids"/>
                 </group>
                 <newline/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index ffd07973546..1777fd85da6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -71,13 +71,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                    <separator orientation="vertical"/>
                     <field name="user_id"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
@@ -183,10 +182,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search CashMove">
-                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_cashmove"/>
                     <field name="create_date"/>
+                    <field name="user_cashmove"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
@@ -196,7 +193,6 @@
                         <filter string="Date" icon="terp-go-today" domain="[]"  context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
-
             </field>
         </record>
 
@@ -294,7 +290,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products">
-                    <field name="name" />
+                    <field name="name" string="Product"/>
                     <field name="category_id"/>
                     <field name="price"/>
                 </search>
@@ -370,20 +366,8 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
-                        <filter icon="terp-go-year" string="  Year  " name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Box amount in current year"/>
-                    <separator orientation="vertical"/>
-
-                        <filter icon="terp-go-month" string="   Month   "
-                                name="month"
-                                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Box amount in current month"/>
-                        <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Box amount in last month"/>
-                    <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 5dd25322d47..168398ae5cc 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -26,17 +26,7 @@
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 30 days"/>
-                    <filter icon="terp-go-week"
-                         string="    7 Days    "
-                         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"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 39413a80bed..95ce7d5619d 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -61,7 +61,6 @@ The main features are:
         'mail_thread_view.xml',
         'mail_group_view.xml',
         'res_partner_view.xml',
-        'report/mail_message_report_view.xml',
         'security/mail_security.xml',
         'security/ir.model.access.csv',
         'mail_data.xml',
@@ -92,5 +91,8 @@ The main features are:
     'qweb': [
         'static/src/xml/mail.xml',
     ],
+    'demo': [
+        'mail_demo.xml',
+    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 9062a02c6d4..0912a3e8762 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-18 16:47+0000\n"
+"PO-Revision-Date: 2012-06-22 01:42+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -26,7 +26,7 @@ msgstr ""
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Supprimer définitivement les courriels après envoi"
 
 #. module: mail
 #: view:mail.message:0
@@ -68,7 +68,7 @@ msgstr "Version plein texte du message"
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Corps de texte"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Reçu"
 
 #. module: mail
 #: view:mail.message:0
@@ -100,13 +100,13 @@ msgstr "Serveur courriel sortant"
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulé"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Répondre à"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
@@ -117,7 +117,7 @@ msgstr "Version texte enrichi/HTML du message"
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Suppression automatique"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
@@ -156,27 +156,27 @@ msgstr "Message du courriel"
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Envoyé"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Échec"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Répondre"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Envoyer"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -192,12 +192,12 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Destinataires"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Assistant de composition de courriels"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
@@ -208,13 +208,13 @@ msgstr "ID du document associé"
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avancée"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
@@ -245,27 +245,27 @@ msgstr "Nom du Partenaire"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Recommencer"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Sortant"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Envoyer maintenant"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Partenaire associé"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -276,7 +276,7 @@ msgstr "Date"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
@@ -293,7 +293,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -328,7 +328,7 @@ msgstr " sur "
 #. module: mail
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "Suppression de ce courriel après envoi pour économiser de l'espace"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
@@ -344,18 +344,18 @@ msgstr "Texte affiché"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Ouvrir"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Echec] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
@@ -375,7 +375,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mois de création"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -413,7 +413,7 @@ msgstr "Corps (texte)"
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Vous"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
@@ -434,6 +434,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s à écrit %s: \n"
+" Sujet: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -463,18 +466,20 @@ msgstr "Copie cachée à (BCC)"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Références du message , tel que les identifiants des messages précédents"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
@@ -490,7 +495,7 @@ msgstr "Échec de l'envoi"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Contenu du courriel"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
@@ -500,13 +505,13 @@ msgstr "Discussion par courriel"
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtres"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Pièce jointe"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
@@ -522,3 +527,12 @@ msgstr "Adresse de réponse préférée pour le message"
 
 #~ msgid "Rich-text contents"
 #~ msgstr "Contenu en texte enrichi"
+
+#~ msgid "Message type"
+#~ msgstr "Type de message"
+
+#~ msgid "Related user"
+#~ msgstr "Utilisateur associé"
+
+#~ msgid "Message headers"
+#~ msgstr "En-têtes de message"
diff --git a/addons/mail/mail_demo.xml b/addons/mail/mail_demo.xml
new file mode 100644
index 00000000000..1adec42a910
--- /dev/null
+++ b/addons/mail/mail_demo.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="message_blogpost0_attachment0" model="ir.attachment">
+            <field name="name">A cool attachment</field>
+            <field name="datas">PT1Tb21lIGNvb2wgYXR0YWNobWVudD09ClByYWVzZW50IHZlbCBtYXNzYSBzZWQgbWFzc2EgY29uc2VxdWF0IGVnZXN0YXMgaW4gdHJpc3RpcXVlIG9yY2ku</field>
+            <field name="datas_fname">a_cool_attachment</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0_attachment1" model="ir.attachment">
+            <field name="name">Another clean attachment</field>
+            <field name="datas">PT1Tb21lIGNsZWFuIGF0dGFjaG1lbnQ9PQpOdWxsYSB0dXJwaXMgbGVvLCByaG9uY3VzIHV0IGVnZXN0YXMgc2l0IGFtZXQsIGNvbnNlY3RldHVyIHZpdGFlIHVybmEu</field>
+            <field name="datas_fname">a_clean_attachment</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0" model="mail.message">
+            <field name="subject">Internal company announce</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus. 
+            Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. 
+
+Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. 
+
+Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="attachment_ids" eval="[(6,0,[ref('message_blogpost0_attachment0'),ref('message_blogpost0_attachment1')])]"/>
+        </record>
+
+        <record id="message_blogpost0_comment0" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[That was such a <b>tremendous</b> blogpost !  (first comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
+        <record id="message_blogpost0_comment1" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Agreed !  
+Would it be possible to learn more about the author ?  (second comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+
+        <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
+            <field name="name">Author's full biography</field>
+            <field name="datas">PT1BYm91dCB0aGUgYXV0aG9yPT0KSW50ZWdlciBzb2RhbGVzIGRvbG9yIGV1IGVsaXQgZnJpbmdpbGxhIGJsYW5kaXQu</field>
+            <field name="datas_fname">blogpost_author_biography</field>
+            <field name="description"></field>
+            <field name="res_name">Mail group</field>
+            <field name="res_model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="type">binary</field>
+        </record>
+
+        <record id="message_blogpost0_comment2" model="mail.message">
+            <field name="subject">Reply</field>
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_company"/>
+            <field name="subtype">html</field>
+            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel. 
+
+In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue. 
+Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu. 
+
+Check the file in attachment for more information !  (third comment)]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="attachment_ids" eval="[(4,ref('message_blogpost0_comment2_attachment0'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index b2b34da8472..921c3b528c4 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        
-       <!-- Group Kanban View  !-->
+
+        <!-- Group Kanban View  !-->
         <record model="ir.ui.view" id="view_group_kanban">
             <field name="name">mail.group.kanban</field>
             <field name="model">mail.group</field>
@@ -50,29 +50,30 @@
             <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <form string="Group" version="7.0">
-                    <sheet>
-                        <group colspan="4" col="8">
-                            <group colspan="6" col="4">
-                                <separator string="General Information" colspan="4"/>
-                                <field name="name" colspan="2"/>
-                                <field name="responsible_id" colspan="2"/>
-                                <newline/>
-                                <field name="description" colspan="4"/>
-                            </group>
-                            <group colspan="1" col="2">
-                                <separator string="Group Image" colspan="2"/>
-                                <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
-                            </group>
-                            <group colspan="1" col="2">
-                                <separator string="Privacy Settings" colspan="2"/>
-                                <field name="public" nolabel="1"/>
-                                <label string="This group is visible by non members" colspan="2"/>
-                            </group>
-                        </group>
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
-                                options='{"thread_level": 1}'/>
-                    </sheet>
+                <form string="Group Form" version="7.0">
+                    <div style="padding: 8px">
+                        <div class="oe_right">
+                            <field name="photo" widget='image' on_change="onchange_photo(photo)"/>
+                        </div>
+                        <div class="oe_title">
+                            <div class="oe_edit_only">
+                                <label for="name"/> 
+                            </div>
+                            <h1><field name="name"/></h1>
+                            <div class="oe_edit_only">
+                                <label for="responsible_id"/> 
+                            </div>
+                            <field name="responsible_id" class="oe_inline"/>
+                            <div class="oe_edit_only">
+                                <label for="public"/> 
+                                <field name="public" class="oe_inline"/>
+                            </div>
+                            <field name="description" colspan="4" nolabel="1"/>
+                        </div>
+                    </div>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="ThreadView" options='{"thread_level": 1}'/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -98,8 +99,9 @@
             <field name="type">search</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <search string="Search groups">
-                    <field name="name"/>
+                <search string="Search Groups">
+                    <field name="name" string="Group"/>
+                    <separator orientation="vertical"/>
                     <field name="responsible_id"/>
                 </search>
             </field>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 339c8fba817..9159190ab29 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -54,9 +54,11 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
-                    <field name="user_id"/>
-                    <field name="model"/>
+                    <field name="model" string="Message"/>
+                    <separator orientation="vertical"/>
                     <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
@@ -168,20 +170,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
+                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
                     <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
                     <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
                     <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="email_from"/>
-                    <field name="email_to"/>
-                    <field name="subject"/>
-                    <field name="date"/>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="user_id" string="User"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b1b6c68e4cc..0f404155f42 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -413,7 +413,30 @@ class mail_thread(osv.osv):
         """ OpenChatter feature: return thread messages
         """
         msg_ids = self.message_load_ids(cr, uid, ids, limit, offset, domain, ascent, root_ids, context=context)
-        msgs = self.pool.get('mail.message').read(cr, uid, msg_ids, context=context)
+        msgs = self.pool.get('mail.message').read(cr, uid, msg_ids, [], context=context)
+        
+        """ Retrieve all attachments names """
+        map_id_to_name = {}
+        
+        for msg in msgs:
+            for attach_id in msg["attachment_ids"]:
+                map_id_to_name[attach_id] = '' # use empty string as a placeholder
+        
+        ids = map_id_to_name.keys()
+        names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
+        
+        # convert the list of tuples into a dictionnary
+        for name in names: 
+            map_id_to_name[name[0]] = name[1]
+        
+        # give corresponding ids and names to each message
+        for msg in msgs:
+            msg["attachments"] = []
+            
+            for attach_id in msg["attachment_ids"]:
+                msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]})
+        
+        """ Sort and return messages """
         msgs = sorted(msgs, key=lambda d: (-d['id']))
         return msgs
 
diff --git a/addons/mail/report/__init__.py b/addons/mail/report/__init__.py
index 7ec4e7cd2c2..c380a63e8d3 100644
--- a/addons/mail/report/__init__.py
+++ b/addons/mail/report/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import mail_message_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mail/report/mail_message_report.py b/addons/mail/report/mail_message_report.py
deleted file mode 100644
index 7955ea87909..00000000000
--- a/addons/mail/report/mail_message_report.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009-today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import fields, osv
-import time
-import tools
-
-class mail_message_report(osv.osv):
-     #CSV:: access_res_log_report all,res.log.report,model_res_log_report,,1,0,0,0
-    """ Log Report """
-    _name = "mail.message.report"
-    _auto = False
-    _description = "Mail Message Report"
-    _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
-        'month':fields.selection([('01', 'January'), ('02', 'February'), \
-                                  ('03', 'March'), ('04', 'April'),\
-                                  ('05', 'May'), ('06', 'June'), \
-                                  ('07', 'July'), ('08', 'August'),\
-                                  ('09', 'September'), ('10', 'October'),\
-                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'creation_date': fields.date('Creation Date', readonly=True),
-        'res_model': fields.char('Object', size=128),
-        'nbr': fields.integer('# of Entries', readonly=True)
-     }
-
-    def init(self, cr):
-        """
-            Log Report
-            @param cr: the current row, from the database cursor
-        """
-        tools.drop_view_if_exists(cr,'mail_message_report')
-        cr.execute("""
-            CREATE OR REPLACE VIEW mail_message_report AS (
-                SELECT
-                    l.id as id,
-                    1 as nbr,
-                    to_char(l.create_date, 'YYYY') as name,
-                    to_char(l.create_date, 'MM') as month,
-                    to_char(l.create_date, 'YYYY-MM-DD') as day,
-                    to_char(l.create_date, 'YYYY-MM-DD') as creation_date,
-                    l.model as res_model,
-                    date_trunc('day',l.create_date) as create_date
-                FROM
-                    mail_message l
-            )""")
-
diff --git a/addons/mail/report/mail_message_report_view.xml b/addons/mail/report/mail_message_report_view.xml
deleted file mode 100644
index ecb26b78d1d..00000000000
--- a/addons/mail/report/mail_message_report_view.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Latest Activities -->
-        <record model="ir.actions.act_window" id="action_latest_activities_tree">
-            <field name="name">Latest Activities</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!-- Mail message report search view  -->
-        <record id="view_mail_message_report_filter" model="ir.ui.view">
-            <field name="name">mail.message.report.select</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Mail message Analysis">
-                    <group>
-                    <filter icon="terp-go-year" string="  Year  "
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Messages created in current year"/>
-                    <filter icon="terp-go-month" string="   Month   "
-                        name="month"
-                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Messages created in current month"/>
-                    <filter icon="terp-go-month"
-                         string="    Month-1    "
-                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Messages created in last month"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="Model" icon="terp-go-home" context="{'group_by':'res_model'}" />
-                            <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
-                  </group>
-               </search>
-            </field>
-        </record>
-
-        <!-- Mail message report Tree view  -->
-        <record id="view_mail_message_report_tree" model="ir.ui.view">
-            <field name="name">mail.message.report.tree</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-            <tree string="Mail message Analysis">
-                <field name="name" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="res_model" invisible="1"/>
-                <field name="nbr" />
-                <field name="creation_date" invisible="1"/>
-             </tree>
-            </field>
-       </record>
-
-        <!-- Monthly Activity per Document -->
-        <record id="board_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Monthly Activity per Document" type="bar">
-                	<field name="res_model"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_monthly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Monthly Activity per Document</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['res_model'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_mail_message_report_graph"></field>
-        </record>
-
-        <!-- Weekly Global Activity -->
-        <record id="board_weekly_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.weekly.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Weekly Global Activity" type="bar">
-                	<field name="day"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_weekly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Weekly Global Activity</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['day'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_weekly_mail_message_report_graph"></field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 3cfd4e88f3d..011e8b27dc5 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -5,4 +5,3 @@ access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
 access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
 access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
-access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index f8975d67b78..2421b28fbcb 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -9,45 +9,49 @@
     background: white;
 }
 
-.openerp div.oe_mail_wall_act {
+.openerp div.oe_mail_wall_action {
     padding: 8px;
     background: #eee;
     border: 1px solid #ccc;
 }
 
-.openerp div.oe_mail_wall_act:after {
+.openerp div.oe_mail_wall_action:after {
     content: "";
     display: block;
     clear: both; 
 }
 
+.openerp .oe_mail_wall_action textarea {
+    width: 474px;
+    height: 60px;
+    padding: 4px;
+    margin-bottom: 8px;
+    float: right;
+}
+
 /* 2 columns view */
-.openerp div.oe_mail_wall_left {
+.openerp div.oe_mail_wall_main {
     float: left;
     width: 560px;
     margin: 8px;
 }
 
-.openerp div.oe_mail_wall_right {
+.openerp div.oe_mail_wall_aside {
     margin-left: 565px;
     margin: 8px;
 }
 
-.openerp div.oe_mail_wall_threads {
+/* Threads */
+.openerp .oe_mail_wall_threads {
     margin-top: 8px;
 }
-
-.openerp textarea.oe_mail_wall_action_textarea {
-    width: 474px;
-    height: 60px;
+.openerp .oe_mail_wall_threads textarea {
+    height: 40px;
     padding: 4px;
-    margin-bottom: 8px;
-    float: right;
 }
 
-.openerp div.oe_mail_wall_threads textarea {
-    height: 40px;
-    padding: 4px;
+.openerp .oe_mail_wall_thread:first .oe_mail_msg_notification {
+    border-top: 0;
 }
 
 .openerp div.oe_mail_thread_subthread img {
@@ -56,13 +60,10 @@
 }
 
 .openerp div.oe_mail_msg_content {
+    position: relative;
     width: 486px;
 }
 
-.openerp div.oe_mail_msg_content p {
-    margin: 4px 0;
-}
-
 .openerp div.oe_mail_msg_content li{
     float: left;
     margin-right: 3px;
@@ -152,14 +153,14 @@
 /* ThreadDisplay                  */
 /* ------------------------------ */
 
-.openerp div.oe_mail_thread_act {
+.openerp div.oe_mail_thread_action {
     white-space: normal;
     padding: 8px;
     background: #eee;
-    border-top: 1px solid #ccc
+    border-top: 1px solid #ccc;
 }
 
-.openerp div.oe_mail_thread_act:after {
+.openerp div.oe_mail_thread_action:after {
     content: "";
     display: block;
     clear: both; 
@@ -173,7 +174,7 @@
     margin-left: 66px;
 }
 
-.openerp div.oe_mail_thread_subthread li.oe_mail_thread_msg:last-child {
+.openerp div.oe_mail_thread_subthread .oe_mail_thread_msg:last-child {
     margin-bottom: 8px;
 }
 
@@ -182,25 +183,24 @@
     border-bottom: 1px solid #D2D9E7;
 }
 
-.openerp li.oe_mail_thread_msg:after {
+.openerp .oe_mail_thread_msg:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-.openerp li.oe_mail_thread_msg > div:after {
+.openerp .oe_mail_thread_msg > div:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-.openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
+.openerp .oe_mail_msg_notification, 
+.openerp .oe_mail_msg_comment, 
+.openerp .oe_mail_msg_email {
     padding: 8px;
-}
-
-.openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email, .openerp .oe_mail_msg_notification {
     background: white;
-    border-top: 1px solid #ccc
+    border-top: 1px solid #ccc;
 }
 
 .openerp .oe_email_icon {
@@ -212,7 +212,9 @@
     background: #eee;
 }
 
-.openerp .oe_mail_msg_notification:after, .openerp .oe_mail_msg_comment:after, .openerp .oe_mail_msg_email:after {
+.openerp .oe_mail_msg_notification:after, 
+.openerp .oe_mail_msg_comment:after, 
+.openerp .oe_mail_msg_email:after {
     content: "";
     display: block;
     clear: both; 
@@ -249,15 +251,6 @@
 /* Styling (should be openerp)    */
 /* ------------------------------ */
 
-.openerp ul.oe_mail {
-    padding: 0;
-    margin: 0;
-}
-
-.openerp li.oe_mail {
-    list-style-type: none;
-}
-
 .openerp input.oe_mail, textarea.oe_mail {
     width: 432px;
     padding: 4px;
@@ -284,20 +277,118 @@
     -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
-.openerp p.oe_mail_msg {
+.openerp div.oe_mail_msg {
     padding: 0;
     margin: 0 0 4px 0;
 }
 
-.openerp a.oe_mail_oe_intlink {
-    color: #8786b7;
+.openerp .oe_mail_oe_bold {
+    font-weight: bold;
 }
 
-.openerp .oe_mail_oe_bold {
+/* ------------------------------ */
+/* Messages layout                */
+/* ------------------------------ */
+
+.openerp .oe_mail_msg .oe_mail_msg_title {
+    margin: 0;
+    font-size: 1.3em;
     font-weight: bold;
 }
+.openerp .oe_mail_msg .oe_mail_msg_title a:link,
+.openerp .oe_mail_msg .oe_mail_msg_title a:visited {
+    color: #4C4C4C;
+    text-decoration: none;
+}
+
+.openerp .oe_mail_msg_subtitle {
+    margin: 0 0 .5em 0;
+}
+.openerp .oe_mail_msg_footer,
+.openerp .oe_mail_msg_subtitle {
+    color: #888;
+}
+
+.openerp .oe_mail_msg_body {
+    margin-bottom: .5em;
+    text-align: justify;
+}
+
+.openerp .oe_mail_msg_tail {
+    display: none;
+}
+
+/* Read more/less link */
+.openerp .oe_mail_msg_content .expand,
+.openerp .oe_mail_msg_content .reduce {
+    font-weight: bold;
+}
+
+/* Dropdown menu */
+.openerp .oe_mail_msg_content .oe_dropdown_toggle {
+    position: absolute;
+    top: 0px;
+    right: 3px;
+}
+.openerp .oe_mail_msg_content .oe_dropdown_arrow:after {
+    border-top: 4px solid transparent;
+}
+.openerp .oe_mail_msg_content:hover .oe_dropdown_arrow:after {
+    border-top: 4px solid #404040;
+}
+
+.openerp .oe_mail_msg_footer li:after {
+    content: " · ";
+}
+
+.openerp .oe_mail_msg_footer li:last-child:after {
+    content: "";
+}
+
+/* Attachments list */
+.openerp ul.oe_mail_msg_attachments {
+    display: none;
+    width: 100%;
+    border-top: 1px solid #CCC;
+    margin: .5em 0 0 0;
+    padding: .5em 0;
+    list-style-position: inside;
+}
+.openerp ul.oe_mail_msg_attachments li {
+    float: none;
+    margin: 0;
+    padding: 0;
+    list-style-type: square;
+}
+
+
+/* ------------------------------ */
+/* Group Form                     */
+/* ------------------------------ */
+
+div.oe_mail_group_advanced_details {
+  display: none;
+}
+
+.oe_form_sheetbg.openerp_mail_group_sheet {
+  min-height: 0px;
+  max-height: none;
+}
+
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_sheet {
+  min-height: 0px;
+  max-height: none;
+  padding: 0px 18px;
+  max-width: 80%;
+}
+
+/* Resize group logo */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_image > img {
+  max-width: 100px;
+  max-height: 100px;
+}
 
-/*.openerp .oe_mail_oe_space:after {*/
-    /*content: " · ";*/
-    /*margin-right: 2px;*/
-/*}*/
+/* Resize group description */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea {
+  height: 40px;
+} 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 905e95f3aef..5633a4bdae0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1,25 +1,25 @@
 openerp.mail = function(session) {
     var _t = session.web._t,
        _lt = session.web._lt;
-    
+
     var mail = session.mail = {};
 
     /**
-    * Add records to sorted_comments array
-    * @param {Array} records records from mail.message sorted by date desc
-    * @returns {Object} cs comments_structure: dict
-    *                      cs.model_to_root_ids = {model: [root_ids], }
-    *                      cs.new_root_ids = [new_root_ids]
-    *                      cs.root_ids = [root_ids]
-    *                      cs.msgs = {record.id: record,}
-    *                      cs.tree_struct = {record.id: {
-    *                          'level': record_level in hierarchy, 0 is root,
-    *                          'msg_nbr': number of childs,
-    *                          'direct_childs': [msg_ids],
-    *                          'all_childs': [msg_ids],
-    *                          'for_thread_msgs': [records],
-    *                          'ancestors': [msg_ids], } }
-    */
+     * Add records to sorted_comments array
+     * @param {Array} records records from mail.message sorted by date desc
+     * @returns {Object} cs comments_structure: dict
+     *                      cs.model_to_root_ids = {model: [root_ids], }
+     *                      cs.new_root_ids = [new_root_ids]
+     *                      cs.root_ids = [root_ids]
+     *                      cs.msgs = {record.id: record,}
+     *                      cs.tree_struct = {record.id: {
+     *                          'level': record_level in hierarchy, 0 is root,
+     *                          'msg_nbr': number of childs,
+     *                          'direct_childs': [msg_ids],
+     *                          'all_childs': [msg_ids],
+     *                          'for_thread_msgs': [records],
+     *                          'ancestors': [msg_ids], } }
+     */
     function tools_sort_comments(cs, records, parent_id) {
         var cur_iter = 0; var max_iter = 10; var modif = true;
         while ( modif && (cur_iter++) < max_iter) {
@@ -57,10 +57,6 @@ openerp.mail = function(session) {
         return cs;
     }
 
-    /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
-//    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
-
     /** 
      * ThreadDisplay widget: this widget handles the display of a thread of
      * messages. The [thread_level] parameter sets the thread level number:
@@ -72,7 +68,7 @@ openerp.mail = function(session) {
      * either it will fetch [limit] messages related to [res_model]:[res_id].
      */
     mail.Thread = session.web.Widget.extend({
-        template: 'Thread',
+        template: 'mail.Thread',
 
         /**
          * @param {Object} parent parent
@@ -117,15 +113,24 @@ openerp.mail = function(session) {
         },
         
         start: function() {
+            var self = this;
+            
             this._super.apply(this, arguments);
             // customize display
-            if (! this.display.show_post_comment) this.$element.find('div.oe_mail_thread_act').hide();
+            if (! this.display.show_post_comment) {
+                this.$element.find('div.oe_mail_thread_action').hide();
+            }
             // add events
             this.add_events();
-            /* display user, fetch comments */
+            
+            // display user, fetch comments
             this.display_current_user();
-            if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
-            else var display_done = this.init_comments();
+            
+            if (this.params.records) {
+                var display_done = this.display_comments_from_parameters(this.params.records);
+            } else {
+                var display_done = this.init_comments();
+            }
             return display_done
         },
         
@@ -143,7 +148,7 @@ openerp.mail = function(session) {
             });
             // event: click on 'reply' in msg
             this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
-                var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_act:first');
+                var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_action:first');
                 act_dom.toggle();
                 event.preventDefault();
             });
@@ -154,9 +159,9 @@ openerp.mail = function(session) {
                 var msg_id = event.srcElement.dataset.id;
                 if (! msg_id) return false;
                 var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+                $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
                 return false;
             });
@@ -168,14 +173,14 @@ openerp.mail = function(session) {
                 if (! msg_id) return false;
                 //console.log(msg_id);
                 var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
+                $(event.srcElement).parents('.oe_mail_thread_msg').eq(0).hide();
                 if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('ul.oe_mail_thread').eq(0).hide();
+                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
                 }
                 return false;
             });
             // event: click on an internal link
-            this.$element.find('div.oe_mail_thread_display').delegate('a.intlink', 'click', function (event) {
+            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_internal_link', 'click', function (event) {
                 // lazy implementation: fetch data and try to redirect
                 if (! event.srcElement.dataset.resModel) return false;
                 else var res_model = event.srcElement.dataset.resModel;
@@ -193,6 +198,18 @@ openerp.mail = function(session) {
                 }
                 else self.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(res_id), views: [[false, 'form']]});
             });
+            // event: click on 'attachment(s)' in msg
+            this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
+                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
+                act_dom.toggle();
+                return false;
+            });
+            // see more
+            this.$element.on('click','a.oe_mail_msg_more', function (event) {
+                $(this).siblings('.oe_mail_msg_tail').show();
+                $(this).hide();
+                return false;
+            });
         },
         
         destroy: function () {
@@ -215,10 +232,12 @@ openerp.mail = function(session) {
             $.when(defer).then(function (records) {
                 if (records.length <= self.params.limit) self.display.show_more = false;
                 else { self.display.show_more = true; records.pop(); }
+                
                 self.display_comments(records);
                 if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
                 else  self.$element.find('div.oe_mail_thread_more:last').hide();
-                });
+            });
+            
             return defer;
         },
 
@@ -233,13 +252,18 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
-            this.cs = this.sort_comments_tmp(records);
-            
-            /* WIP: map matched regexp -> records to browse with name */
-            //_(records).each(function (record) {
-                //self.do_check_internal_links(record.body_text);
-            //});
             
+            //build attachments download urls and compute time-relative from dates
+            for (var k in records) {
+                records[k].timerelative = $.timeago(records[k].date);
+                if (records[k].attachments) {
+                    for (var l in records[k].attachments) {
+                        var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
+                        records[k].attachments[l].url = url;
+                    }
+                }
+            }
+            this.cs = this.sort_comments_tmp(records);
             _(records).each(function (record) {
                 var sub_msgs = [];
                 if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
@@ -253,7 +277,7 @@ openerp.mail = function(session) {
                     self.display_comment(record);
                     self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
                                                             'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id});
-                    self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
+                    self.$element.find('.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
                 }
                 else if (self.params.thread_level == 0) {
@@ -268,26 +292,27 @@ openerp.mail = function(session) {
          * Display a record
          */
         display_comment: function (record) {
-            if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); }
-            else { record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]); }    
+            record.body = this.do_text_nl2br(record.body, true);
+            if (record.type == 'email') {
+                record.mini_url = ('/mail/static/src/img/email_icon.png');
+            } else { 
+                record.mini_url = this.thread_get_avatar('res.users', 'avatar', record.user_id[0]);
+            }
             // body text manipulation
             record.body = this.do_clean_text(record.body);
-            record.tr_body = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body = this.do_replace_internal_links(record.body);
-            if (record.tr_body) record.tr_body = this.do_replace_internal_links(record.tr_body);
+
+            // split for see more
+            var split = this.do_truncate_string(record.body, this.params.msg_more_limit);
+            record.body_head = split[0];
+            record.body_tail = split[1];
+
             // format date according to the user timezone
             record.date = session.web.format_value(record.date, {type:"datetime"});
-            // render
-            $(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
-                    ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
-            // truncated: hide full-text, show summary, add buttons
-            if (record.tr_body) {
-                var node_body = this.$element.find('span.oe_mail_msg_body:last').append(' <a href="#" class="reduce">[ ... Show less]</a>');
-                var node_body_short = this.$element.find('span.oe_mail_msg_body_short:last').append(' <a href="#" class="expand">[ ... Show more]</a>');
-                node_body.hide();
-                node_body.find('a:last').click(function() { node_body.hide(); node_body_short.show(); return false; });
-                node_body_short.find('a:last').click(function() { node_body_short.hide(); node_body.show(); return false; });
-            }
+
+
+            var rendered = session.web.qweb.render('mail.Thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
+            $( rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
         },
        
         /**
@@ -403,7 +428,7 @@ openerp.mail = function(session) {
             var regex_res = regex_login.exec(string);
             while (regex_res != null) {
                 var login = regex_res[2];
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="intlink oe_mail_oe_intlink" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
+                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
                 regex_res = regex_login.exec(string);
             }
             /* special shortcut: :name, try to find an icon if in list */
@@ -422,16 +447,32 @@ openerp.mail = function(session) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
         
+        /**
+         * @param {String} string to truncate
+         * @param {Number} max number of chars to display 
+         * @returns {String} truncated string
+         */
         do_truncate_string: function(string, max_length) {
-            if (string.length <= (max_length * 1.2)) return false;
-            else return string.slice(0, max_length);
+            // multiply by 1.2: prevent truncating an just too little long string
+            if (string.length <= (max_length * 1.2)) {
+                return [string, ""];
+            } else {
+                return [string.slice(0, max_length), string.slice(max_length)];
+            }
         },
         
+        /** Removes html tags, except b, em, br */
         do_clean_text: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em)\\s*&gt;', 'gi'), '<$1$2>');
+            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /)\\s*&gt;', 'gi'), '<$1$2>');
             return html;
         },
         
+        /** Replaces line bracks by html line breaks (br) */
+        do_text_nl2br: function (str, is_xhtml) {   
+            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
+            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
+        },
+        
         /**
          *
          * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
@@ -465,16 +506,11 @@ openerp.mail = function(session) {
         },
 
     });
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
 
-
-    /* Add ThreadView widget to registry */
-    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
-//    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
-
-    /* ThreadView widget: thread of comments */
+    /** ThreadView widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
-        // QWeb template to use when rendering the object
-        template: 'RecordThread',
+        template: 'mail.RecordThread',
 
        init: function() {
             this._super.apply(this, arguments);
@@ -516,7 +552,7 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id) { this.$element.find('ul.oe_mail_thread').hide(); return; }
+            if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget
@@ -541,7 +577,7 @@ openerp.mail = function(session) {
                 if (record.id == self.session.uid) { self.is_subscriber = true; }
                 var mini_url = self.thread_get_avatar('res.users', 'avatar', record.id);
                 $('<li><img class="oe_mail_oe_left oe_mail_msg_image" src="' + mini_url + '"/>' +
-                  '<a href="#" class="intlink oe_mail_oe_intlink" data-res-model="res.users" data-res-id="' + record.id + '">' + record.name + '</a></li>').appendTo(user_list);
+                  '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-id="' + record.id + '">' + record.name + '</a></li>').appendTo(user_list);
             });
             if (self.is_subscriber) {
                 self.$element.find('button.oe_mail_button_follow').hide();
@@ -573,14 +609,11 @@ openerp.mail = function(session) {
             return this.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
     });
-    
-    
-    /* Add WallView widget to registry */
-    session.web.client_actions.add('mail.all_feeds', 'session.mail.WallView');
-    
-    /* WallView widget: a wall of messages */
+    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+
+    /** WallView widget: a wall of messages */
     mail.WallView = session.web.Widget.extend({
-        template: 'Wall',
+        template: 'mail.Wall',
 
         /**
          * @param {Object} parent parent
@@ -630,7 +663,7 @@ openerp.mail = function(session) {
         add_event_handlers: function () {
             var self = this;
             // post a comment
-            this.$element.find('button.oe_mail_wall_button_comment').click(function () { return self.do_comment(); });
+            this.$element.find('.oe_mail_wall_action button').click(function () { return self.do_comment(); });
             // display more threads
             this.$element.find('button.oe_mail_wall_button_more').click(function () { return self.do_more(); });
         },
@@ -684,7 +717,7 @@ openerp.mail = function(session) {
             this.search['context'] = _.extend(this.params.context, this.search_results.context);
             this.display_show_more = true;
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.$element.find('div.oe_mail_wall_threads').empty();
+            this.$element.find('ul.oe_mail_wall_threads').empty();
             return this.fetch_comments(this.params.limit, 0);
         },
 
@@ -716,14 +749,14 @@ openerp.mail = function(session) {
                 var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
                 var model_name = self.comments_structure.msgs[root_id]['model'];
                 var res_id = self.comments_structure.msgs[root_id]['res_id'];
-                var render_res = session.web.qweb.render('WallThreadContainer', {});
-                $('<div class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
+                var render_res = session.web.qweb.render('mail.WallThreadContainer', {});
+                $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
                 var thread = new mail.Thread(self, {
                     'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
                     'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true}
                     );
                 self.thread_list.push(thread);
-                return thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last'));
+                return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
             });
             // update TODO
             this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
@@ -770,12 +803,14 @@ openerp.mail = function(session) {
         
         /** Action: Posts a comment */
         do_comment: function () {
-            var comment_node = this.$element.find('textarea.oe_mail_wall_action_textarea');
+            var comment_node = this.$element.find('.oe_mail_wall_action textarea');
             var body_text = comment_node.val();
             comment_node.val('');
             var call_done = this.ds_users.call('message_append_note', [[this.session.uid], 'Tweet', body_text, false, 'comment', 'html']).then(this.proxy('init_and_fetch_comments'));
         },
     });
+    session.web.client_actions.add('mail.all_feeds', 'session.mail.WallView');
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a34e362960b..5ff8a996116 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="Wall" class="oe_mail_wall">
+    <div t-name="mail.Wall" class="oe_mail_wall">
         <table class="oe_view_manager_header">
             <tr class="oe_header_row">
                 <td><h2 class="oe_view_title">All Feeds</h2></td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
         </table>
-        <div class="oe_mail_wall_left">
-            <div class="oe_mail_wall_act">
+        <div class="oe_mail_wall_main">
+            <div class="oe_mail_wall_action">
                 <img class="oe_mail_msg_image oe_left" alt="User img"/>
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
-            <div class="oe_mail_wall_threads">
-            </div>
+            <ul class="oe_mail_wall_threads">
+            </ul>
             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
             </div>
         </div>
-        <div class="oe_mail_wall_right"></div>
+        <div class="oe_mail_wall_aside"></div>
     </div>
 
-    <t t-name="WallThreadContainer">
+    <t t-name="mail.WallThreadContainer">
     </t>
 
-    <div t-name="RecordThread" class="oe_mail_recthread">
-        <h4>History and Comments</h4>
-        <div class="oe_mail_recthread_left">
-        </div>
+    <div t-name="mail.RecordThread" class="oe_mail_recthread">
+        <div class="oe_mail_recthread_left"></div>
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
@@ -44,8 +42,8 @@
         </div>
     </div>
 
-    <ul t-name="Thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act">
+    <div t-name="mail.Thread" class="oe_mail oe_mail_thread">
+        <div class="oe_mail_thread_action">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
@@ -55,78 +53,61 @@
         <div class="oe_mail_thread_more">
             <button class="oe_mail_button_more" type="button">Load more messages</button>
         </div>
-    </ul>
+    </div>
 
-    <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
+    <!-- default layout -->
+    <div t-name="mail.Thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
-            <img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_email_icon oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
-                <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
-                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
+                <span class="oe_dropdown_toggle oe_dropdown_arrow">
+                    <ul class="oe_dropdown_menu">
+                        <t t-if="thread._is_author(record.user_id[0]) &amp;&amp; display['show_delete']">
+                            <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a></li>
+                        </t>
+                        <t t-if="!thread._is_author(record.user_id[0]) &amp;&amp; display['show_hide']">
+                            <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a></li>
+                        </t>
+                        <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
+                    </ul>
+                </span>
+                <div class="oe_mail_msg">
+                    <h1 t-if="record.subject &amp;&amp; record.subject != 'Reply'" class="oe_mail_msg_title">
+                        <t t-raw="record.subject"/>
+                    </h1>
+                    <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
+                        <a href="#" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}' class="oe_mail_internal_link"><t t-raw="record.record_name"/></a>
+                    </div>
+                    <div class="oe_mail_msg_body">
+                        <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}' class="oe_mail_internal_link"><t t-raw="record.user_id[1]"/></a>
+                        <t t-raw="record.body_head"/>
+                        <t t-if="record.body_tail"><a href="#" class="oe_mail_msg_more">... See more</a>
+                            <span class="oe_mail_msg_tail"><t t-raw="record.body_tail"/></span>
+                        </t>
+                    </div>
+                    <ul class="oe_mail_msg_footer">
+                      <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                      <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
+                      <!-- uncomment when merging vote
+                      <li><a href="#">Like</a></li>
+                      -->
+                      <li t-if="record.attachment_ids.length > 0">
+                          <a href="#" class="oe_mail_msg_view_attachments">
+                              <t t-if="record.attachment_ids.length == 1">Attachment</t>
+                              <t t-if="record.attachment_ids.length > 1">Attachments (<t t-raw="record.attachment_ids.length"/>)</t>
+                          </a>
+                      </li>
+                    </ul>
+                    <t t-if="record.attachment_ids.length > 0">
+                        <div class="oe_clear"></div>
+                        <ul class="oe_mail_msg_attachments">
+                            <t t-foreach="record.attachments" t-as="attachment">
+                                <li> <a t-att-href="attachment.url"><t t-raw="attachment.name"/></a> </li>
+                            </t>
+                        </ul>
+                    </t>
+                </div>
             </div>
-            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
         </div>
-    </li>
-    
-    <t t-name="NoteDisplay">
-        <p class="oe_mail_msg">
-            <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
-            </t>
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t><br/>
-            <ul>
-              <t t-if="display['show_reply']">
-                <li><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-              </t>
-              <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-                </t>
-              </t>
-              <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))">
-                  <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-                </t>
-              </t>
-              <li>
-                <span class="oe_fade"><t t-raw="record.date"/>
-                  by <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
-                </span>
-              </li>
-            </ul>
-        </p>
-    </t>
-    
-    <t t-name="EmailDisplay">
-        <p class="oe_mail_msg oe_mail_msg_p_email_header">
-            <t t-if="params.thread_level > 0">
-                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
-            </t>
-        </p>
-        <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
-        <p><span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/></p>
-        <p class="oe_mail_msg">
-            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
-            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
-        </p>
-
-        <ul>
-          <t t-if="display['show_delete']">
-            <t t-if="thread._is_author(record.user_id[0])">
-              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-            </t>
-          </t>
-          <t t-if="display['show_hide']">
-            <t t-if="!(thread._is_author(record.user_id[0]))">
-              <li><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a><span class="oe_mail_oe_space oe_fade"> · </span></li>
-            </t>
-          </t>
-          <li>
-            <span class="oe_fade"><t t-raw="record.date"/></span>
-          </li>
-        </ul>
-    </t>
-
+    </div>
 </template>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 32f8e5b3a72..aa8ea08217e 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -81,31 +81,31 @@
         </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-document-new" string="Draft" name = "draft" domain="[('state','=','draft')]"/>
-               <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name = "test" domain="[('mode','=','test')]"/>
-               <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="object_id" string="Resource"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-               </group>
-           </search>
-       </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">
+                <field name="name" string="Campaign"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-check" string="Running" domain="[('state','=','running')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Test Mode" name="test" domain="[('mode','=','test')]"/>
+                <filter icon="terp-gtk-jump-to-rtl" string="Manual Mode" domain="[('mode','=','manual')]"/>
+                <separator orientation="vertical"/>
+                <field name="object_id" string="Resource"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Resource" name="Object" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Mode" name="Mode" icon="terp-gtk-jump-to-rtl" context="{'group_by':'mode'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_form">
         <field name="name">Campaigns</field>
@@ -185,34 +185,35 @@
         </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-check" string="Running" name="running" domain="[('state','=','running')]"/>
-               <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
-               <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
-               <separator orientation="vertical"/>
-               <field name="name"/>
-               <field name="campaign_id"/>
-               <field name="object_id"/>
-               <field name="date_run"/>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}" />
-               </group>
-           </search>
-       </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">
+                <field name="name" string="Segment"/>
+                <separator orientation="vertical"/>
+                <field name="date_run"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
+                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+                <filter icon="terp-gtk-jump-to-ltr" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+                <filter icon="terp-stock_effects-object-colorize" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+                <filter icon="terp-emblem-documents" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
+                <separator orientation="vertical"/>
+                <field name="campaign_id"/>
+                <field name="object_id"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_segment_form">
         <field name="name">Segments</field>
@@ -382,43 +383,42 @@
         </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="Marketing Campaign Activities">
-               <group>
-                <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
-                <separator orientation="vertical"/>
-                <field name="campaign_id"/>
-                <field name="segment_id"/>
-                <field name="date"/>
+    <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="Marketing Campaign Activities">
+                <group>
+                    <field name="res_name" string="Marketing Campaign Activity"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                    <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="campaign_id"/>
+                    <field name="segment_id"/>
+                    <field name="object_id"/>
+                    <field name="partner_id"/>
+                    <field name="res_id"/>
+                </group>
                 <newline/>
-                <field name="object_id"/>
-                <field name="res_name"/>
-                <field name="res_id"/>
-                <field name="partner_id"/>
-               </group>
-               <newline/>
-               <group expand="0" string="Group By...">
-                   <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                   <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                   <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
-                   <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
-                   <separator orientation="vertical"/>
-                   <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}" />
-               </group>
-           </search>
-       </field>
-   </record>
+                <group expand="0" string="Group By...">
+                    <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}"/>
+                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}"/>
+                    <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" name="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Execution Date" name="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
         <field name="name">Campaign Followup</field>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 19d1c78f896..7b3d848cc8b 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -31,21 +31,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
-                   <group>
-                    <filter icon="terp-go-year" name="year"
-                            string="Year"
-                            domain="[('year','=',time.strftime('%%Y'))]"/>
-                    <separator orientation="vertical"/>
-
-                    <filter icon="terp-go-month"
-                            string="Month" name="This Month"
-                            domain="[('month','=',time.strftime('%%m'))]"/>
-                    <filter icon="terp-go-month" string="    Month-1    "
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-
-                    <filter icon="terp-go-today"
-                            string="Today"
-                            domain="[('date','=',time.strftime('%%Y/%%m/%%d'))]"/>
+                <group>
+                    <field name="date"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-gtk-go-back-rtl"
                             string="To Do"
@@ -66,8 +53,8 @@
                 <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Campaign" name="Campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
-                    <filter string="Segment" name ="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
-                    <filter string="Activity" name ="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
+                    <filter string="Segment" name="Segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}"/>
+                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}"/>
                     <filter string="Resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 83607c1ecd5..15645294bb7 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -14,17 +14,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership Products">
-                   <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
-                   <separator orientation="vertical"/>
-                   <field name="code"/>
-                   <field name="name"/>
-                   <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
-                   <group  expand='0' string='Group by...'>
-                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
-                       <separator orientation="vertical"/>
-                       <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
-                   </group>
+                    <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="categ_id" widget="selection" operator="child_of"/>
+                    <newline/>
+                    <group  expand='0' string='Group by...'>
+                        <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -167,26 +167,24 @@
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Membership Partners">
-		          	<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-		            <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-	          		<separator orientation="vertical"/>
-		          	<filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-		          	<filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-	          		<separator orientation="vertical"/>
-	                <field name="membership_stop" string="End Membership Date"/>
-	                <field name="membership_start" invisible="1"/>
-	                <newline/>
-	                <group expand="0" string="Group By..." colspan="10" col="8">
-	                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-	              	    <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-	              		<separator orientation="vertical"/>
-	                	<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-	                	<separator orientation="vertical"/>
-	                	<filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-	              		<filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-	            	</group>
-	           </search>
+                <search string="Membership Partners">
+                    <field name="membership_start" invisible="1"/>
+                    <field name="membership_stop" string="End Membership Date"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                    <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                    <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+                    <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+                    <group expand="0" string="Group By..." colspan="10" col="8">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
+                        <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 6b3f6a9eb71..51e1f2499b7 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -36,20 +36,11 @@
             <field name="arch" type="xml">
                 <search string="Membership">
                     <group>
-                        <filter string="Year" icon="terp-go-year" name="year"
-                            domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Events created in current year"/>
-                        <separator orientation="vertical"/>
-                        <filter string="   Month   " icon="terp-go-month" name="this_month"
-                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in current month"/>
-                        <filter icon="terp-go-month" string="    Month-1    "
-                        domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Events created in last month"/>
+                        <field name="date_from"/>
                         <separator orientation="vertical"/>
                         <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                        <separator orientation="vertical"/>
                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
+                        <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <field name="membership_id"/>
                         <field name="user_id"/>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 9dd5d1afb0e..0ac0c02540f 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -21,19 +21,18 @@
         </record>
 
         <record id="open_board_manufacturing" model="ir.actions.act_window">
-            <field name="name">Production Dashboard</field>
+            <field name="name">Manufacturing</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_mrp_manager_form"/>
         </record>
 
-        <menuitem id="menus_dash_mrp" name="Manufacturing"
-            parent="base.menu_reporting_dashboard" sequence="15"/>
-        <menuitem
-            action="open_board_manufacturing" icon="terp-graph"
-            id="menu_board_manufacturing" parent="menus_dash_mrp"
-            sequence="1"/>
+        <menuitem action="open_board_manufacturing"
+                  icon="terp-graph"
+                  id="menu_board_manufacturing"
+                  parent="base.menu_reporting_dashboard"
+                  sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8559a679beb..9b1079dc34e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -82,9 +82,10 @@
             <field name="arch" type="xml">
                 <search string="Search">
                    <group>
-                       <field name="name"/>
-                       <field name="composition"/>
+                       <field name="name" string="Name"/>
+                       <separator orientation="vertical"/>
                        <field name="group_id"  widget="selection" />
+                       <field name="composition"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -188,10 +189,10 @@
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
                    <group>
+                        <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                         <separator orientation="vertical"/>
-                        <field name="code"/>
-                        <field name="name"/>
                         <field name="resource_type"/>
                    </group>
                    <newline/>
@@ -199,7 +200,7 @@
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    </group>
+                   </group>
                </search>
             </field>
         </record>
@@ -287,13 +288,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Routing">
+                    <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                     <separator orientation="vertical"/>
-                    <field name="code"/>
-                    <field name="name"/>
                     <field name="location_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Production Location" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
@@ -392,8 +392,8 @@
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <group>
-                         <field name="name"/>
-                         <field name="code" string="Reference"/>
+                         <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
+                         <separator orientation="vertical"/>
                          <field name="product_id"/>
                          <field name="company_id" groups="base.group_multi_company"/>
                     </group>
@@ -779,6 +779,8 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group>
+                       <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
                            domain="[('state','=','confirmed')]"
                            help="Manufacturing Orders which are waiting for raw materials."/>
@@ -788,15 +790,12 @@
                        <filter icon="terp-check" string="In Production" name="inprogress"
                            domain="[('state','=','in_production')]"
                            help="Manufacturing Orders which are currently in production."/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                            help="Production started late" />
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                       <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index fa68d1bdcff..eef6c89f702 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -36,7 +36,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Work Center load">
-                    <field name="name"/>
+                    <field name="name" string="Week"/>
+                    <separator orientation="vertical"/>
                     <field name="workcenter_id" widget="selection"/>
                 </search>
             </field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b25041bef98..5259d060414 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -123,25 +123,26 @@
             <field name="model">mrp.production.workcenter.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            <search string="Search Work Orders">
-                        <group>
-                           <filter icon="terp-document-new" string="Draft"
-                               domain="[('state','=','draft')]"/>
-                           <filter icon="terp-check" string="In Progress" name="Current"
-                               domain="[('state','=','startworking')]"/>
-                           <filter icon="terp-gtk-media-pause" string="Pending"
-                               domain="[('state','=','pause')]"/>
-                           <separator orientation="vertical"/>
-                           <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
-                               domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
-                               help="Production started late" />
-                           <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="workcenter_id" widget="selection"/>
-                            <field name="production_id" />
-                            <field name="state" />
-                            <field name="date_planned"/>
-                        </group>
+                <search string="Search Work Orders">
+                    <group>
+                        <field name="name" string="Work Orders"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_planned"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-document-new" string="Draft"
+                            domain="[('state','=','draft')]"/>
+                        <filter icon="terp-check" string="In Progress" name="Current"
+                            domain="[('state','=','startworking')]"/>
+                        <filter icon="terp-gtk-media-pause" string="Pending"
+                            domain="[('state','=','pause')]"/>
+                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
+                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
+                            help="Production started late"/>
+                        <separator orientation="vertical"/>
+                        <field name="workcenter_id" widget="selection"/>
+                        <field name="production_id"/>
+                        <field name="state"/>
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Work Center" icon="terp-go-home" domain="[]" context="{'group_by':'workcenter_id'}"/>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index 9b1b022e668..543024b6354 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -47,24 +47,12 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('year','=',time.strftime('%%Y'))]"
-                                help="Work orders made during current year"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('month','=',time.strftime('%%m'))]"
-                                help="Work orders made during current month"/>
-                        <filter icon="terp-go-week"
-                                string="Month -1"
-                                domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
-                                help="Work orders during last month"/>
-                      <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','not in',('draft','cancel','done'))]"/>
                         <filter icon="terp-check" string="Started" domain="[('state','=','startworking')]"/>
                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
-                      <separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <field name="product_id" />
                         <field name="workcenter_id"/>
                    </group>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 93ad144e16e..10c19eb1585 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -191,16 +191,16 @@
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <group>
+                       <field name="name" string="Reair Orders"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
                        <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
                        <filter icon="terp-emblem-important" string="Ready To Repair" domain="[('state','=','ready')]"/>
+                       <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-dolar" string="invoiced" domain="[('invoiced','=',True)]"/>
-                       <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="product_id"/>
                        <field name="partner_id"/>
-                       <field name="state" />
+                       <field name="state"/>
                   </group>
                   <newline/>
                   <group expand="0" string="Group By...">
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index db0be0d09f4..1a185fb08f3 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -49,7 +49,8 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name"/>
+                    <field name="name" string="Multi Company"/>
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="company_dest_id" widget="selection"/>
                     <field name="object_id"/>
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
new file mode 100644
index 00000000000..eff5717af2a
--- /dev/null
+++ b/addons/pad_project/i18n/fr.po
@@ -0,0 +1,38 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-22 08:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po
new file mode 100644
index 00000000000..14830e380bf
--- /dev/null
+++ b/addons/plugin/i18n/fi.po
@@ -0,0 +1,23 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-24 12:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr ""
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index e5ade747840..c67fcd0e9fe 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -27,10 +27,12 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
-                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                        <field name="name" string="Cash Statement"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
-                        <field name="name"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
+                        <separator orientation="vertical"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
@@ -52,11 +54,13 @@
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <group>
+                        <field name="name" string="Cash Statement"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter string="Open" domain="[('state','=','open')]" icon="terp-document-new" name="open"/>
                         <filter string="Closed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="date"/>
-                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
                     <newline/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5f568f10807..003f2023460 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -138,18 +138,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" string="Sales Order"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_order"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Today" domain="[('date_order','&gt;=',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&lt;=',datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59'))]"/>
-                    <filter icon="gtk-go-forward" string="Yesterday" domain="[('date_order','&lt;',datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00')),('date_order','&gt;=',(datetime.date.today() - relativedelta(days=1)).strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index a1631ab0203..255af0cdd30 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -35,23 +35,7 @@
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year" name="year"
-                            domain="[('year','=',time.strftime('%%Y'))]"
-                            help="POS ordered created during current year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month" name="This Month"
-                           domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="POS ordered created during current month"/>
-                        <filter icon="terp-go-month"
-                             string="Month -1"
-                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created last month"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-today"
-                             string="Today"
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="POS ordered created by today"/>
+                        <field name="date"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-dolar"
                             string="Invoiced"
@@ -59,14 +43,13 @@
                         <filter icon="terp-dolar"
                             string="Not Invoiced"
                             domain="[('state','=',('paid'))]"/>
-                    <separator orientation="vertical"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                    </field>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index b4a2f1e6ecb..afd769692df 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -26,39 +26,21 @@
           <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Point of Sale Cash Register Analysis">
-                  <group>
-                      <filter icon="terp-go-year" string="Year" name="year"
-                          domain="[('year','=',time.strftime('%%Y'))]"
-                          help="Cash Analysis created during this year"/>
-                      <separator orientation="vertical"/>
-
-                      <filter icon="terp-go-month" string="Month" name="This Month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                          help="Cash Analysis created in current month"/>
-                      <filter icon="terp-go-month"
-                           string="Month -1"
-                           domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                           help="Cash Analysis created in last month"/>
-                      <separator orientation="vertical"/>
-                      <filter icon="terp-go-today"
-                             string="    Today    "
-                             name="today"
-                             domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
-                             help="Cash Analysis created by today"/>
-                      <separator orientation="vertical"/>
-                        <filter icon="terp-document-new"
-                            string="Draft"
-                            domain="[('state','=',('draft'))]"/>
-                      <filter icon="terp-camera_test"
+                <group>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-document-new"
+                        string="Draft"
+                        domain="[('state','=',('draft'))]"/>
+                    <filter icon="terp-camera_test"
                           string="Confirm"
                           domain="[('state','=',('confirm'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection">
-                        <filter icon="terp-personal"
+                    <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
-                        </field>
+                    <separator orientation="vertical"/>
+                    <field name="user_id" widget="selection"/>
                     </group>
                     <newline/>
                   <group expand="1" string="Group By...">
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 7a456fc2d89..fe88f61bd98 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -110,7 +110,8 @@
             <field name="arch" type="xml">
                 <search string="Search Process">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Process"/>
+                        <separator orientation="vertical"/>
                         <field name="model_id"/>
                     </group>
                     <newline/>
@@ -209,7 +210,8 @@
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="Process Node"/>
+                    <separator orientation="vertical"/>
                     <field name="model_id"/>
                     <field name="kind" />
                 </group>
@@ -301,9 +303,10 @@
         <field name="arch" type="xml">
             <search string="Search Process Transition">
                 <group>
-                    <field name="name"/>
+                    <field name="name" string="Process Transition"/>
+                    <separator orientation="vertical"/>
                     <field name="source_node_id"/>
-                    <field name="target_node_id" />
+                    <field name="target_node_id"/>
                 </group>
 <!--
                 <newline/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index c9a6d55c9d4..547cbb64730 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -106,17 +106,18 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group>
+                       <field name="origin" string="Procurement"/>
+                       <separator orientation="vertical"/>
+                       <field name="date_planned"/>
+                       <separator orientation="vertical"/>
                        <filter icon="terp-emblem-important" string="Exceptions" name="exceptions" domain="[('state','=','exception')]" help="Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="To Fix" name="perm_exceptions" domain="[('state','=','exception'),('message', '!=', '')]" help="Permanent Procurement Exceptions"/>
                        <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/>
-                       <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
                        <separator orientation="vertical"/>
-                       <field name="origin"/>
                        <field name="product_id" />
-                       <field name="date_planned"/>
                        <field name="state" />
                     </group>
                     <newline/>
@@ -186,7 +187,8 @@
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Reordering Rules"/>
+                        <separator orientation="vertical"/>
                         <field name="warehouse_id" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 1e41e1274ee..5a2fe1756b2 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:25+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index bd0693f0a8c..0492881d9bd 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -112,9 +112,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products Price Search">
-                    <field name="name" />
-                    <field name="type"/>
+                    <field name="name" string="Products Price"/>
+                    <separator orientation="vertical"/>
                     <field name="currency_id"/>
+                    <field name="type"/>
                     <field name="active" />
                 </search>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce95cc8a044..506688e0a2b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,16 +9,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
+                   <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
+                   <separator orientation="vertical"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
                    <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
-                   <separator orientation="vertical"/>
                    <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
-                   <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('default_code','ilike',self)]"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
-                   <newline/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" widget="selection" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <separator orientation="vertical" groups="base.group_multi_company" />
@@ -300,8 +298,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Categories">
+                    <field name="name" string="Product Categories"/>
+                    <separator orientation="vertical"/>
                     <field name="parent_id"/>
-                    <field name="name"/>
                 </search>
             </field>
         </record>
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 2c53fc2a28a..2c38b2e56c1 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -54,7 +54,6 @@ Dashboard for project members that includes:
         "res_partner_view.xml",
         "report/project_report_view.xml",
         "board_project_view.xml",
-        'board_project_manager_view.xml',
         'report/project_cumulative.xml',
         'res_config_view.xml',
     ],
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
deleted file mode 100644
index d9340eefb3a..00000000000
--- a/addons/project/board_project_manager_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Board for project managers -->
-
-        <act_window 
-            id="act_my_project"
-            name="My projects" 
-            res_model="project.project"
-            domain="&quot;[('user_id', '=', uid)]&quot;"
-            view_mode="tree,form" 
-            view_type="form"/>
-
-        <act_window 
-            id="act_my_account"
-            name="My accounts to invoice"
-            res_model="account.analytic.account"
-            domain="&quot;[('user_id','=',uid),('state','&lt;&gt;','close')]&quot;"
-            view_mode="tree,form"
-            view_type="form"/>
-
-    </data>
-</openerp>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index df35534659d..09a7fe57bab 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,39 +2,54 @@
 <openerp>
     <data>
 
-        <!-- My task -->
-        <record id="view_task_tree" model="ir.ui.view">
-            <field name="name">project.task.tree</field>
-            <field name="model">project.task</field>
+        <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
+            <field name="name">project.vs.remaining.hour.tree</field>
+            <field name="model">project.vs.hours</field>
             <field name="type">tree</field>
-            <field eval="99" name="priority"/>
             <field name="arch" type="xml">
-                  <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
-                    <field name="name"/>
-                    <field name="project_id"/>
-                    <field name="date_deadline"/>
-                    <field name="priority"/>
-                    <field name="planned_hours" widget="float_time"/>
-                    <field name="effective_hours" widget="float_time"/>
-                    <field name="progress" widget="progressbar"/>
-                    <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
+                <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
+                    <field name="project"/>
+                    <field name="remaining_hours"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
 
-        <record id="view_delegated_task_tree" model="ir.ui.view">
-            <field name="name">project.task.delegated.tree</field>
+        <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
+             <field name="name">project.vs.remaining.hour.graph</field>
+             <field name="model">project.vs.hours</field>
+             <field name="type">graph</field>
+             <field name="arch" type="xml">
+                 <graph string="Project vs remaining hours" type="bar">
+                     <field name="project"/>
+                     <field name="state" group="True"/>
+                     <field name="remaining_hours" operator="+"/>
+                 </graph>
+             </field>
+        </record>
+
+        <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
+            <field name="name">Remaining Hours Per Project</field>
+            <field name="res_model">project.vs.hours</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
+        </record>
+
+        <record id="view_task_tree" model="ir.ui.view">
+            <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
             <field name="type">tree</field>
             <field eval="99" name="priority"/>
             <field name="arch" type="xml">
-                  <tree colors="red:date_deadline&lt;current_date" string="My Delegated Tasks">
+                <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
                     <field name="name"/>
                     <field name="project_id"/>
-                    <field name="delegated_user_id"/>
                     <field name="date_deadline"/>
-                    <field name="total_hours" widget="float_time"/>
+                    <field name="priority"/>
+                    <field name="planned_hours" widget="float_time"/>
+                    <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
@@ -42,31 +57,12 @@
             </field>
         </record>
 
-
         <record id="my_open_tasks_action" model="ir.actions.act_window">
-            <field name="name">My Open Tasks</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-            <field name="view_id" ref="view_task_tree"/>
-        </record>
-
-        <record id="action_view_delegate_task_tree" model="ir.actions.act_window">
-            <field name="name">My Delegated Tasks</field>
+            <field name="name">My Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))]</field>
-            <field name="view_id" ref="view_delegated_task_tree"/>
-        </record>
-
-        <record id="action_view_task_tree_deadline" model="ir.actions.act_window">
-            <field name="name">My Task's Deadlines</field>
-            <field name="res_model">project.task</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','=','open'),('date_deadline','&lt;&gt;',False)]</field>
+            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
 
@@ -78,11 +74,10 @@
                 <form string="My Board" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
-                            <action name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks"/>
+                            <action name="%(my_open_tasks_action)d" string="My Tasks" creatable="true"/>
                         </column>
                         <column>
-                            <action name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
+                            <action name="%(action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
                         </column>
                     </board>
                 </form>
@@ -90,7 +85,7 @@
         </record>
 
         <record id="open_board_project" model="ir.actions.act_window">
-            <field name="name">Project Dashboard</field>
+            <field name="name">Project</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -98,19 +93,10 @@
             <field name="view_id" ref="board_project_form"/>
         </record>
 
-        <menuitem
-            id="menu_project_dashboard"
-            name="Project"
-            sequence="20"
-            parent="base.menu_reporting_dashboard"
-            />
-
-        <menuitem
-            action="open_board_project"
-            icon="terp-graph"
-            id="menu_board_project"
-            parent="menu_project_dashboard"
-            sequence="1"/>
+        <menuitem id="menu_project_dashboard"
+                  sequence="35"
+                  parent="base.menu_reporting_dashboard"
+                  action="open_board_project"/>
 
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d9cba469bc4..9521969857d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -133,26 +133,24 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
+                       <field name="complete_name" string="Project Name"/> 
+                       <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
-                       <filter icon="gtk-media-pause" string="Template"
-                            name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
-                       <separator orientation="vertical"/>
+                       <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/>
                        <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
+                       <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                        <separator orientation="vertical"/>
-                       <field name="name" string="Project Name"/>
-                       <field name="user_id" string="Project Manager">
-                            <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
-                       </field>
+                       <field name="user_id" string="Project Manager"/>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
-                    <group expand="0" string="Group By...">
-                        <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
-                         <separator orientation="vertical"/>
-                        <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
-                    </group>
+                   <group expand="0" string="Group By...">
+                       <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Parent" name="Parent"  help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                   </group>
                </search>
             </field>
         </record>
@@ -361,7 +359,6 @@
                     <group>
                         <group>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                            <field name="project_id"  on_change="onchange_project(project_id)"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
@@ -385,15 +382,16 @@
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
                                 </tree>
                             </field>
-                            <group class="oe_form_subtotal_footer" name="project_hours" groups="project.group_time_work_estimation_tasks">
+                            <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
                                     <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
                                     <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
-                                <field name="total_hours" widget="float_time" class="oe_form_subtotal_footer_separator"/>
+                                <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                             </group>
+                            <div class="oe_clear"/>
                         </page>
                         <page string="Delegations History" groups="project.group_delegate_task">
                             <separator string="Parent Tasks"/>
@@ -592,19 +590,19 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
+                        <field name="name" string="Tasks"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" 
+                            help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <separator orientation="vertical"/>
                         <field name="project_id"/>
-                        <field name="user_id">
-                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -682,11 +680,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
-                   <group>
-                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    <group>
+                       <field name="name" string="Tasks Stages"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
-                   </group>
+                       <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index c85b1ba28e5..69daeefc758 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -55,26 +55,18 @@
             <field name="arch" type="xml">
                <search string="Task's Analysis">
                     <group>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                        <separator orientation="vertical"/>
                         <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
                         <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
+                        <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
+                        <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         <separator orientation="vertical"/>
-                        <filter string="Month" icon="terp-go-month" name="this_month"
-                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-1" name="month1"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-month" string="Month-2" name="month2"
-                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=2)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=2)).strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="project_id">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
-                        </field>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                        </field>
+                        <field name="project_id"/>
+                        <field name="user_id"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 240176f7941..a5711239f87 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -62,19 +62,9 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                     <group>
-                        <filter icon="terp-go-year" string="Year"
-                                name="year"
-                                domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-01-01'))]"
-                                help="Current Year"/>
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                                name="month"
-                                domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Current Month"/>
-                        <filter icon="terp-go-week"
-                                string="Month-1"
-                                domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                                help="Previous Month"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <field name="date_deadline"/>
                         <separator orientation="vertical"/>
                         <filter string="New"
                                 icon="terp-document-new"
@@ -84,32 +74,29 @@
                                 icon="terp-check"
                                 domain="[('state', '=' ,'open')]"
                                 help = "In progress tasks"/>
-                           <filter string="Pending"
-                                   icon="terp-gtk-media-pause"
-                                   domain="[('state','=','pending')]"
-                                   help = "Pending tasks"/>
-                          <filter string="Done"
+                        <filter string="Pending"
+                                icon="terp-gtk-media-pause"
+                                domain="[('state','=','pending')]"
+                                help = "Pending tasks"/>
+                        <filter string="Done"
                                 icon="terp-dialog-close"
                                 name="done"
                                 domain="[('state','=','done')]"/>
-                       <separator orientation="vertical"/>
-                        <field name="project_id">
-                            <filter icon="terp-folder-violet"
-                                    string="My Projects"
-                                    help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
-                          </field>
-
-                          <field name="user_id" widget="selection">
-                            <filter icon="terp-personal"
-                                    string="My Task"
-                                    help = "My tasks"
-                                    domain="[('user_id','=',uid)]" />
-                            <filter icon="terp-personal-"
-                                    string="Non Assigned Tasks to users"
-                                    help="Non Assigned Tasks to users"
-                                    domain="[('user_id','=',False)]"/>
-                          </field>
-                      <field name="partner_id" />
+                        <filter icon="terp-folder-violet"
+                                string="My Projects"
+                                help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                        <filter icon="terp-personal"
+                                string="My Task"
+                                help = "My tasks"
+                                domain="[('user_id','=',uid)]" />
+                        <filter icon="terp-personal-"
+                                string="Non Assigned Tasks to users"
+                                help="Non Assigned Tasks to users"
+                                domain="[('user_id','=',False)]"/>
+                         <separator orientation="vertical"/>
+                         <field name="project_id"/>
+                         <field name="user_id" widget="selection"/>
+                         <field name="partner_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
@@ -117,12 +104,6 @@
                         <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <newline/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="date_deadline"/>
-                        <separator orientation="vertical"/>
-
                     </group>
                     <newline/>
                     <group expand="1" string="Group By...">
@@ -156,118 +137,5 @@
 
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
 
-   <!-- Views and action for project dashboard -->
-   <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
-        <field name="name">project.vs.remaining.hour.tree</field>
-        <field name="model">project.vs.hours</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                <field name="project"/>
-                <field name="remaining_hours"/>
-                <field name="state"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
-         <field name="name">project.vs.remaining.hour.graph</field>
-         <field name="model">project.vs.hours</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Project vs remaining hours" type="bar">
-                 <field name="project"/>
-                 <field name="state" group="True"/>
-                 <field name="remaining_hours" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
-        <field name="name">Remaining Hours Per Project</field>
-        <field name="res_model">project.vs.hours</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-        <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
-    </record>
-
-    <record id="open_view_project_vs_remaining_hours_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_project_vs_remaining_hours_tree"/>
-
-            <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
-   </record>
-   <record id="open_view_project_vs_remaining_hours_graph" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
-            <field name="act_window_id" ref="action_project_vs_remaining_hours_graph"/>
-   </record>
-    <!-- Views and action for project issue dashboard -->
-    <record id="view_task_by_days_tree" model="ir.ui.view">
-        <field name="name">task.by.days.tree</field>
-        <field name="model">task.by.days</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Task By Days" >
-                <field name="day"/>
-                <field name="total_task"/>
-                <field name="state" groups="base.group_no_one"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_task_by_days_graph" model="ir.ui.view">
-         <field name="name">task.by.days.graph</field>
-         <field name="model">task.by.days</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Task By Days" type="bar">
-                 <field name="day"/>
-                 <field name="state" group="True"/>
-                 <field name="project_id" group="True"/>
-                 <field name="total_task" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="action_task_by_days_graph" model="ir.actions.act_window">
-        <field name="name">Task By Days</field>
-        <field name="res_model">task.by.days</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('day','&lt;=',time.strftime('%Y-%m-%d')),('day','&gt;=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))]</field>
-        <field name="view_id" ref="view_task_by_days_graph"/>
-    </record>
-
-    <!-- Views and action for project  dashboard -->
-   <record id="view_project_vs_planned_total_hours_tree" model="ir.ui.view">
-        <field name="name">project.vs.planned.total.hour.tree</field>
-        <field name="model">project.vs.hours</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Project vs Planned and Total Hours" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                <field name="project"/>
-                <field name="planned_hours"/>
-                <field name="total_hours"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_project_vs_planned_total_hours_graph" model="ir.ui.view">
-         <field name="name">project.vs.planned.total.hour.graph</field>
-         <field name="model">project.vs.hours</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Project vs Planned and Total Hours" type="bar">
-                 <field name="project"/>
-                 <field name="planned_hours" operator="+"/>
-                 <field name="total_hours" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
     </data>
 </openerp>
diff --git a/addons/project_gtd/i18n/mn.po b/addons/project_gtd/i18n/mn.po
new file mode 100644
index 00000000000..de0ad8288af
--- /dev/null
+++ b/addons/project_gtd/i18n/mn.po
@@ -0,0 +1,308 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-24 12:16+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "In Progress"
+msgstr "Боловсруулж байна"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show only tasks having a deadline"
+msgstr "Зөвхөн дуусах хугацаатай даалгавруудыг харуулах"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Дахин идэвхжүүлэх"
+
+#. module: project_gtd
+#: help:project.task,timebox_id:0
+msgid "Time-laps during which task has to be treated"
+msgstr "Даалгаврыг анхаарах ёстой хугацааны зурвасууд"
+
+#. module: project_gtd
+#: help:project.gtd.timebox,sequence:0
+msgid "Gives the sequence order when displaying a list of timebox."
+msgstr "Хугацааны хайрцагийн жагсаалтыг харуулах дарууллын эрэмбийг өгнө"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "Аялал"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr "Хугацааны Хайрцаг Хоосон Боловсруулалт Амжилттай дууслаа."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Pending Tasks"
+msgstr "Хүлээгдэж байгаа Даалгаврууд"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Next"
+msgstr "Дараах"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox "
+"defines a period of time in order to categorize your tasks: today, this "
+"week, this month, long term."
+msgstr ""
+"\"Ажлыг Амжуулах\" аргачлалын хугацааны хайрцагууд. Хугацааны хайрцаг нь "
+"даалгаврыг хийх ёстой хугацааны мужуудаг тодорхойлдог: өнөөдөр, энэ "
+"долооног, энэ сар, урт хугацааны."
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "Урт Хугацааны"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "Төслийн Хугацааны Хайрцаг Хоосон"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0 field:project.gtd.timebox,name:0
+#: view:project.task:0 field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "Хугацааны муж"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "Хугацааны Хайрцагийг тохируулах"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "Error !"
+msgstr "Алдаа !"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_task
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_timebox_tree
+#: view:project.task:0
+msgid "My Tasks"
+msgstr "Миний даалгаврууд"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "Энэ долооног"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "Хоосон Хугацааны Хайрцаг"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Tasks having no timebox assigned yet"
+msgstr "Хугацааны хайрцаг олгогдоогүй даалгаврууд"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_gtd
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "Таних Тэмдэг"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
+msgid "Project Timebox Fill"
+msgstr "Төслийн Хугацааны Хайрцагийг Дүүргэх"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "Хугацааны Хайрцагт Нэмэх"
+
+#. module: project_gtd
+#: field:project.timebox.empty,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
+msgid "Contexts"
+msgstr "Агуулгууд"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "Машин"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show Context"
+msgstr "Агуулгыг Харуулах"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Хугацааны Хайрцагийг Төлөвлөх"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr "project.gtd.timebox"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "Хугацааны Хайрцагууд"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "In Progress and draft tasks"
+msgstr "Хийгдэж байгаа болон Ноорог даалгаврууд"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_context
+#: view:project.gtd.context:0 field:project.gtd.context,name:0
+#: field:project.task,context_id:0
+msgid "Context"
+msgstr "Агуулга"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
+#, python-format
+msgid "No timebox child of this one !"
+msgstr "Үүний охин хугацааны хайрцаг алга !"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "Офис"
+
+#. module: project_gtd
+#: field:project.gtd.context,sequence:0 field:project.gtd.timebox,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show the context field"
+msgstr "Агуулгын талбарыг харуулах"
+
+#. module: project_gtd
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
+msgstr "Агуулгын жагсаалтыг харуулах дарааллыг эрэмбийг өгнө."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Show Deadlines"
+msgstr "Дуусгах Хугацааг Харуулах"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "Хугацааны хайрцагийн тодорхойлолт"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "Даалгавруудын сонголт"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Inbox"
+msgstr "Inbox"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_id:0
+msgid "Get from Timebox"
+msgstr "Хугацааны хайрцагаас авах"
+
+#. module: project_gtd
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "Хэрэглэгч даалгаврыг анхаарах агуулгын байрлал"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "Нүүр"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"you to categorize your tasks according to the context in which they have to "
+"be done: at the office, at home, when I take my car, etc."
+msgstr ""
+"\"Ажлыг Амжуулах\" аргачлалд тодорхойлогдсон агуулгууд. Энэ нь даалгаврыг "
+"ямар агуулгад хийгдсэн байхыг ангилах боломжийг олгодог: оффист, гэрт, "
+"машинаа авахдаа гэх мэт..."
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "For reopening the tasks"
+msgstr "Даалгаврыг дахин нээхэд"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "Өмнөх"
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index c8e87093c0e..5b48f6b4648 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -111,26 +111,15 @@
         <field name="priority">50</field>
         <field name="arch" type="xml">
            <search string="My Tasks">
+                <field name="name" string="My Tasks"/>
+                <separator orientation="vertical"/>
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                <separator orientation="vertical"/>
-                <filter
-                    domain="[('timebox_id','=', False)]"
-                    help="Tasks having no timebox assigned yet" string="Inbox"/>
-                <separator orientation="vertical"/>
-                <separator name="gtdsep"/>
-                <field name="name"/>
-                <field name="context_id" widget="selection"
-                    context="{'context_show': True}">
-                    <filter string="Show Context"
-                        name="context_show"
-                        context="{'context_show': True}"
-                        domain="[]" icon="terp-camera_test"
-                        help="Show the context field"/>
-                    <filter string="Show Deadlines" context="{'deadline_visible': False}"
-                        domain="[]" help="Show only tasks having a deadline"
-                        icon="terp-gnome-cpu-frequency-applet+"/>
-                </field>
+                <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
+                <group expand="0" string="Display">
+                    <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
+                    <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 495a1efe3c1..cedcd85d4fc 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -2,89 +2,7 @@
 <openerp>
     <data>
 
-        <record id="action_view_current_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">Project issues</field>
-            <field name="res_model">project.issue</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',['draft','open'])]</field>
-           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
-        </record>
-
-        <record id="action_view_pending_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">Project issues</field>
-            <field name="res_model">project.issue</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','pending')]</field>
-           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
-        </record>
-
-        <record id="action_project_issue_graph_state" model="ir.actions.act_window">
-            <field name="name">Project Issue</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[]</field>
-            <field name="view_id" ref="project_issue.view_project_issue_report_graph"/>
-        </record>
-
-        <record id="view_project_issue_graph_stage" model="ir.ui.view">
-            <field name="name">project.issue.report.graph</field>
-            <field name="model">project.issue.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="Project Issue" type="bar">
-                    <field name="stage_id"/>
-                    <field name="nbr" operator="+"/>
-                    <field group="True" name="user_id"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="action_project_issue_graph_stage" model="ir.actions.act_window">
-            <field name="name">Project Issue</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="domain">[]</field>
-            <field name="view_id" ref="view_project_issue_graph_stage"/>
-        </record>
-
-        <record id="board_project_issue_form" model="ir.ui.view">
-            <field name="name">board.project.issue.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Issues Dashboard" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
-                            <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
-                        </column>
-                        <column>
-                            <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
-                            <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-
-        <record id="open_board_project_issue" model="ir.actions.act_window">
-            <field name="name">Project Issue Dashboard</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="usage">menu</field>
-            <field name="view_id" ref="board_project_issue_form"/>
-        </record>
-        <menuitem id="menu_dashboard_project_issue" name="Project Issue Dashboard" parent="project.menu_project_dashboard"
-             icon="terp-graph"
-            action="open_board_project_issue"/>
-
-    <!-- For Project Dashboard -->
-            <record model="ir.ui.view" id="project_issue_board_tree_view">
+        <record model="ir.ui.view" id="project_issue_board_tree_view">
             <field name="name">Project Issue Board Tree</field>
             <field name="model">project.issue</field>
             <field name="type">tree</field>
@@ -105,6 +23,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="action_view_my_project_issue_tree" model="ir.actions.act_window">
             <field name="name">My Project Issues</field>
             <field name="res_model">project.issue</field>
@@ -113,40 +32,17 @@
             <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
-         <record id="view_my_open_project_issue_graph" model="ir.ui.view">
-            <field name="name">my.open.project.issue.graph</field>
-            <field name="model">project.issue.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="vertical" string="My Open Project Issue" type="bar">
-                    <field name="creation_date"/>
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="action_view_my_open_project_issue_tree" model="ir.actions.act_window">
-            <field name="name">My Open Project issues</field>
-            <field name="res_model">project.issue.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
-            <field name="context">{'default_user_id': uid}</field>
-           <field name="view_id" ref="view_my_open_project_issue_graph"/>
-        </record>
-       <record id="board_my_project_issue_form" model="ir.ui.view">
+
+        <record id="board_my_project_issue_form" model="ir.ui.view">
             <field name="name">board.my.project.issue.form.inherit</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
-                        <action name="%(action_view_my_project_issue_tree)d" string="My Issues" creatable="true"/>
-                </xpath>
-                <xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
-                        <action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
+                <xpath expr="/form/board/column/action[@string='My Tasks']" position="after">
+                    <action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
new file mode 100644
index 00000000000..ebc23b2380b
--- /dev/null
+++ b/addons/project_issue/i18n/mn.po
@@ -0,0 +1,978 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-24 12:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Previous Month"
+msgstr "Өмнөх сар"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Нээх дундаж хугацаа"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr "Асуудлыг Нээх Ажлын Цаг"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Нээлттэй"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Нээх Огноо"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "3-р сар"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Явц (%)"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:406
+#, python-format
+msgid "Warning !"
+msgstr "Анхаар !"
+
+#. module: project_issue
+#: field:project.issue,company_id:0 view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Ажиглагчийн и-мэйл"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today's features"
+msgstr "Өнөөдрийн онцлог, боломж"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Нээх хүртэлх өдөр"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:406
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"Энэ асуудлыг томруулах боломжгүй.\n"
+"Энэ төсөл нь томруулж болох төслөөр тохируулагдаагүй байна!"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "Хамгийн Өндөр"
+
+#. module: project_issue
+#: help:project.issue,inactivity_days:0
+msgid "Difference in days between last action and current date"
+msgstr "Сүүлийн үйлдэл, одоогийн огнооны ялгавар өдрөөр"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: project_issue
+#: field:project.issue,days_since_creation:0
+msgid "Days since creation date"
+msgstr "Үүсгэснээс хойшх хоног"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Дотоод тэмдэглэл нэмэх"
+
+#. module: project_issue
+#: field:project.issue,task_id:0 view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "Асуудал үеээр"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Зурвас"
+
+#. module: project_issue
+#: field:project.issue,inactivity_days:0
+msgid "Days since last action"
+msgstr "Сүүлийн үйлдлээс хойших хоног"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0 field:project.issue,project_id:0
+#: view:project.issue.report:0 field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Миний нээлттэй асуудлууд"
+
+#. module: project_issue
+#: selection:project.issue,state:0 selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change to Next Stage"
+msgstr "Дараачийн үе рүү өөрчлөх"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "Хаах Огноо"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "Асуудал Хөтлөгчийн Хайлт"
+
+#. module: project_issue
+#: field:project.issue,color:0
+msgid "Color Index"
+msgstr "Өнгөний Индекс"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue / Partner"
+msgstr "Асуутал / Харилцагч"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "Нээх хүртэлх дундаж ажлын цаг"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "Дараагийн үйлдэл"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+"Хэрэв асуудал энэ төслөөс томруулсан бол тэдгээр нь энд сонгосон төслүүдэд "
+"харагдана."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+"Энэ тайлан нь таны дэмжлэгийн үйлчилгээ болон борлуулалтын дараах "
+"үйлчилгээний чанарыг шинжлэх боломжийг олгодог. Асуудыг та насаар нь хөтлөх "
+"боломжтой. Нээх, хаахад шаардагдсан дундаж хугаца, солилцсон имэйлийн тоо, "
+"зарцуулсан дундаж цаг зэрэгийг шинжлэх боломжтой."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change Color"
+msgstr "Өнгө Өөрчлөх"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:482
+#, python-format
+msgid " (copy)"
+msgstr " (хувилах)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Responsible"
+msgstr "Хариуцагч"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Бага"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Статистик"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "Даалгавар руу хөрвүүлэх"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr "Маллагаа"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "Асуудлын Шинжилгээ"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Дараах"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,priority:0
+#: view:project.issue.report:0 field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "Урьтамж"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Шинэ имэйл илгээх"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,version_id:0
+#: view:project.issue.report:0 field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "Хувилбар"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "New"
+msgstr "Шинэ"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "Асуудлын Ангилал"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "Имэйл"
+
+#. module: project_issue
+#: field:project.issue,channel_id:0 field:project.issue.report,channel_id:0
+msgid "Channel"
+msgstr "Суваг"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "Хамгийн Бага"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Unassigned Issues"
+msgstr "Эзэнгүй Асуудлууд"
+
+#. module: project_issue
+#: field:project.issue,create_date:0 view:project.issue.report:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "Үүсгэсэн Огноо"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "Хувилбарууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "To Do Issues"
+msgstr "Хийх ёстой Асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "Ноороглох"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Өнөөдөр"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "Төслийн Асуудлын Хянах Самбар"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "Дууссан"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "7-р сар"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Ангилалууд"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "Үе"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "Түүхийн мэдээлэл"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "Төслийн асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "Харилцаа болон Түүх"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "Миний нээлттэй төслийн асуудлууд"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "Миний төслийн асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "Холбогч"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,partner_id:0
+#: view:project.issue.report:0 field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "Миний асуудлууд"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Change to Previous Stage"
+msgstr "Өмнө үе рүү өөрчлөх"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+"OpenERP-д төслийн асуудлуудыг програм хангамжийн төсөлд бугийг бүртгэх, "
+"борлуулалтанд борлуулалтын дараах гомдлыг бүртгэх гэх мэт байдлаар хэрэглэх "
+"боломжтой. Энэ өөрийн бүтээгдэхүүний ялгаатай хувилбаруудыг бүртгэж асуудлыг "
+"холбож ажиллах боломжтой."
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:330
+#, python-format
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "Асуудлын #"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "9-р сар"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "12-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "Асуудал Хөтлөлтийн Мөчир"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "project.issue.report"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:408 view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Томруулах"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "Онцлог хүсэх"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "Шинэчилсэн огноо"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Open Features"
+msgstr "Нээлттэй онцлог"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Өмнөх"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,categ_id:0
+#: view:project.issue.report:0 field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "Ангилал"
+
+#. module: project_issue
+#: field:project.issue,user_email:0
+msgid "User Email"
+msgstr "Хэрэглэгчийн Имэйл"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "Төслийн асуудлуудын тоо#"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to New"
+msgstr "Шинэ болгох"
+
+#. module: project_issue
+#: help:project.issue,channel_id:0
+msgid "Communication channel."
+msgstr "Харилцах суваг."
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Энэ бичлэгт харгалзах орох, гарах бүх э-мэйлийг илгээхийн өмнө СС талбарт "
+"эдгээр э-мэйл хаягуудыг нэмж өгнө. Э-мэйл хаягуудыг таслалаар тусгаарлана."
+
+#. module: project_issue
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact Information"
+msgstr "Холбогчийн Мэдээлэл"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0 selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Хаалттай"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr "Хариулах"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Асуудал хаагдах дундаж хоног"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue,state:0
+#: view:project.issue.report:0 selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "Төлөв"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "Төслийн Асуудлууд#"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "Идэвхтэй Асуудал"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "8-р сар"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Энгийн"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "Глобал CC"
+
+#. module: project_issue
+#: view:project.issue:0 view:project.issue.report:0
+msgid "To Do"
+msgstr "Хийх"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "6-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "New Issues"
+msgstr "Шинэ асуудлууд"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "Хаах өдөр"
+
+#. module: project_issue
+#: field:project.issue,active:0 field:project.issue.version,active:0
+msgid "Active"
+msgstr "Идэвхитэй"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "11-р сар"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Хайх"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "10-р сар"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues Dashboard"
+msgstr "Асуудлын Хянах Самбар"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,type_id:0
+msgid "Stages"
+msgstr "Үе"
+
+#. module: project_issue
+#: help:project.issue,days_since_creation:0
+msgid "Difference in days between creation date and current date"
+msgstr "Үүсгэсэн огноо, одоогийн огнооны ялгавар өдрөөр"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "1-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "Онцлог Хөтлөлтийн Мөчир"
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "Эдгээр хүмүүс и-мэйл хүлээж авна"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "Асуудал Үеээр"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,date:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "Түүх"
+
+#. module: project_issue
+#: field:project.issue,user_id:0 view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Assigned to"
+msgstr "Хариуцагч"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "Имэйлийн Хариулах Хаяг"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Харилцагчийн холбогч"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "Асуудал Хөтлөх Форм"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,state:0
+#: view:project.issue.report:0 field:project.issue.report,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "Ерөнхий"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Current Features"
+msgstr "Идэвхтэй Онцлог"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr "Асуудлын Хувилбар"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "Хувилбарийн Дугаар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "Хаах"
+
+#. module: project_issue
+#: view:project.issue:0 selection:project.issue.report,state:0
+msgid "Open"
+msgstr "Нээх"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr "Асуудал"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+msgid "In Progress"
+msgstr "Боловсруулж байна"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr "Төслийн Асуудал"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Creation Month"
+msgstr "Үүсгэсэн сар"
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "Бодолт: Зарцуулсан хугацаа / Нийт хугацаа."
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+"Системийн буг, захиалагчийн гомдол, материалын задаргаа зэрэг асуудал энд "
+"цугларна. Төслийн асуудлыг шийдвэрлэх үеүүдийг тодорхойлж болно (шинжилгээ, "
+"хөгжүүлэлт, хийгдсэн) Имэйл үүдийн тусламжтайгаар имэйл нь асуудлыг шууд "
+"үүсгэхээр уялдаж болно. (Жишээлбэл: support@mycompany.mn)"
+
+#. module: project_issue
+#: view:board.board:0 view:project.issue:0
+msgid "Pending Issues"
+msgstr "Хүлээгдэж байгаа асуудал"
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr "Асуудал"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr "Онцлог Хөтлөгчийн Хайлт"
+
+#. module: project_issue
+#: view:project.issue:0 field:project.issue,description:0
+msgid "Description"
+msgstr "Тайлбар"
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "Борлуулалтын баг"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr "5-р сар"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,email:0
+msgid "# Emails"
+msgstr "Имэйл #"
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"Хэрэг нээгдэхэд төлөв нь 'Ноорог' болно.                                  \n"
+"Хэрэв хэрэг боловсруулагдаж байгаа бол 'Нээлттэй' төлөвтэй болно.            "
+"                      \n"
+"Хэрэг хийгдсэн бол 'Хийгдсэн' төлөвтэй болно.                                "
+"  \n"
+"Хэрэв хэрэг хүлээгдэж байгаа бол 'Хүлээгдэж байгаа' төлөвтэй болно."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr "2-р сар"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:70
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr "Асуудал '%s' нээгдлээ."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr "Онцлогийн тайлбар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Edit"
+msgstr "Засах"
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr "Төслийг Томруулах"
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+"Хэрэг харъяалагдах Борлуулалтын Баг.                             Хариуцагч "
+"хэрэглэгч болон имэйл үүдийн имэйл хаягийг тодорхойлно."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr "Сар-1"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:85
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr "Асуудал '%s' хаагдлаа."
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr "4-р сар"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr "Сурвалж"
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr "Асуудлыг хаах хүртэлх ажлын цаг"
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Current Year"
+msgstr "Энэ жил"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:415
+#, python-format
+msgid "No Title"
+msgstr "Гарчиг Үгүй"
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "Төслийн даалгаврыг хаах хүртэл өдрийн тоо"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr "Борлуулалтын Баг"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr "Хаах хүртэлх дундаж ажлын цаг"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr "Өндөр"
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "Дуусах огноо"
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr "Сүүлийн үйлдэл"
+
+#. module: project_issue
+#: view:project.issue.report:0 field:project.issue.report,name:0
+msgid "Year"
+msgstr "Он"
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr "Миний нээлттэй асуудлууд Үүсгэсэн Огноогоор"
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 4c3be9e1327..8044d149901 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,7 +12,6 @@
         <field name="view_mode">kanban,tree,calendar</field>
         <field name="view_id" eval="False"/>
         <field name="domain" eval=""/>
-        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
     </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2b93cfec105..1d8fe6b2509 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -10,7 +10,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Version">
-                    <field name="name"/>
+                    <field name="name" string="Issue Version"/>
+                    <separator orientation="vertical"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -152,15 +153,16 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
-                        <filter string="To Do" name="todo" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
+                        <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
+                        <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+                        <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                         <separator orientation="vertical"/>
-                        <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
-                        <field name="user_id">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
-                        </field>
+                        <field name="user_id"/>
                         <field name="project_id"/>
+                        <separator orientation="vertical"/>
                         <field name="id"/>
                     </group>
                     <newline/>
@@ -304,17 +306,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <filter icon="terp-go-today" string="Today"
-                        domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
-                    <separator orientation="vertical"/>
                     <group>
                         <field name="name" string="Feature description"/>
-                        <field name="user_id"/>
-                        <field name="state" groups="base.group_no_one">
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                         <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
-                        </field>
+                        <separator orientation="vertical"/>
+                        <field name="user_id"/>
                         <field name="project_id" string="Project"/>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 43a49abf2b8..862f52b1931 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -52,36 +52,24 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group>
-                        <filter string="Year" icon="terp-go-year" help="Current Year"
-                        name="year"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        />
-                        <separator orientation="vertical" />
-                       <filter string="Month" icon="terp-go-month" name="This Month"
-                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
-                       <filter icon="terp-go-week" string="Month-1"  help="Previous Month"
-                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        />
+                   <group>
+                        <field name="creation_date"/>
                         <separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
                             string="New"
                             domain="[('state','=','draft')]"/>
                         <filter  icon="terp-check"
                             string="To Do"
-                            domain="[('state','=','open')]"/>                            
-                       <filter icon="terp-gtk-media-pause"
+                            domain="[('state','=','open')]"/>
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                       <filter icon="terp-dialog-close"
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
-
-                           <separator orientation="vertical" />
-
+                          <separator orientation="vertical" />
                           <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
+                          <field name="user_id" widget="selection"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
                    </group>
@@ -119,8 +107,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
-
-                  </group>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
new file mode 100644
index 00000000000..77ffa6ef54b
--- /dev/null
+++ b/addons/project_long_term/i18n/mn.po
@@ -0,0 +1,529 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 13:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Дараагийн Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Төслийн Даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr "Оноогдсон Хэрэглэгчид"
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr "Явц"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "In Progress Phases"
+msgstr "Боловсруулагдаж байгаа Шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying Settings"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Тов"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:126
+#, python-format
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr "Шатны Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your users allocation, describe different tasks and link your phase "
+"to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"users, convert your phases into a series of tasks when you start working on "
+"the project."
+msgstr ""
+"Төсөл нь ялгаатай шатуудад хуваагдаж болно. Шат бүрт хэрэглэгчдийн "
+"хуваарьлалтыг хийж болно. Шатуудад даалгавруудыг онооно. Шатуудыг өмнөх, "
+"хойдох шаттай нь холбож болно. Шатуудад автомат товлолтыг хийх огнооны "
+"хяналтуудыг нэмэх боломжтой. Урт хугацааны төлөвлөлтийг байгаа хэрэглэгчид "
+"төлөвлөхдөө хэрэглэж төслийг эхлэхдээ шатуудыг бүлэг даалгаврууд руу "
+"хөрвүүлэх замаар эхлүүлнэ."
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Нэг төслийг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Өмнөх Шатууд"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "Х.Н (Хэмжих Нэгж) гэдэг нь үргэлжлэх хугацааг хэмжих нэгж юм."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
+msgstr "Хэрэглэгчдийг Төлөвлөх"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+" Энэ нь эхлэх огноо, үргэлжлэх хугацааны дагуу товлогчоор тооцоологддог."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.task:0
+#: view:project.user.allocation:0
+#: field:project.user.allocation,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr "Алдаа!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Дуусгах огноо"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
+msgstr "Миний бүх төслийг тооцоолох"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid " (copy)"
+msgstr " (хувилах)"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
+msgstr "Төслийн Хэрэглэгчийн Хуваарьлалт"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr "Шинэ"
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
+msgstr "Холбогдох даалгавар дээр үндэслэн тооцоологдсон"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "Үргэлжлэх Х.Н"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Хамгийн бага эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr "Нөөц"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr "Миний төслүүд"
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Холбогдох даалгаврууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "New Phases"
+msgstr "Шинэ Шатууд"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Please specify a project to schedule."
+msgstr "Төслийн товийг зааж өгнө үү."
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "шатыг энэ огнооны дараанаас хүчээр эхлүүлэх"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Төслийн даалгаврууд"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"төслийн эхлэх огноо эсвэл өмнөх шатын дуусах огнооны дагуу товлогчоор "
+"автоматаар энэ нь тооцоологддог."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Шатын эхлэх огноо нь дуусах огнооноос өмнө байх ёстой."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Month"
+msgstr "Эхлэх Сар"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "энэ огнооны өмнө шатыг хүчээр дуусгах"
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid ""
+"The ressources on the project can be computed automatically by the scheduler"
+msgstr "Төсөл дахь нөөц нь товлогчоор автоматаар тооцоологдож болно."
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
+msgstr "Хүлээгдэж байгаа шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Төсөлийн Даалгавруудыг Тооцоолох"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Хяналт"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Шатуудын жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Төслийн шатууд"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "Хийгдэж байна"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Үлдсэн цаг"
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr "Ажлын цаг"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr "Шатуудыг Товыг Гаргах"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Шатыг эхлэх"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
+msgstr "Нийт цаг"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr "Хэрэглэгчид"
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr "Шат"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Хэрэв шат үүсгэгдсэн бол төлөв нь 'Ноорог' болно.\n"
+" Хэрэв шат эхлэсэн бол төлөв нь 'Хийгдэж байна' болно.\n"
+" Хэрэв шат үзлэг хийгдэх хэрэгтэй бол 'Хүлээгдэж буй' төлөвтэй болно.        "
+"                          \n"
+" Хэрэв шат дууссан бол 'Хийгдсэн' төлөвтэй болно."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Даалгаврын Дэлгэрэнгүй"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Үргэлжлэх хугацаа"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project Users"
+msgstr "Төслийн Хэрэглэгчид"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+#: field:project.user.allocation,phase_id:0
+msgid "Project Phase"
+msgstr "Төслийн Шат"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"               "
+msgstr ""
+"Бүх төслийн эсвэл тухайлсан төслийн шатыг товыг гаргах. Дараа нь Гантт "
+"харагдацаар нээгдэнэ.\n"
+"               "
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Төслийн Шатыг Тооцоолох"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Шатанд давталт зөвшөөрөгдөхгүй"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Нөөцийн Амралт, Чөлөө"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+#: view:project.compute.tasks:0
+msgid "Schedule Tasks"
+msgstr "Даалгавруудыг Товлох"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Анхныхаар өдрөөр"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,user_force_ids:0
+msgid "Force Assigned Users"
+msgstr "Оноогдсон хэрэглэгчдийг албадах"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Товлох"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Харуулах Тохиргоо"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 18babab66a4..b527d511d5f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -70,16 +70,16 @@
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <group>
-                        <field name="user_id"/>
-                        <field name="phase_id"/>
-                        <field name="project_id"/>
+                       <field name="user_id"/>
+                       <field name="phase_id"/>
+                       <field name="project_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+                       <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <separator orientation="vertical"/>
+                       <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
             </field>
@@ -272,18 +272,19 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group>
+                        <field name="name" string="Project Phases"/>
+                        <separator orientation="vertical"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                        <separator orientation="vertical"/>
                         <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Phases" icon="terp-check"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
+                        <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
-                        </field>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
+                        <field name="project_id"/>
                     </group>
-                    <newline/>
+                    <newline/> 
                     <group expand="0" string="Group By...">
                         <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project_mrp/i18n/mn.po b/addons/project_mrp/i18n/mn.po
new file mode 100644
index 00000000000..bc77b4810ab
--- /dev/null
+++ b/addons/project_mrp/i18n/mn.po
@@ -0,0 +1,129 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 14:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_mrp
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанийн хэмжээнд үл давхцах байх ёстой!"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "Бараа бүрийн хувьд үйлчилгээний төрөл болон захиалга дээр"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Татан авах даалгавар"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_sale_order
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sale order line"
+msgstr "Борлуулалтын захиалгын мөр"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "Барааны төрөл нь үйлчилгээ бол энэ нь даалгавар үүсгэдэг."
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "Хэрэв барааны төрөл нь 'үйлчилгээ' бол энэ даалгавар үүсгэнэ."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "Борлуулалтын Захиалгын Даалгавар"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "Бараа"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Алдаа: EAN код буруу"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "Татан авалт"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "Үйлчилгээ үзүүлэх даалгавар"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "Даалгавар Захиалах"
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "Даалгавар Үүсгэх"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_ordertask0
+msgid "If procurement method is Make to order and supply method is produce"
+msgstr ""
+"Хэрэв татан авах арга нь захиалахад хийх бөгөөд нийлүүлэх арга нь үйлдвэрлэх"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "Борлуулалтын захиалгад үйлчилгээ борлуулалх тохиолдолд"
+
+#. module: project_mrp
+#: field:project.task,sale_line_id:0
+msgid "Sale Order Line"
+msgstr "Борлуулалтын захиалгын мөр"
diff --git a/addons/project_planning/i18n/mn.po b/addons/project_planning/i18n/mn.po
new file mode 100644
index 00000000000..c60224a518d
--- /dev/null
+++ b/addons/project_planning/i18n/mn.po
@@ -0,0 +1,587 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 14:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+"Энэ утга нь төлөвлөлт дээрх энэ даалгаврыг хийхэд үлдэж байгаа нийлбэр "
+"хугацаа өдрөөр илэрхийлж байна."
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Төлөвлөлтийн Статистик"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr "Төлөвлөлтийн Мөр"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Хуваарилагдаагүй Нийт Хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Төлөвлөлтийн Нэр"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "Миний Төслийн Төлөвлөлт"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Цагийн хуудас"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its global system to schedule all resources of a company (people and "
+"material), OpenERP allows you to encode and then automatically compute tasks "
+"and phases scheduling, track resource allocation and availability."
+msgstr ""
+"Үүний глобаль системээр компаний бүх нөөц (хүн, материал)-г товлодог. "
+"OpenERP даалгавруудтыг автомат тооцоолох, шатуудыг товлох, нөөцийн "
+"хуваарилалтыг хянах, хүрэлцэх эсэхийг шалгах зэрэг боломжийг олгодог."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr "Нийт төлөвлөсөн даалгаварууд"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Данс"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Даалгавар"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Тэмдэглэгээ"
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr "Төлөвлөлт"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Даалгаврыг эхлэх"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr "Нийт төлөвлөсөн (Өдрөөр)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"Зөв биш төлөвлөлт ! Нэг хариуцагчийн хувьд төлөвлөлтийн хугацаа давхцаж "
+"болохгүй. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Төлөвлөлт Дансаар"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Идэвхтэй Төлөвлөлтууд"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Шинжилгээний Данс"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Ноороглох"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Нийт Төлөвлөгдсөн"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+"Энэ утга нь төлөвлөлтөд орсон цагийн хуудсын бүх ажлын 'Эхлэх огноо' болон "
+"'Дуусах огноо'-нуудыг нийлбэр."
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr "Даалгавар үгүй хуваарилагдсан хугацаанууд"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Төлөвлөлтийн мөрүүд"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Шинжилгээний Санхүү"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+"Энэ утга нь 'Даалгаварт оноогдсон' нь тэмдэглэгдээгүй хуваарилагдсан "
+"хугацаануудын нийлбэр өдрөөр."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr "Энэ нь төлөвлөлтөнд хэмжих нэгж болж тохируулагдана."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "Хүний Нөөцийн Төлөвлөлт"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Үлдсэн Даалгаврууд"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Төлөвлөлт"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
+msgstr "Хэнд :"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Хугацааны Кодлол"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Хуваарилагдаагүй Хугацаа"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+"Хуваарилагдсан боловч даалгавар холбогдоогүй хугацаануудын нийлбэр өдөрөөр."
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Ацаглах"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Төлөвлөлтийн шинжилгээ"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+"Энэ төлөвлөлтөнд нэг хүн бүтэн цагаар ажиллахад хэдэн цаг ажиллах ажлын "
+"өдөрийг энд тааруулна."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr "["
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr "Хаанаас :"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Төлөвлөлт Хэрэглэгчээр"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Төлөвлөлт Дансаар (өдрөөр)"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
+msgstr "Даалгаваргүй хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Нийт Чөлөөтэй хугацаа"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+"Хуваарилагдсан хугацааны 'Даалгавар оноогдоогүй' гэдэг нь тэмдэглэгдсэн "
+"хугацаануудын нийлбэр өдөрөөр."
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+"Ажлын өдөрөөр тооцоологдоно - (Даалгаварт хуваарилагдаагүй хугацаа + "
+"Даалгаварт хуваарилагдаагүй хугацаа + Амралт, Чөлөө)"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Тоо хэмжээ Хэмжих Нэгж"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Тэмдэглэл"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Төлөвлөлт Дансаар"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Хүлээгдэж буй"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Төлөвлөгдсөн Өдөр"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Төлөв"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+"Өгөгдсөн төлөвлөлтийн эхлэх, дуусах хугацааны хоорон дахь батлагдсан амралт "
+"чөлөөний хугацааны нийлбэрийн утга."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Бүх үлдсэн даалгаврууд"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Компаниуд"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "UOM дээр суурилсан тоо хэмжээ"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Даалгаврууд дээрх төлөвлөгдсөн хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Код"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Төлөвлөлтийн мөрүүд"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Хийгдсэн"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Төлөвлөлт хэрэглэгчээр (өдөрөөр)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Төлөвлөлтийн статистик"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Нээх"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Төлөвлөлт хэрэглэгчээр"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Мэдээлэл"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Ажлын өдөрууд"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Дахин идэвхжүүлэх"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+msgid "Responsible"
+msgstr "Хариуцагч"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Төлөвлөлтийн статистик"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Даалгавруудын хуваарилагдсан хугацаа"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Товчоо хэрэглэгчээр"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Даалгаваргүй Хугацааны Хуваарилалтын Дүн"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Амралт, чөлөө"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr "Даалгавруудад Хуваарилагдсан Нийт Хугацаа"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Дуусах огноо"
+
+#. module: project_planning
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Компаний нэр үл давхцах байх ёстой !"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr "Үлдсэн даалгаврууд"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Төслөөрх товчоо"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr "Хариуцагч :"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr "]"
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Төлөвлөлтийн Хугацааны Нэгж"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Төлөвлөлтийн Даалгаврууд"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Менежер"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr "Даалгаварт хуваарилагдсан хугаануудын нийлбэр өдөрөөр."
+
+#~ msgid "Miscelleanous"
+#~ msgstr "Бусад"
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
new file mode 100644
index 00000000000..e3056d29d96
--- /dev/null
+++ b/addons/project_timesheet/i18n/mn.po
@@ -0,0 +1,449 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-24 16:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
+msgid ""
+"You will find here all works made on tasks that you can invoice.\n"
+"In order to invoice the time spent on a project, you must define the\n"
+"pricelist and the field 'Invoice Task Work' on the tab 'Billing' of\n"
+"the project form."
+msgstr ""
+"Нэхэмжилж болох даалгаврууд дээр хийсэн ажлыг та энд харна.\n"
+"Даалгавар дээр зарцууслан хугацааг нэхэмжлэхийн тулд үнийн хүснэгтийг "
+"тодорхойлох ёстой бөгөөд төслийн формын 'Төлбөр, тооцоо' хавтас дээр "
+"нэхэмжлэх даалгавруудыг тохируулах ёстой."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:55
+#, python-format
+msgid "No employee defined for user \"%s\". You must create one."
+msgstr ""
+"\"%s\" хэрэглэгчид ажилчин тодохойлогдоогүй байна. Тодорхойлох хэрэгтэй."
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:63
+#, python-format
+msgid ""
+"No journal defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+"Холбогдох ажилтанд журнал тодорхойлогдоогүй байна.\n"
+"Ажилтны формын цагийн хуваарь хавтасыг бөглө."
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_timesheettask0
+msgid "Timesheet task"
+msgstr "Цагийн хуваарийн даалгавар"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group by year of date"
+msgstr "Жилийн өдрөөр бүлэглэх"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task Hours in current month"
+msgstr "Энэ сар дахь даалгаврын цаг"
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
+
+#. module: project_timesheet
+#: field:project.task.work,hr_analytic_timesheet_id:0
+msgid "Related Timeline Id"
+msgstr "Холбогдох Цагийн Шугамын ID"
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Tasks by User"
+msgstr "Даалгавар Хэрэглэгчээр"
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task_work
+msgid "Project Task Work"
+msgstr "Төслийн Даалгаврын Ажил"
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:231
+#, python-format
+msgid ""
+"You cannot delete a partner which is assigned to project, we suggest you to "
+"uncheck the active box!"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "October"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Timesheet/Task hours Report Per Month"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Billable"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
+msgid ""
+"You will find here the contracts related to your customer projects in order "
+"to track the invoicing progress."
+msgstr ""
+
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Analytic account/project"
+msgstr ""
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,year:0
+msgid "Year"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
+msgid "Customer Projects"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "August"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
+msgid "Task invoice"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_taskwork0
+msgid "Task Work"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
+msgid "Timesheet Lines"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:231
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Billable Project"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
+msgid "Contracts to Renew"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Group by month of date"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks Work"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,name:0
+msgid "Date"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "July"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_timesheettask0
+msgid "Complete Your Timesheet."
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task Hours in current year"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Customer"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_taskwork0
+msgid "Work on task"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+msgid "Bill Tasks Works"
+msgstr ""
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,timesheet_hrs:0
+msgid "Timesheet Hours"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_taskencoding0
+msgid "Task encoding"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
+msgid "Task summary is comes into the timesheet line"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "January"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger Invoice"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "November"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid "Task hours of last month"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "March"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_project
+msgid "Project"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:247
+#, python-format
+msgid "Invalid Analytic Account !"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:59
+#, python-format
+msgid ""
+"No product defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:54
+#: code:addons/project_timesheet/project_timesheet.py:58
+#: code:addons/project_timesheet/project_timesheet.py:62
+#: code:addons/project_timesheet/project_timesheet.py:69
+#, python-format
+msgid "Bad Configuration !"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing
+msgid "Invoicing"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:247
+#, python-format
+msgid ""
+"You cannot select a Analytic Account which is in Close or Cancelled state"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "September"
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "December"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
+msgid "After task is completed, Create its invoice."
+msgstr ""
+
+#. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "June"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
+msgstr ""
+
+#. module: project_timesheet
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
+msgid "My Timesheet"
+msgstr ""
+
+#. module: project_timesheet
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: project_timesheet
+#: view:project.project:0
+msgid "Invoice Task Work"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:70
+#, python-format
+msgid ""
+"No product and product category property account defined on the related "
+"employee.\n"
+"Fill in the timesheet tab of the employee form."
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
+#: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
+#: view:report.timesheet.task.user:0
+msgid "Task Hours Per Month"
+msgstr ""
+
+#. module: project_timesheet
+#: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
+msgid "Fill Timesheet"
+msgstr ""
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 0a485470bc7..8b6aa992366 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -70,8 +70,7 @@
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Member"]' position='after'>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+                   <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
         </record>
@@ -81,9 +80,9 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                     <field name="account_id" position="replace">
-                    <field name="account_id" string="Analytic account/project" />
-                </field>
+                 <field name="account_id" position="replace">
+                     <field name="account_id" string="Analytic account/project"/>
+                 </field>
             </field>
          </record>
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index b1ba9b8672e..66633fe8ad8 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -29,33 +29,20 @@
             <field name="model">report.timesheet.task.user</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Tasks by User">
-            		<group>
-                        <filter icon="terp-go-year" string="Year"
-                            name="year"
-                            domain="[('name','&lt;=', time.strftime('%%Y-%%m-%%d')),('name','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Task Hours in current year"/>
+                <search string="Tasks by User">
+                    <group>
+                        <field name="name" string="Date"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                            name="month"
-                            domain="[('name','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task Hours in current month"/>
-                        <filter icon="terp-go-month"
-                            string=" Month-1 "
-                            domain="[('name','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('name','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Task hours of last month"/>
-	            		<separator orientation="vertical"/>
 	                    <field name="user_id"/>
-                	</group>
-                	<newline/>
-                	<group expand="1" string="Group By...">
-                	    <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                        <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-
-            	</search>
+                </search>
             </field>
         </record>
 
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index f7b5d0a3736..c76defe468f 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -2,11 +2,6 @@
 <openerp>
     <data>
 
-        <menuitem
-            id="menu_purchase_deshboard"
-            name="Purchase"
-            parent="base.menu_reporting_dashboard" sequence="5"/>
-
         <record id="purchase_draft" model="ir.actions.act_window">
             <field name="name">Request for Quotations</field>
             <field name="type">ir.actions.act_window</field>
@@ -16,14 +11,6 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="context">{'quotation_only': True}</field>
         </record>
-        <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_order','&gt;',time.strftime('%Y-01-01 00:00:00')),('date_order','&lt;',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
-        </record>
 
         <record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
             <field name="name">purchase.order.monthly.categ.tree</field>
@@ -69,19 +56,6 @@
             <field name="domain">[('state','in',('approved','except_picking','except_invoice','done'))]</field>
             <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
         </record>
-        <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_purchase_order_monthly_categ_tree"/>
-            <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-        </record>
-        <record id="open_view_purchase_order_monthly_categ_graph" model="ir.actions.act_window.view">
-                <field eval="1" name="sequence"/>
-                <field name="view_mode">graph</field>
-                <field name="view_id" ref="view_purchase_order_monthly_categ_graph"/>
-                <field name="act_window_id" ref="action_purchase_order_monthly_categ_graph"/>
-        </record>
-
 
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
@@ -102,19 +76,19 @@
         </record>
 
         <record id="open_board_purchase" model="ir.actions.act_window">
-            <field name="name">Purchase Dashboard</field>
+            <field name="name">Purchases</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="usage">menu</field>
             <field name="view_id" ref="board_purchase_form"/>
         </record>
-        <menuitem
-            action="open_board_purchase"
-            icon="terp-graph"
-            id="menu_board_purchase"
-            parent="menu_purchase_deshboard"
-            sequence="4"/>
+
+        <menuitem action="open_board_purchase"
+                  icon="terp-graph"
+                  id="menu_board_purchase"
+                  parent="base.menu_reporting_dashboard"
+                  sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index b7245862172..7d8c7edbbad 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-18 23:05+0000\n"
+"PO-Revision-Date: 2012-06-21 23:39+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-21 05:16+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -27,7 +27,7 @@ msgstr "買い手は仕入先に送られる前に見積依頼（RFQ）を承認
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr "制御のために入ってくる製品"
+msgstr "制御のための入庫製品"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
@@ -355,12 +355,12 @@ msgstr "請求書行"
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr "入ってくる製品"
+msgstr "入庫製品"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr "出て行く製品"
+msgstr "出庫製品"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1037,7 +1037,7 @@ msgstr "これは請求書は既に支払われたことを意味しています
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr "請求するための出て行く製品"
+msgstr "請求するための出庫製品"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1179,7 +1179,7 @@ msgstr "この発注オーダーはキャンセルできません。"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr "入ってくる製品を追跡するために集荷リストが作成されます。"
+msgstr "入庫製品を追跡するために集荷リストが作成されます。"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5c107d984ce..0d39f9b7388 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -70,6 +70,7 @@
           parent="base.menu_purchase_root" sequence="6"/>
 
     <record id="action_invoice_pending" model="ir.actions.act_window">
+        <field name="name">Based on Draft Invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,graph</field>
@@ -77,10 +78,14 @@
         <field name="domain">[('type','=','in_invoice')]</field>
         <field name="context">{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
         <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it.</field>
+            <field name="help">
+                Use this menu to control the invoices to be received from your supplier.
+                OpenERP generates draft invoices from your purchase orders or receptions, according to your settings.
+                Once you receive a supplier invoice, you can match it with the draft invoice and validate it.
+            </field>
     </record>
 
-     <menuitem name="Based on draft invoices"
+     <menuitem name="Based on Draft Invoices"
           id="menu_procurement_management_pending_invoice"
           action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
@@ -194,7 +199,7 @@
                                 <group string="Invoice Control">
                                     <field name="invoice_method"/>
                                     <field name="fiscal_position" widget="selection"/>
-                                    <field name="invoiced"/>
+                                    <field name="invoiced" groups="base.group_no_one"/>
                                 </group>
                                 <group groups="base.group_no_one" string="Purchase Control">
                                     <field name="validator"/>
@@ -220,27 +225,26 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase order which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]"  help="Approved purchase order"/>
+                    <field name="name" string="Reference"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
-                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"  help="Purchase order which are in the exception state"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase order which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" help="Approved purchase order"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -253,27 +257,26 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]"  help="Purchase orders which are in draft state"/>
-                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]"  help="Approved purchase orders"/>
+                    <field name="name" string="Reference"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"  help="Purchase orders that include lines not invoiced."/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
+                    <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator orientation="vertical"/>
-                    <field name="name" string="Reference"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                 </group>
                 <newline/>
-                  <group expand="0" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-
                 </group>
               </search>
             </field>
@@ -308,7 +311,15 @@
             <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
+            <field name="help">
+                Create a request for quotation when you want to buy products from a supplier.
+                You can also use this menu to review requests for quotation created automatically
+                (based on logistic rules, like minimum stock, MTO, etc.)
+                &lt;p&gt;
+                Once confirmed, a request for quotation becomes a purchase order.
+                In the Purchase Settings, you can select the way to control supplier invoicing:
+                based on the order, based on receptions, or manual.
+            </field>
         </record>
         <menuitem action="purchase_rfq" id="menu_purchase_rfq"
             parent="menu_procurement_management"
@@ -319,7 +330,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
+            <field name="context">{'search_default_approved': 1}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
         </record>
@@ -443,9 +454,9 @@
                     <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
-                        <field name="partner_id"  string="Supplier"/>
+                        <field name="partner_id" string="Supplier"/>
                     </group>
-                        <newline/>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -476,14 +487,18 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Based on Purchase Order lines</field>
+            <field name="name">Based on Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="purchase_order_line_search"/>
-            <field name="help">If you set the Invoicing Control on a purchase order as "Based on Purchase Order lines", you can track here all the purchase order lines for which you have not yet received the supplier invoice. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
+            <field name="help">
+                Here you can track all the lines of purchase orders where the invoicing is "Based on Purchase Order Lines",
+                and for which you have not received a supplier invoice yet.
+                You can generate a draft supplier invoice based on the lines from this list.
+            </field>
         </record>
         <record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 2837b5e7ab6..4cf91053666 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,32 +53,18 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
-            <group>
-                <filter icon="terp-go-year" string="Year"
-                name="year"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                help="Order in current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Order in  current month"/>
-                <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Order in last month"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-document-new"
-                        string="Quotations"
-                        name="quotes"
-                        domain="[('state','=','draft')]"/>
-                <filter icon="terp-gtk-jump-to-rtl"
-                        string="Orders"
-                        name="orders"
-                        domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                <separator orientation="vertical"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
+                <group>
+                    <filter icon="terp-document-new"
+                            string="Quotations"
+                            name="quotes"
+                            domain="[('state','=','draft')]"/>
+                    <filter icon="terp-gtk-jump-to-rtl"
+                            string="Orders"
+                            name="orders"
+                            domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="partner_id"/>
+                    <field name="product_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index d4baa2d6099..23914769c0d 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -40,6 +40,9 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("Manage Different Units of Measure for Products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
+        'group_purchase_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice",
+            implied_group='purchase.group_delivery_invoice_address',
+            help="Allows you to specify different delivery and invoice addresses on a purchase order."),
         'module_purchase_analytic_plans': fields.boolean('Use Multiple Analytic Accounts on Purchases',
             help ="""Allows the user to maintain several analysis plans. These let you split
                 lines on a purchase order between several accounts and analytic plans.
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c7765e756c6..e7be392b0c2 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -19,6 +19,7 @@
                         <separator string="Purchase Order" colspan="4"/>
                         <field name="group_purchase_pricelist"/>
                         <field name="group_uom"/>
+                        <field name="group_purchase_delivery_address"/>
                         <field name="module_purchase_double_validation"/>
                         <field name="module_purchase_requisition"/>
                         <field name="module_warning"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index d3033a37a70..26a4aa14f1c 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -14,6 +14,11 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
+    <record id="group_delivery_invoice_address" model="res.groups">
+        <field name="name">Addresses in Purchase Orders</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting for Purchases</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 3abf56c9ec4..df6ba9531f3 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -65,22 +65,20 @@
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <group col="8" colspan="4">
+                        <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available"
                             domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
                         <filter icon="terp-dialog-close" name="done" string="Received"
                             domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders"
                             domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar"
                             domain="[('invoice_state', '=', '2binvoiced')]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>                    
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
                         <separator orientation="vertical"/>
@@ -100,7 +98,7 @@
         </record>
  
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Bases on incoming shipments</field>
+            <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -108,7 +106,11 @@
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
-            <field name="help">If you set the Invoicing Control on a purchase order as "Bases on incoming shipments", you can track here all the product receptions and create invoices for those receptions.</field>
+            <field name="help">
+                Here you can track all the product receptions of purchase orders where the invoicing is "Based on Incoming Shipments",
+                and for which you have not received a supplier invoice yet.
+                You can generate a supplier invoice based on those receptions.
+            </field>
        </record>
 
         <menuitem action="action_picking_tree4_picking_to_invoice"
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 2e65e62a003..f06f05608cc 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -133,13 +133,14 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group>
+                    <field name="name" string="Purchase Requisition"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                     <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                     <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_id" />
                     <field name="exclusive" />
                 </group>
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index 7a8c85fbf1d..0df7182c8c0 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-18 22:05+0000\n"
+"PO-Revision-Date: 2012-06-21 15:07+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-19 04:54+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -81,7 +81,7 @@ msgstr "Skatter:"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index b069fd159ee..c481296196c 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -100,13 +100,9 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group>
-                        <filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="month"/>
-                        <field name="code"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
                         <field name="intrastat_id"/>
+                        <field name="month"/>
                         <field name="type"/>
                     </group>
                 </search>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4da1a465c42..20c1251c771 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -11,12 +11,13 @@
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <group>
+                       <field name="name" string="Resource"/>
+                       <separator orientation="vertical"/>
                        <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',False)]"/>
                        <separator orientation="vertical"/>
-                       <field name="name"/>
                        <field name="user_id" string="User"/>
-                       <field name="resource_type"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="resource_type"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -39,7 +40,8 @@
             <field name="arch" type="xml">
                 <search string="Search Working Time">
                    <group>
-                       <field name="name" string="Name"/>
+                       <field name="name" string="Working Time"/>
+                       <separator orientation="vertical"/>
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -55,6 +57,7 @@
                 <search string="Search Working Period Leaves">
                    <group>
                        <field name="name" string="Reason"/>
+                       <separator orientation="vertical"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Period" widget="selection"/>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index b0d14ba2971..c989beba2d4 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Sale user dashboard -->
+        <!-- Sales dashboard -->
         <record id="action_quotation_for_sale" model="ir.actions.act_window">
             <field name="name">My Quotations</field>
             <field name="res_model">sale.order</field>
@@ -15,7 +15,6 @@
             <field name="name">turnover.by.month.tree</field>
             <field name="model">account.invoice.report</field>
             <field name="type">tree</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
             <field name="priority" eval="32"/>
             <field name="arch" type="xml">
                 <tree string="Monthly Turnover">
@@ -27,16 +26,16 @@
         <record id="view_turnover_by_month_graph" model="ir.ui.view">
             <field name="name">turnover.by.month.graph</field>
             <field name="model">account.invoice.report</field>
-            <!-- Lower priority to avoid conflicting with default accounting views for reports -->
             <field name="priority" eval="32"/>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-            <graph string="Monthly Turnover" type="bar">
-                <field name="month"/>
-                <field name="price_total" operator="+"/>
-            </graph>
+                <graph string="Monthly Turnover" type="bar">
+                    <field name="month"/>
+                    <field name="price_total" operator="+"/>
+                </graph>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_turnover_by_month">
             <field name="name">Monthly Turnover</field>
             <field name="res_model">account.invoice.report</field>
@@ -45,17 +44,6 @@
             <field name="view_id" ref="view_turnover_by_month_graph"/>
             <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
             <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
-            <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
-       </record>
-       <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
-            <field name="act_window_id" ref="action_turnover_by_month"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_turnover_by_month_graph"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
-            <field name="act_window_id" ref="action_turnover_by_month"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_turnover_by_month_tree"/>
         </record>
 
         <record id="board_sales_form" model="ir.ui.view">
@@ -75,6 +63,7 @@
                 </form>
             </field>
         </record>
+
         <record id="open_board_sales" model="ir.actions.act_window">
             <field name="name">Sales</field>
             <field name="res_model">board.board</field>
@@ -82,37 +71,12 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_form"/>
         </record>
-        
-        <menuitem id="menu_dashboard_sales" name="Sales"  sequence="20" parent="base.menu_reporting_dashboard"/>
-        <menuitem action="open_board_sales" icon="terp-graph" groups="base.group_sale_salesman"  id="menu_board_sales" parent="menu_dashboard_sales" sequence="1"/>
 
-        <!-- Sale manager dashboard -->
-        <record id="board_sales_manager_form" model="ir.ui.view">
-            <field name="name">board.sales.manager.form</field>
-            <field name="model">board.board</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard" layout="manual" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
-                            <action name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
-                        </column>
-                        <column>
-                            <action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
-                            <action name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
-                            <action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
-                        </column>
-                    </board>
-                </form>
-            </field>
-        </record>
-        <record id="open_board_sales_manager" model="ir.actions.act_window">
-            <field name="name">Sales Manager</field>
-            <field name="res_model">board.board</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="board_sales_manager_form"/>
-        </record>
+        <menuitem id="menu_dashboard_sales"
+                  sequence="15"
+                  parent="base.menu_reporting_dashboard"
+                  action="open_board_sales"
+                  groups="base.group_sale_salesman"/>
+
     </data>
 </openerp>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 4b3647a5ac2..8eb4fc85ce6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -51,18 +51,8 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Sales order created in current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Sales order created in current month"/>
-                    <filter icon="terp-go-month"
-                         string="Month-1"
-                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                         help="Sales order created in last month"/>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Quotations"
@@ -70,28 +60,23 @@
                     <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver"
                         string="Picked"
                         domain="[('shipped','=',True)]"/>
+                    <filter icon="terp-personal"
+                        string="My Sales"
+                        help="My Sales"
+                        domain="[('user_id','=',uid)]"/>
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
-                    <field name="user_id">
-                        <filter icon="terp-personal"
-                            string="My Sales"
-                            help="My Sales"
-                            domain="[('user_id','=',uid)]"/>
-                    </field>
+                    <field name="user_id"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
                     <field name="shop_id" widget="selection"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date"/>
-                    <field name="date_confirm"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -131,130 +116,5 @@
     <menuitem id="base.next_id_64" name="Sales" parent="base.menu_reporting" sequence="1" groups="base.group_sale_manager"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="10"/>
 
-    <!--This views used in board_sale module -->
-    <record id="view_sales_by_partner_graph" model="ir.ui.view">
-         <field name="name">sales.by.partner.graph</field>
-         <field name="model">sale.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Sales by Partner" type="bar">
-                 <field name="partner_id" />
-                 <field name="price_total" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-   <record id="action_sales_by_partner" model="ir.actions.act_window">
-        <field name="name">Sales per Customer in last 90 days</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','=','done'),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-        <field name="view_id" ref="view_sales_by_partner_graph"/>
-        <field name="context">{'search_default_Customer':1}</field>
-    </record>
-
-    <record id="view_sales_by_salesman_graph" model="ir.ui.view">
-         <field name="name">sales.by.salesman.graph</field>
-         <field name="model">sale.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Sales by Salesman" type="bar">
-                 <field name="user_id" />
-                 <field name="price_total" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-   <record id="action_sales_by_salesman" model="ir.actions.act_window">
-        <field name="name">Sales by Salesman in last 90 days</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','in',('manual','progress','done')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-        <field name="view_id" ref="view_sales_by_salesman_graph"/>
-        <field name="context">{'search_default_User':1}</field>
-    </record>
-
-    <record id="view_sales_product_total_price_graph" model="ir.ui.view">
-         <field name="name">sold.product.total.price.graph</field>
-         <field name="model">sale.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Sales by Product Category" type="bar">
-                 <field name="categ_id" />
-                 <field name="price_total" operator="+"/>
-             </graph>
-         </field>
-    </record>
-
-   <record id="action_sales_product_total_price" model="ir.actions.act_window">
-        <field name="name">Sales by Product's Category in last 90 days</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
-        <field name="domain">[('state','in',('manual','progress','done')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
-        <field name="view_id" ref="view_sales_product_total_price_graph"/>
-        <field name="context">{'search_default_Category':1}</field>
-    </record>
-
-    <record id="view_sales_by_month_tree" model="ir.ui.view">
-        <field name="name">view.sales.by.month.tree</field>
-        <field name="model">sale.report</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Sales By Month">
-                <field name="month" />
-                <field name="product_id" />
-                <field name="price_total" />
-                <field name="user_id" invisible="1"/>
-                <field name="partner_id" invisible="1"/>
-                <field name="product_uom" invisible="1"/>
-                <field name="categ_id" invisible="1"/>
-                <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
-                <field name="state" invisible="1"/>
-                <field name="shop_id" invisible="1"/>
-                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                <field name="day" invisible="1"/>
-                <field name="year" invisible="1"/>
-                <field name="date" invisible="1"/>
-            </tree>
-        </field>
-    </record>
-    <record id="action_view_sales_by_month" model="ir.actions.act_window">
-        <field name="name">Sales by Month</field>
-        <field name="res_model">sale.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="domain">[('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))]</field>
-        <field name="context">{'search_default_order_month':1,'group_by_no_leaf':0,'group_by':['month', 'product_id']}</field>
-        <field name="view_id" ref="view_sales_by_month_tree"/>
-    </record>
-
-     <record id="view_top_quotations_tree" model="ir.ui.view">
-            <field name="name">sale.top.quotations.tree</field>
-            <field name="model">sale.order</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Quotations">
-                    <field name="date_order"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" />
-                    <field name="amount_untaxed" />
-                    <field name="amount_total"/>
-                </tree>
-            </field>
-        </record>
-
-    <record id="action_quotation_for_sale" model="ir.actions.act_window">
-        <field name="name">Quotations</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft')]</field>
-          <field name="view_id" ref="view_top_quotations_tree"/>
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index aee5ab0f112..2b9deddb76c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -217,12 +217,12 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer" colspan="2" name="sale_total">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <separator string="Notes"/>
+                            <separator string="Notes" class="oe_clear"/>
                             <field name="note" placeholder="Add a global note on the sale order..."/>
                         </page>
                         <page string="Other Information">
@@ -287,17 +287,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
+                    <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+                    <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <separator orientation="vertical"/>
-                    <field name="name"
-                        filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
                     <field name="partner_id"/>
-                    <field name="user_id">
-                        <filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>
-                    </field>
+                    <field name="user_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -455,13 +453,12 @@
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
@@ -481,16 +478,14 @@
                 <search string="Search Uninvoiced Lines">
                     <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" name="sale_order_done" help="Sale order lines done"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" string="Shipped" domain="[('state','=','done')]" name="unshipped" help="Sale Order Lines that are in 'done' state"/>
                     <filter icon="terp-dolar_ok!" string="Uninvoiced" name="uninvoiced" domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]" help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"/>
+                    <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id">
-                        <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
-                    </field>
+                    <field name="salesman_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 60ef80db245..8a5f56181c2 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -35,13 +35,15 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="after">
-                    <field name="section_id" widget="selection" string="Sales Team">
-                        <filter icon="terp-personal+"
-                                domain="[('section_id.user_id','=',uid)]"
-                                help="My Sales Team(s)"/>
-                    </field>
-                </field>
+                <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
+                    <filter string="My Sales Team(s)"
+                        icon="terp-personal+"
+                        domain="[('section_id.user_id','=',uid)]"
+                        help="My Sales Team(s)"/>
+                </xpath>
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="section_id" widget="selection" string="Sales Team"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 05c46fb2618..f46b4e56ac7 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,12 +8,12 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@class='oe_subtotal_footer']" position="inside">
+            <xpath expr="//group[@name='sale_total']" position="inside">
                 <field name="margin"/>
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line">
         <field name="name">sale.order.line.margin.view.form</field>
         <field name="type">form</field>
@@ -25,7 +25,7 @@
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line_form">
         <field name="name">sale.order.line.tree.margin.view.form</field>
         <field name="type">form</field>
@@ -37,7 +37,7 @@
             </xpath>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="sale_margin_sale_order_tree">
         <field name="name">sale.order.margin.view.tree</field>
         <field name="type">tree</field>
@@ -49,7 +49,7 @@
             </field>
         </field>
     </record>
-   
+
     <record model="ir.ui.view" id="sale_margin_sale_order_line_tree">
         <field name="name">sale.order.margin.line.view.tree</field>
         <field name="type">tree</field>
@@ -60,7 +60,7 @@
                 <field name="margin"/>
             </field>
         </field>
-    </record>    
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/share/i18n/ja.po b/addons/share/i18n/ja.po
new file mode 100644
index 00000000000..0db52a2c09e
--- /dev/null
+++ b/addons/share/i18n/ja.po
@@ -0,0 +1,521 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-21 21:29+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: share
+#: field:share.wizard,embed_option_title:0
+msgid "Display title"
+msgstr "タイトルの表示"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access granted!"
+msgstr "アクセスは承認されました。"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Sharing method"
+msgstr "共有方法"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share with these People (one e-mail per line)"
+msgstr "人々と共有（行毎に１つのEメール）"
+
+#. module: share
+#: field:share.wizard,name:0
+msgid "Share Title"
+msgstr "タイトルの共有"
+
+#. module: share
+#: model:ir.module.category,name:share.module_category_share
+msgid "Sharing"
+msgstr "共有"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Share Access URL"
+msgstr "URLアクセス共有"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:782
+#, python-format
+msgid "You may use your current login (%s) and password to view them.\n"
+msgstr "表示のために現在のログイン %s とパスワードが使用できます。\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:601
+#, python-format
+msgid "(Modified)"
+msgstr "（修正済）"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:769
+#, python-format
+msgid ""
+"The documents are not attached, you can view them online directly on my "
+"OpenERP server at:"
+msgstr "ドキュメントは添付されていません。このOpenERPのサーバにてオンラインで直接参照できます："
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:579
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr "ユーザ %s（%s）、グループ %s により作成された共有フィルタ"
+
+#. module: share
+#: field:share.wizard,embed_url:0 field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "共有URL"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:776
+#, python-format
+msgid "These are your credentials to access this protected area:\n"
+msgstr "これはこの保護領域にアクセスするためのあなたの資格証明です：\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:643
+#, python-format
+msgid "You must be a member of the Share/User group to use the share wizard"
+msgstr "共有ウィザードを使うためには、あなたは共有 / ユーザグループのメンバーである必要があります。"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "アクセス情報"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share"
+msgstr "共有"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:551
+#, python-format
+msgid "(Duplicated for modified sharing permissions)"
+msgstr "（共有許可の変更のために複製されました）"
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "さらに上位のデータ共有のためのオプションのドメイン"
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同じログインでは２つのユーザを持てません。"
+
+#. module: share
+#: model:ir.model,name:share.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "次へ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:777
+#, python-format
+msgid "Username"
+msgstr "ユーザ名"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing Options"
+msgstr "共有オプション"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:765
+#, python-format
+msgid "Hello,"
+msgstr "こんにちは、"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:640
+#, python-format
+msgid "Action and Access Mode are required to create a shared access"
+msgstr "共有アクセスを作成するためにアクションとアクセスモードが要求されます。"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr "共有したいデータを含む画面を開くアクションを選択して下さい。"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:781
+#, python-format
+msgid ""
+"The documents have been automatically added to your current OpenERP "
+"documents.\n"
+msgstr "ドキュメントは現在のOpenERPドキュメントに自動的に加えられました。\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "共有グループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid "Email required"
+msgstr "Eメールは必須"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr "オプションとして、共有データに適用する追加のドメイン制限を指定できます。"
+
+#. module: share
+#: help:share.wizard,name:0
+msgid "Title for the share (displayed to users as menu and shortcut name)"
+msgstr "共有のタイトル（メニューとショートカット名としてユーザに表示）"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "通常のグループのみ（非共有グループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:787
+#, python-format
+msgid ""
+"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
+"Sales, HR, etc.)\n"
+"It is open source and can be found on http://www.openerp.com."
+msgstr ""
+"OpenERPはパワフルでユーザフレンドリーなビジネスアプリケーション（CRM、販売、HRなど）スイートです。\n"
+"これはオープンソースです。http://www.openerp.com にアクセスして下さい。"
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "共有するためのアクション"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Optional: include a personal message"
+msgstr "オプション：個人的なメッセージを含む"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "共有ユーザ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:647
+#, python-format
+msgid "Please indicate the emails of the persons to share with, one per line"
+msgstr "共有する人のEメールを１人１行で表してください。"
+
+#. module: share
+#: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr "グループは一部のユーザとデータ共有のアクセス権を設定するために作成されます。"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr "共有したいデータを含む画面を開くアクション"
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:526
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "（共有のためにコピー）"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "新規に作成されました。"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:616
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr "ユーザ%s（%s） グループ %s により作成された間接的共有フィルタ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:767
+#, python-format
+msgid "I've shared %s with you!"
+msgstr "%s を共有しました。"
+
+#. module: share
+#: help:share.wizard,share_root_url:0
+msgid "Main access page for users that are granted shared access"
+msgstr "共有アクセスが許されたユーザのためのメインアクセスページ"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "グループ名は一意である必要があります。"
+
+#. module: share
+#: model:res.groups,name:share.group_share_user
+msgid "User"
+msgstr "ユーザ"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "グループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:636
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+"残念ですが、共有しようとしている現在の画面とフィルタは現時点ではサポートされていません。\n"
+"単純なフィルタを試して下さい。"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Use this Link"
+msgstr "このリンクを使用"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:779
+#, python-format
+msgid "Database"
+msgstr "データベース"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "ドメイン"
+
+#. module: share
+#: view:share.wizard:0 field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:493
+#, python-format
+msgid "Copied access for sharing"
+msgstr "共有のためのアクセスをコピーしました。"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+msgid "Share your documents"
+msgstr "ドキュメントの共有"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Or insert the following code where you want to embed your documents"
+msgstr "またはドキュメントを埋め込みたい場所に、次のコードを挿入します。"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"An e-mail notification with instructions has been sent to the following "
+"people:"
+msgstr "指示によるEメール通知は次の人々に送信されました："
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr "データ共有をしたいユーザのタイプを選択します。"
+
+#. module: share
+#: field:share.wizard,view_type:0
+msgid "Current View Type"
+msgstr "現在のビュータイプ"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can view"
+msgstr "表示可能"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can edit"
+msgstr "編集可能"
+
+#. module: share
+#: help:share.wizard,message:0
+msgid ""
+"An optional personal message, to be included in the e-mail notification."
+msgstr "Eメール通知に含まれるオプションの個人的なメッセージ"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:60
+#: code:addons/share/wizard/share_wizard.py:635
+#, python-format
+msgid "Sharing access could not be created"
+msgstr "共有アクセスは作成されませんでした。"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr "データ共有の目的のためだけに作成されたアクセス制限のある外部ユーザ"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "共有ウィザード"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:740
+#, python-format
+msgid "Shared access created!"
+msgstr "共有アクセスは作成されました。"
+
+#. module: share
+#: model:res.groups,comment:share.group_share_user
+msgid ""
+"\n"
+"Members of this groups have access to the sharing wizard, which allows them "
+"to invite external users to view or edit some of their documents."
+msgstr ""
+"\n"
+"このグループのメンバーは共有ウィザードにアクセスして、彼らのドキュメントの一部を表示や編集する外部ユーザを招待することができます。"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "Access Groups"
+msgstr "アクセスグループ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:778
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "パスワード"
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "Emails"
+msgstr "Eメール"
+
+#. module: share
+#: field:share.wizard,embed_option_search:0
+msgid "Display search view"
+msgstr "検索ビューを表示"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:197
+#, python-format
+msgid "No e-mail address configured"
+msgstr "Eメールアドレスが設定されていません。"
+
+#. module: share
+#: field:share.wizard,message:0
+msgid "Personal Message"
+msgstr "個人的メッセージ"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:763
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr "現ユーザは外部Eメールを送信するために、ユーザ設定でEメールアドレスを設定する必要があります。"
+
+#. module: share
+#: field:share.wizard.result.line,login:0
+msgid "Login"
+msgstr "ログイン"
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "一般ユーザのみ（共有ユーザを含まない）"
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "アクセスモード"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing: preparation"
+msgstr "共有操作"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:198
+#, python-format
+msgid ""
+"You must configure your e-mail address in the user preferences before using "
+"the Share button."
+msgstr "共有ボタンを使う前に、ユーザ設定の中のEメールアドレスを設定する必要があります。"
+
+#. module: share
+#: help:share.wizard,access_mode:0
+msgid "Access rights to be granted on the shared documents."
+msgstr "共有ドキュメント上に生成されたアクセス権"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:8
+msgid "Link or embed..."
+msgstr "リンクまたは埋め込み"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
+msgid "Share with..."
+msgstr "共有先"
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 52e154c1667..defbc522340 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -7,11 +7,13 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/field[@name='company_ids']" position="after">
-                    <field name="share">
-                        <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                <xpath expr="//field[@name='name']" position="after">
+                    <separator orientation="vertical"/>
+                    <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                </xpath>
+                <xpath expr="//field[@name='company_ids']" position="after">
+                    <field name="share"/>
                 </xpath>
             </field>
         </record>
@@ -29,11 +31,12 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Groups">
-                    <field name="name"/>
-                    <field name="share">
-                        <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
-                            domain="[('share','=',False)]"/>
-                    </field>
+                    <field name="name" string="Group"/>
+                    <separator orientation="vertical"/>
+                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
+                        domain="[('share','=',False)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="share"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 9fab20c9643..1c416287e84 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+        <record id="view_stock_graph_board" model="ir.ui.view">
+            <field name="name">report.stock.move.graph</field>
+            <field name="model">report.stock.move</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Moves Analysis" type="bar">
+                    <field name="day"/>
+                    <field name="product_qty" operator="+"/>
+                    <field name="categ_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="action_incoming_product_board" model="ir.actions.act_window">
             <field name="name">Incoming Shipments</field>
             <field name="res_model">stock.move</field>
@@ -27,7 +41,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
-            <field name="view_id" ref="stock.view_stock_graph_board"></field>
+            <field name="view_id" ref="view_stock_graph_board"></field>
             <field name="context">{'search_default_in':1}</field>
          </record>
         <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
@@ -36,7 +50,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
-            <field name="view_id" ref="stock.view_stock_graph_board"></field>
+            <field name="view_id" ref="view_stock_graph_board"></field>
             <field name="context">{'search_default_out':1}</field>
          </record>
         <record id="board_warehouse_form" model="ir.ui.view">
@@ -61,16 +75,18 @@
         </record>
 
         <record id="open_board_warehouse" model="ir.actions.act_window">
-            <field name="name">Warehouse Dashboard</field>
+            <field name="name">Warehouse</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_warehouse_form"/>
         </record>
 
-        <menuitem id="menu_board_warehouse" parent="base.menu_reporting_dashboard" action="open_board_warehouse" sequence="20" groups="group_stock_manager"/>
-        <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" groups="group_stock_manager" sequence="5"/>
-
+        <menuitem   id="menu_board_warehouse" 
+                    parent="base.menu_reporting_dashboard" 
+                    action="open_board_warehouse" 
+                    sequence="25" 
+                    groups="group_stock_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
new file mode 100644
index 00000000000..d73bbf6d106
--- /dev/null
+++ b/addons/stock/i18n/ja.po
@@ -0,0 +1,4034 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-06-24 02:23+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-25 05:14+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr "出庫ロットの追跡"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Stock move Split lines"
+msgstr "行を分割した在庫移動"
+
+#. module: stock
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. This is the default "
+"value for all products in this category. It can also directly be set on each "
+"product"
+msgstr ""
+"リアルタイムで在庫評価を行う場合、元の場所に置かれた特定の評価アカウントがある場合を除き、全ての入庫移動に対応した仕訳帳項目は、このアカウントに記帳されま"
+"す。これはこの分類の全ての製品のデフォルト値です。また、各製品に直接セットすることもできます。"
+
+#. module: stock
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr "固定されている場合、その場所"
+
+#. module: stock
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Put in a new pack"
+msgstr "新しいパックに入れる"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Upstream Traceability"
+msgstr "上流追跡能力"
+
+#. module: stock
+#: model:ir.actions.todo.category,name:stock.category_stock_management_config
+msgid "Stock Management"
+msgstr "在庫管理"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_line_date
+#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
+msgid "Last Product Inventories"
+msgstr "最終製品在庫目録"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr "本日"
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr "リビジョン番号"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Orders processed Today or planned for Today"
+msgstr "本日処理された、または本日予定されたオーダー"
+
+#. module: stock
+#: view:stock.partial.move.line:0 view:stock.partial.picking:0
+#: field:stock.partial.picking,move_ids:0 view:stock.partial.picking.line:0
+#: view:stock.return.picking.memory:0
+msgid "Product Moves"
+msgstr "製品移動"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "UoM Categories"
+msgstr "単位の分類"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr "移動分析"
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr "製造シリアル番号とは異なる場合に備えた内部参照番号"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#, python-format
+msgid "You cannot perform this operation on more than one Stock Inventories."
+msgstr "１つの在庫目録を超えて、この操作の実行はできません。"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"Periodical Inventories are used to count the number of products available "
+"per location. You can use it once a year when you do the general inventory "
+"or whenever you need it, to correct the current stock level of a product."
+msgstr ""
+"定期的な在庫目録は場所ごとの利用可能な製品の数を数えるために使用されます。一般的な棚卸であれば、１年に１回それを使用します。または、製品の現在の在庫レベル"
+"を修正するために必要な時はいつでも使用できます。"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#, python-format
+msgid "Quantity cannot be negative."
+msgstr "数量は交渉不可"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr "集荷リスト"
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: field:report.stock.inventory,product_qty:0
+#: field:report.stock.move,product_qty:0
+#: field:stock.change.product.qty,new_quantity:0
+#: field:stock.inventory.line,product_qty:0
+#: field:stock.inventory.line.split,qty:0
+#: field:stock.inventory.line.split.lines,quantity:0
+#: report:stock.inventory.move:0 field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0 field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0 field:stock.move.split.lines,quantity:0
+#: field:stock.partial.move.line,quantity:0
+#: field:stock.partial.picking.line,quantity:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0 field:stock.report.tracklots,name:0
+#: field:stock.return.picking.memory,quantity:0
+#: field:stock.split.into,quantity:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+msgid ""
+"This is the list of all delivery orders that have to be prepared, according "
+"to your different sales orders and your logistics rules."
+msgstr "これは異なる受注オーダーと物流ルールによる準備しなければならない全ての配達オーダーのリストです。"
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: stock
+#: view:stock.inventory:0 field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0 field:stock.move.split,product_uom:0 view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "UoM"
+msgstr "単位"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr "実在庫"
+
+#. module: stock
+#: field:product.category,property_stock_journal:0 view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
+msgid "Stock journal"
+msgstr "在庫仕訳帳"
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current month"
+msgstr "現在の月"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:222
+#, python-format
+msgid "Unable to assign all lots to this move!"
+msgstr "この移動のために全てを割当できません。"
+
+#. module: stock
+#: code:addons/stock/stock.py:2516
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr "移動番号 %s の一部欠けている集荷データ"
+
+#. module: stock
+#: model:ir.actions.server,name:stock.action_partial_move_server
+msgid "Deliver/Receive Products"
+msgstr "配達 / 受領製品"
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#, python-format
+msgid "You cannot delete any record!"
+msgstr "あなたはどのレコードも削除できません。"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders to invoice"
+msgstr "請求のための配達オーダー"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr "配達オーダーの割当"
+
+#. module: stock
+#: field:stock.partial.move.line,update_cost:0
+#: field:stock.partial.picking.line,update_cost:0
+msgid "Need cost update"
+msgstr "コスト更新が必要"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it '             #                        'for "
+"this product: \"%s\" (id: %d)"
+msgstr ""
+"現在の移動行は既に梱包に割り当てられています。この製品のための番号を本当に変更したい場合は、最初にそれを削除して下さい：%s（ID：%d）"
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr "適用不可"
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr "他の参照またはシリアル番号"
+
+#. module: stock
+#: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
+msgid "Origin"
+msgstr "起点"
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
+msgid "Incoming Products"
+msgstr "入庫製品"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr "非在庫"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: stock
+#: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
+#, python-format
+msgid "Products to Process"
+msgstr "処理する製品"
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr "チェックすると、全製品数量は実際の実在庫を確認するためにゼロに設定されます。"
+
+#. module: stock
+#: view:stock.partial.move:0 view:stock.partial.picking:0
+msgid "_Validate"
+msgstr "検証"
+
+#. module: stock
+#: code:addons/stock/stock.py:1149
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr "在庫移動が完了状態のため集荷のキャンセルはできません。"
+
+#. module: stock
+#: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
+#: code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/wizard/stock_partial_picking.py:141
+#, python-format
+msgid "Warning!"
+msgstr "警告"
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr "パートナ別グループ"
+
+#. module: stock
+#: model:ir.model,name:stock.model_res_partner view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0 view:report.stock.move:0
+#: field:report.stock.move,partner_id:0 view:stock.move:0
+#: field:stock.move,partner_id:0 view:stock.picking:0
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: stock
+#: code:addons/stock/stock.py:2119
+#, python-format
+msgid ""
+"Can not create Journal Entry, Input Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr "この製品に定義された入力アカウントとこの製品の分類の検証アカウントが同一であるため、仕訳帳エントリーを作成できません。"
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "No invoicing"
+msgstr "未請求"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that have been processed"
+msgstr "処理された在庫移動"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Production lot"
+msgstr "製造ロット"
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr "インコタームズのコード"
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr "この梱包のための移動"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments Available"
+msgstr "内部出荷可能"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr "内部の場所"
+
+#. module: stock
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
+msgstr ""
+"（現在の状況を開くには空のままとします。日による全リソースをフィルタするためには、HH:MM:SS形式でFrom日付に00:00:00を、To日付に23："
+"59：59と調整して下さい。）"
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,state:0
+#: view:report.stock.move:0 field:report.stock.move,state:0
+#: view:stock.inventory:0 field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0 view:stock.move:0
+#: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0
+#: report:stock.picking.list:0
+msgid "State"
+msgstr "状態"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr "会計情報"
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr "実在庫値"
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr "遅れ（日数）"
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr "アクション追跡能力 "
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+msgstr "単位"
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 view:stock.move:0
+#: selection:stock.move,state:0 view:stock.picking:0
+#: view:stock.production.lot:0 field:stock.production.lot,stock_available:0
+msgid "Available"
+msgstr "利用可能"
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr "予定日"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_warehouse_form
+msgid ""
+"Create and manage your warehouses and assign them a location from here"
+msgstr "ここから倉庫を作成し管理します。そしてそれらに場所を割り当てます。"
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr "数量"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#, python-format
+msgid "No product in this location."
+msgstr "この場所には製品がありません。"
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr "場所の出力"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr "分割情報"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Internal Locations"
+msgstr "内部の場所"
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr "平均価格の通貨"
+
+#. module: stock
+#: help:product.category,property_stock_valuation_account_id:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr "製品がリアルタイム在庫評価が有効である時、このアカウントは製品の現在価値を保ちます。"
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
+msgid "Location Type"
+msgstr "場所のタイプ"
+
+#. module: stock
+#: help:report.stock.move,type:0 help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr "出荷タイプ。商品が入ってくるのか、出て行くのかを指定します。"
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr "項目ラベル"
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr "移動統計値"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr "製品ロットのフィルタ"
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
+msgid "["
+msgstr "［"
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Production Lot Number available in "
+"company warehouses"
+msgstr "会社の倉庫で利用可能なこの製品のロット番号を含む製品の現在数量"
+
+#. module: stock
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr "移動履歴（子の移動）"
+
+#. module: stock
+#: code:addons/stock/stock.py:2125
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr "この製品あるいはこの分類のために定義された在庫出力アカウントがありません：%s（ID：%d）"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree6
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
+msgid "Internal Moves"
+msgstr "内部移動"
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr "宛先場所"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move_line
+msgid "stock.partial.move.line"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:760
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr "在庫移動なしでは集荷処理はできません。"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr "梱包"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr "オーダー（基点）"
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr "総合計："
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"You will find in this list all products you have to deliver to your "
+"customers. You can process the deliveries directly from this list using the "
+"buttons on the right of each line. You can filter the products to deliver by "
+"customer, products or sale order (using the Origin field)."
+msgstr ""
+"顧客に配達せねばならない全ての製品をこのリストから見つけることができます。このリストの各行の右のボタンを使うことで、配達を直接、処理することが可能です。配"
+"達する製品に対して、顧客、製品、受注（基点項目を使って）によるフィルタができます。"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr "棚卸制御"
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,comment:0
+msgid "Additional Information"
+msgstr "追加情報"
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr "場所 / 製品"
+
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address "
+msgstr "宛先住所 "
+
+#. module: stock
+#: code:addons/stock/stock.py:1333
+#, python-format
+msgid "Reception"
+msgstr "受理"
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr "追加参照"
+
+#. module: stock
+#: view:stock.production.lot.revision:0
+msgid "Production Lot Revisions"
+msgstr "製造ロットのリビジョン"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid ""
+"The stock journal system allows you to assign each stock operation to a "
+"specific journal according to the type of operation to perform or the "
+"worker/team that should perform the operation. Examples of stock journals "
+"may be: quality control, pick lists, packing, etc."
+msgstr ""
+"在庫仕訳帳システムは、実行のための操作のタイプ、または操作を実行しなければならない作業者 / "
+"チームによる特定の仕訳帳に各在庫操作を割り当てることができます。在庫仕訳帳の例：品質管理、集荷リスト、梱包など"
+
+#. module: stock
+#: field:stock.location,complete_name:0 field:stock.location,name:0
+msgid "Location Name"
+msgstr "場所名"
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"Our records indicate that the following payments are still due. If the "
+"amount\n"
+"has already been paid, please disregard this notice. However, if you have "
+"any\n"
+"queries regarding your account, please contact us.\n"
+"Thank you in advance.\n"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr "記帳済在庫"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"The Incoming Shipments is the list of all orders you will receive from your "
+"suppliers. An incoming shipment contains a list of products to be received "
+"according to the original purchase order. You can validate the shipment "
+"totally or partially."
+msgstr ""
+"内部出荷は仕入先から受領する全てのオーダーのリストです。内部出荷は元となる発注オーダーにより受領する製品のリストを含みます。合計あるいは一部の出荷の検証が"
+"できます。"
+
+#. module: stock
+#: field:stock.move.split.lines,wizard_exist_id:0
+msgid "Parent Wizard (for existing lines)"
+msgstr "親ウィザード（既存行）"
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Move Information"
+msgstr "移動情報"
+
+#. module: stock
+#: code:addons/stock/stock.py:2131
+#, python-format
+msgid ""
+"There is no inventory Valuation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr "製品分類で定義された在庫評価アカウントがありません：%s（ID：%d）"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr "出庫"
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_tracking_form
+#: model:ir.model,name:stock.model_stock_tracking
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0
+msgid "Packs"
+msgstr "梱包"
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "違う製品のロットを割り当てることはできません。"
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "受注と発注"
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr "調達場所"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: field:stock.inventory.line.split,line_exist_ids:0
+#: field:stock.inventory.line.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0 field:stock.move.split,line_ids:0
+msgid "Production Lots"
+msgstr "製造ロット"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+msgstr "受取人"
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator
+msgid "Refrigerator"
+msgstr "冷蔵庫"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Location Structure"
+msgstr "場所の構造"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr "在庫行"
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+msgid ""
+"When doing real-time inventory valuation, this is the Accounting Journal in "
+"which entries will be automatically posted when stock moves are processed."
+msgstr "リアルタイム在庫評価を行う場合、これは在庫移動が処理される時に自動的に記帳される会計仕訳帳エントリーです。"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr "集荷処理"
+
+#. module: stock
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: stock
+#: code:addons/stock/product.py:417
+#, python-format
+msgid "Future Receptions"
+msgstr "将来の受取"
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "緊急"
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing lots in the list below, otherwise you "
+"should enter new ones line by line."
+msgstr "以下のリストの既存ロットを選択するためにはこのオプションをチェックします。そうでない場合、１行ずつ新しく入力する必要があります。"
+
+#. module: stock
+#: code:addons/stock/product.py:75
+#, python-format
+msgid "Valuation Account is not specified for Product Category: %s"
+msgstr "製品分類のための検証アカウントが定義されていません：%s"
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr "目的地への移動"
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process Now"
+msgstr "すぐに処理"
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr "場所の住所"
+
+#. module: stock
+#: help:stock.move,prodlot_id:0
+msgid "Production lot is used to put a serial number on the production"
+msgstr "製造ロットは製造のシリアル番号をつけるために使用されます。"
+
+#. module: stock
+#: field:stock.warehouse,lot_input_id:0
+msgid "Location Input"
+msgstr "場所の入力"
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr "オーダー日"
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr "定期（手動）"
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr "調達"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr "IT仕入先"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr "実在庫のドラフト"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr "会社間転送の中継場所"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr "自動移動"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
+#: model:ir.model,name:stock.model_stock_change_product_qty
+#: view:stock.change.product.qty:0
+msgid "Change Product Quantity"
+msgstr "製品数量の変更"
+
+#. module: stock
+#: field:report.stock.inventory,month:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr "在庫の統合"
+
+#. module: stock
+#: code:addons/stock/product.py:433
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+#: model:ir.actions.act_window,name:stock.action_picking_tree4
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4 view:stock.picking:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Scrap"
+msgstr "スクラップ"
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr "含む"
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr "在庫場所"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr "入庫"
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr "予定日"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr "梱包の検索"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Pickings already processed"
+msgstr "梱包は既に処理済です。"
+
+#. module: stock
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr "通貨"
+
+#. module: stock
+#: view:stock.picking:0 report:stock.picking.list:0
+msgid "Journal"
+msgstr "仕訳帳"
+
+#. module: stock
+#: code:addons/stock/stock.py:1345
+#, python-format
+msgid "is scheduled %s."
+msgstr "%s 予定済"
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+"完成した製品を必要とされる場所で製造する場合は空のままとして下さい。固定の場所で製造する場合は場所を設定して下さい。製造業務を外注する場合は、パートナの場"
+"所として下さい。"
+
+#. module: stock
+#: view:res.partner:0
+msgid "Inventory Properties"
+msgstr "在庫属性"
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr "実行リードタイム（日数）"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move Processing Wizard"
+msgstr "部分移動処理ウィザード"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr "場所別の在庫"
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr "具体的には割当のために使用する、商品が配達されるオプションの住所"
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr "アクティブな項目のチェックを外すことで、場所を削除することなしに非表示にできます。"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr "リストビューで統合するための複数の実在庫を選択して下さい。"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Pickings"
+msgstr "確認済集荷"
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr "事実上の在庫"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr "ビュー"
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Last month"
+msgstr "先月"
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr "左親"
+
+#. module: stock
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr "在庫評価アカウント"
+
+#. module: stock
+#: code:addons/stock/stock.py:1349
+#, python-format
+msgid "is waiting."
+msgstr "待機中"
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: stock
+#: code:addons/stock/product.py:147
+#, python-format
+msgid ""
+"There is no stock output account defined for this product: \"%s\" (id: %d)"
+msgstr "この製品のために定義された在庫出力アカウントがありません：%s（ID:%d）"
+
+#. module: stock
+#: field:product.template,property_stock_production:0
+msgid "Production Location"
+msgstr "製造場所"
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr "パートナの住所"
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr "最新棚卸日"
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
+msgstr ""
+"・ 仕入先の場所：仕入先から来る製品のための元の場所を表す仮想の場所\n"
+"                      \n"
+"・ 表示：子の場所を集約し倉庫のための階層的な構造を作るために使用される「仮想の場所。直接製品を含むことはできません。\n"
+"                      \n"
+"・ 内部の場所：自身の倉庫の内側の物理的な場所\n"
+"                      \n"
+"・ 顧客の場所：顧客に製品を送るための宛先の場所を表す仮想の場所\n"
+"                      \n"
+"・ 在庫：在庫レベル（実在庫）を修正するために使用される在庫操作に対応して提供される仮想の場所\n"
+"                      \n"
+"・ "
+"調達：元（仕入先または製造）が未定の時、調達操作に対応した一時的に提供されrる仮想の場所。調達スケジューラの実行を終えた時にこの場所は空にされます。\n"
+"                      \n"
+"・ 製造：製造操作に対応する仮想の場所：この場所は原材料を消費し完成品を製造します。\n"
+"                      "
+
+#. module: stock
+#: field:stock.production.lot.revision,author_id:0
+msgid "Author"
+msgstr "著者"
+
+#. module: stock
+#: code:addons/stock/stock.py:1332
+#, python-format
+msgid "Delivery Order"
+msgstr "配達オーダー"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr "手動操作"
+
+#. module: stock
+#: view:stock.location:0 view:stock.move:0
+msgid "Supplier"
+msgstr "仕入先"
+
+#. module: stock
+#: code:addons/stock/stock.py:2727
+#, python-format
+msgid ""
+"In order to cancel this inventory, you must first unpost related journal "
+"entries."
+msgstr "この棚卸をキャンセルするためには、最初に関連する仕訳帳エントリーを未記帳にする必要があります。"
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr "完了日"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#, python-format
+msgid ""
+"The uom rounding does not allow you to ship \"%s %s\", only roundings of "
+"\"%s %s\" is accepted by the uom."
+msgstr "%s %s を出荷するために単位の丸めは許されていません。%s %s の丸めのみが許されています。"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr "利用可能な在庫移動（処理準備完了）"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Expected Shipping Date"
+msgstr "予定出荷日"
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
+#: model:ir.model,name:stock.model_stock_inventory_line_split
+#: view:stock.inventory:0 view:stock.inventory.line:0
+msgid "Split inventory lines"
+msgstr "分割在庫行"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr "実在庫"
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr "連鎖移動を含む集荷リストが属する会社（デフォルトの会社の決定ルールを使用する場合は空白のままとします）"
+
+#. module: stock
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr "連鎖移動を含む集荷リストの出荷タイプ（元の場所と到着場所を元にタイプを自動検出する場合は空白のままとします）"
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr "ロット番号"
+
+#. module: stock
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0 field:stock.move.scrap,product_uom:0
+msgid "Product UOM"
+msgstr "製品単位"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr "パートナの場所"
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current year"
+msgstr "今年"
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Total quantity"
+msgstr "合計数量"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr "移動の消費"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr "ヨーロッパの顧客"
+
+#. module: stock
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr "オリジナルの移動と連鎖移動の遅延日数"
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr "次の場所から現在の製品在庫をインポート"
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+"連鎖の場所のタイプを選択した時のみに使用されます。\n"
+"自動移動であれば、現在の在庫が自動的に検証された後で在庫移動を作成します。手動操作であれば、在庫移動は作業者が検証する必要があります。自動段階的追加なしで"
+"あれば場所はオリジナルの移動に置き換えられます。"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr "梱包の識別"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Packing List:"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Waiting Another Move"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by production "
+"orders"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Expected Stock Variations"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1350
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+msgid ""
+"This is the list of all your packs. When you select a Pack, you can get the "
+"upstream or downstream traceability of the products contained in the pack."
+msgstr "これはあなたの全ての梱包リストです。梱包を選択すると、梱包に含まれる製品の上流または下流の追跡が可能です。"
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0 view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0 view:stock.location.product:0
+#: view:stock.move:0 view:stock.partial.move:0 view:stock.partial.picking:0
+#: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Ready"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,invoice_state:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr "製造ロットのリビジョン"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 view:stock.picking:0
+msgid "Waiting"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Split"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:92
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Type"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Available Pickings"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved out of this location and into an internal location, instead of "
+"the generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date:0 field:stock.move,create_date:0
+#: field:stock.production.lot,date:0 field:stock.tracking,date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,picking_id:0
+msgid "Packing"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_customer:0
+#: selection:stock.location,usage:0
+msgid "Customer Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2312
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line_split_lines
+msgid "Inventory Split lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
+msgid "Location Inventory Overview"
+msgstr "在庫の場所の概観"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Analysis including future moves (similar to virtual stock)"
+msgstr "将来の移動を含む分析（事実上の在庫に類似）"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr "下流追跡能力"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#, python-format
+msgid "No Invoices were created"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:88
+#, python-format
+msgid "INV: %s"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* Done: has been processed, can't be modified or cancelled anymore\n"
+"* Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2337
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not "
+"find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_supplier:0
+#: selection:stock.location,usage:0
+msgid "Supplier Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2358
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move.line,currency:0
+#: help:stock.partial.picking.line,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+msgid ""
+"If this picking was split this field links to the picking that contains the "
+"other part that has been processed already."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_out_account_id:0
+msgid "Stock Valuation Account (Outgoing)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2 view:stock.inventory:0
+#: view:stock.move:0 view:stock.picking:0 view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_in_account_id:0
+msgid "Stock Valuation Account (Incoming)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:429
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line
+#: view:stock.inventory.line.split:0 view:stock.move.split:0
+msgid "Split in lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. When not set on "
+"the product, the one from the product category is used."
+msgstr ""
+"リアルタイム在庫評価を行う場合、宛先場所に特定の評価アカウントのセットがある場合を除き、全ての出荷在庫移動に対応する仕訳帳項目がこのアカウントに記帳されま"
+"す。製品に設定されていない場合は製品分類のものが使用されます。"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Day Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0 view:stock.inventory:0
+#: report:stock.inventory.move:0 view:stock.move:0 field:stock.move,date:0
+#: field:stock.partial.move,date:0 field:stock.partial.picking,date:0
+#: view:stock.picking:0
+msgid "Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+msgid "Warehouse Dashboard"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:513
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
+#: view:stock.move.scrap:0 view:stock.picking:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1157
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.picking:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking
+#: model:ir.model,name:stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: field:product.product,location_id:0 view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.change.product.qty,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0 report:stock.inventory.move:0
+#: view:stock.location:0 view:stock.move:0
+#: field:stock.move.consume,location_id:0 field:stock.move.scrap,location_id:0
+#: field:stock.partial.move.line,location_id:0
+#: field:stock.partial.picking.line,location_id:0
+#: field:stock.picking,location_id:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_in_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved from an internal location into this location, instead of the "
+"generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+"リアルタイム在庫評価のために使用されます。仮想の場所（非内部タイプ）に設定されている場合、このアカウントは製品にセットされる一般的な在庫出力アカウントの代"
+"わりに、内部の場所からこの場所に移動される製品の価値を保持するために使用されます。"
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0 field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr "在庫評価"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Orders planned for today"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process Later"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for goods you receive from the current partner"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,partner_address_id:0
+msgid "Owner Address"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_move_report
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"moves. Use this report when you want to analyse the different routes taken "
+"by your products and inventory management performance."
+msgstr ""
+"移動分析は会社の在庫移動を簡単にチェックし分析することができます。製品と在庫管理の成績による異なる経路を分析することを望む場合はこのレポートを使用します。"
+
+#. module: stock
+#: code:addons/stock/stock.py:2116
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking_memory
+msgid "stock.return.picking.memory"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr "在庫の検索"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2122
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:419
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
+#: model:ir.model,name:stock.model_stock_fill_inventory
+#: view:stock.fill.inventory:0
+msgid "Import Inventory"
+msgstr "在庫のインポート"
+
+#. module: stock
+#: field:stock.incoterms,name:0 field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move,hide_tracking:0
+#: help:stock.partial.picking,hide_tracking:0
+msgid ""
+"This field is for internal purpose. It is used to decide if the column "
+"prodlot has to be shown on the move_ids field or not"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated when you do an "
+"inventory"
+msgstr "棚卸を行う時に、在庫移動のための元の場所が生成されるため、現在の製品のためにデフォルトの代わりにこの在庫場所が使用されます。"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Customer Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
+msgid "]"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "在庫場所"
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+msgid ""
+"Inventory Journal in which the chained move will be written, if the Chaining "
+"Type is not Transparent (no journal is used if left empty)"
+msgstr "連鎖タイプが透明でない場合（空のままの時は仕訳帳は使用されません）、連鎖移動の中の在庫仕訳帳が書かれます。"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid ""
+"Analysis of current inventory (only moves that have already been processed)"
+msgstr "現在在庫の分析（既に処理された移動のみ）"
+
+#. module: stock
+#: field:stock.partial.move.line,cost:0
+#: field:stock.partial.picking.line,cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Shipping type specify, goods coming in or going out"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+#: model:ir.ui.menu,name:stock.menu_warehouse_config
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr "棚卸損失"
+
+#. module: stock
+#: code:addons/stock/stock.py:1341
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
+#: field:stock.partial.picking.line,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:175
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_journal_form
+#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
+msgid "Stock Journals"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:89
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:439
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Confirmed, Available or Waiting"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu view:stock.inventory:0
+#: view:stock.partial.move:0 view:stock.partial.picking:0 view:stock.picking:0
+msgid "Products"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_dest_id:0
+#: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be delivered (Available or not)"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid ""
+"Here you can receive individual products, no matter what purchase order or "
+"picking order they come from. You will find the list of all products you are "
+"waiting for. Once you receive an order, you can filter based on the name of "
+"the supplier or the purchase order reference. Then you can confirm all "
+"products received using the buttons on the right of each line."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1697
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:435
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Pickings to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0 field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "リビジョン"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr ""
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+"製品のリアルタイム評価が有効な場合、システムは在庫移動に対応して仕訳帳エントリーを自動的に書き込みます。製品分類に設定された在庫の変動アカウントは現在の在"
+"庫価値を表しています。そして、在庫入力と在庫出力のアカウントは製品の入庫や出庫に対応する動きを保持します。"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
+msgid ""
+"Inventory Analysis allows you to easily check and analyse your company stock "
+"levels. Sort and group by selection criteria in order to better analyse and "
+"manage your company  activities."
+msgstr ""
+"在庫分析は会社の在庫レベルを容易にチェックし管理することができます。会社の活動をより良く分析し管理するために選択基準による並べ替えやグループ化を行って下さ"
+"い。"
+
+#. module: stock
+#: help:report.stock.move,location_id:0 help:stock.move,location_id:0
+msgid ""
+"Sets a location if you produce at a fixed location. This can be a partner "
+"location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid ""
+"Define your locations to reflect your warehouse structure and organization. "
+"OpenERP is able to manage physical locations (warehouses, shelves, bin, "
+"etc), partner locations (customers, suppliers) and virtual locations which "
+"are the counterpart of the stock operations like the manufacturing orders "
+"consumptions, inventories, etc. Every stock operation in OpenERP moves the "
+"products from one location to another one. For instance, if you receive "
+"products from a supplier, OpenERP will move products from the Supplier "
+"location to the Stock location. Each report can be performed on physical, "
+"partner or virtual locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Dates"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+msgid "Inventory"
+msgstr "在庫"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr "棚卸のキャンセル"
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135 code:addons/stock/stock.py:760
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
+msgid "Units of Measure"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2486
+#, python-format
+msgid "Product  '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: model:product.template,description:stock.product_icecream_product_template
+msgid ""
+"Ice cream can be mass-produced and thus is widely available in developed "
+"parts of the world. Ice cream can be purchased in large cartons (vats and "
+"squrounds) from supermarkets and grocery stores, in smaller quantities from "
+"ice cream shops, convenience stores, and milk bars, and in individual "
+"servings from small carts or vans at public events."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"need this report in order to ensure that the stock of each product is "
+"controlled at least once a year."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_opening
+msgid "opening"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_journal
+#: field:report.stock.move,stock_journal:0 view:stock.journal:0
+#: field:stock.journal,name:0 field:stock.picking,stock_journal_id:0
+msgid "Stock Journal"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Maxtor Suppliers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:78
+#: code:addons/stock/wizard/stock_change_standard_price.py:107
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_reception_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in view:stock.move:0
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_out_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_out
+msgid "Deliver Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Your Company"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Yes"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0 field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0 field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0 field:stock.move,company_id:0
+#: field:stock.picking,company_id:0 field:stock.production.lot,company_id:0
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:121
+#, python-format
+msgid ""
+"There is no stock input account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2445
+#, python-format
+msgid "Can not consume a move with negative or zero quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real:0
+msgid "Real Stock"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr "全在庫"
+
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_delivery_counter
+msgid "Delivery Counter"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0 report:stock.picking.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2697
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr "棚卸 %s は完了しました。"
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1743
+#, python-format
+msgid ""
+"You are moving %.2f %s products but only %.2f %s available in this lot."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Set Available"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,active:0 field:stock.location,active:0
+#: field:stock.tracking,active:0
+msgid "Active"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1082
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split.lines,wizard_exist_id:0
+#: field:stock.inventory.line.split.lines,wizard_id:0
+#: field:stock.move.split.lines,wizard_id:0
+msgid "Parent Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr "棚卸参照"
+
+#. module: stock
+#: code:addons/stock/stock.py:1334
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Process"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr "リビジョン名"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: field:product.product,warehouse_id:0 view:stock.warehouse:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr "棚卸確認"
+
+#. module: stock
+#: view:product.category:0
+msgid "Accounting Stock Properties"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0 view:report.stock.move:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.move:0 selection:stock.move,state:0 view:stock.picking:0
+#: selection:stock.picking,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
+#: model:ir.model,name:stock.model_stock_change_standard_price
+#: view:stock.change.standard.price:0
+msgid "Change Standard Price"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1083
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_warehouse_form
+#: model:ir.ui.menu,name:stock.menu_action_warehouse_form
+msgid "Warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
+#: view:report.stock.inventory:0
+msgid "Inventory Analysis"
+msgstr "在庫分析"
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
+#: model:stock.location,name:stock.stock_location_stock
+msgid "Stock"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_product
+#: view:report.stock.inventory:0 field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0 view:report.stock.move:0
+#: field:report.stock.move,product_id:0
+#: field:stock.change.product.qty,product_id:0
+#: field:stock.inventory.line,product_id:0
+#: field:stock.inventory.line.split,product_id:0 report:stock.inventory.move:0
+#: view:stock.move:0 field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0 field:stock.move.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: field:stock.partial.move.line,product_id:0
+#: field:stock.partial.picking.line,product_id:0 view:stock.production.lot:0
+#: field:stock.production.lot,product_id:0
+#: field:stock.report.prodlots,product_id:0
+#: field:stock.report.tracklots,product_id:0
+#: field:stock.return.picking.memory,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return"
+msgstr ""
+
+#. module: stock
+#: field:stock.return.picking,invoice_state:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_partial_picking.py:141
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posz:0
+msgid "Height (Z)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1742
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0 field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,state:0
+msgid "Waiting Another Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Supplier Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,wizard_id:0
+#: field:stock.partial.picking.line,wizard_id:0
+#: field:stock.return.picking.memory,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Completed Stock-Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
+#: model:ir.model,name:stock.model_stock_location_product
+msgid "Products by Location"
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"Internal Moves display all inventory operations you have to perform in your "
+"warehouse. All operations can be categorized into stock journals, so that "
+"each worker has his own list of operations to perform in his own journal. "
+"Most operations are prepared automatically by OpenERP according to your "
+"preconfigured logistics rules, but you can also record manual stock "
+"operations."
+msgstr ""
+"内部移動は倉庫内で実行する必要がある全ての在庫操作を表示します。各作業者は彼自身の仕訳帳の中に彼自身の実行するための操作のリストを持つので、全ての操作は在"
+"庫仕訳帳の中に分類されます。ほとんどの操作は、あなたが前もって設定した物流ルールにしたがって、OpenERPにより自動的に準備されます。とはいえ、手動で在"
+"庫操作を記録することもできます。"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price :"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
+#: field:stock.move,location_id:0 field:stock.move.split,location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid " Waiting"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_manager
+msgid "Manager"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr "事実上の在庫"
+
+#. module: stock
+#: view:product.product:0 view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "New Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1698
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:445
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Return lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_lines_date
+#: view:report.stock.lines.date:0
+msgid "Dates of Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Put in current pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr "棚卸のロット"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr ""
+
+#. module: stock
+#: model:product.template,name:stock.product_icecream_product_template
+msgid "Ice Cream"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid ""
+"This is the list of all the production lots (serial numbers) you recorded. "
+"When you select a lot, you can get the upstream or downstream traceability "
+"of the products contained in lot. By default, the list is filtred on the "
+"serial numbers that are available in your warehouse but you can uncheck the "
+"'Available' button to get all the lots you produced, received or delivered "
+"to customers."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2311 code:addons/stock/stock.py:2726
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move,hide_tracking:0
+#: field:stock.partial.move.line,tracking:0
+#: field:stock.partial.picking,hide_tracking:0
+#: field:stock.partial.picking.line,tracking:0
+msgid "Tracking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.split.into:0
+msgid "Ok"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. This is the "
+"default value for all products in this category. It can also directly be set "
+"on each product"
+msgstr ""
+"リアルタイム在庫評価を行う場合、特定の評価アカウントが宛先場所に設定されていない限り、全ての出荷在庫移動に対応する仕訳帳項目はこのアカウントに記帳されます"
+"。これはこの分類の全ての製品のためのデフォルト値です。これは各製品に直接セットすることができます。"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:75 code:addons/stock/product.py:89
+#: code:addons/stock/product.py:92 code:addons/stock/product.py:99
+#: code:addons/stock/product.py:120 code:addons/stock/product.py:146
+#: code:addons/stock/stock.py:2116 code:addons/stock/stock.py:2119
+#: code:addons/stock/stock.py:2122 code:addons/stock/stock.py:2125
+#: code:addons/stock/stock.py:2128 code:addons/stock/stock.py:2131
+#: code:addons/stock/stock.py:2445
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Do you want to merge theses inventories?"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:43
+#: code:addons/stock/wizard/stock_inventory_merge.py:63
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1348
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr "改訂日"
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree view:stock.picking:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders already processed"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+msgid ""
+"This stock location will be used, instead of the default one, as the "
+"destination location for goods you send to this partner"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.picking:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
+msgid "Merge Inventories"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.product.qty,new_quantity:0
+msgid "This quantity is expressed in the Default UoM of the product."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Year Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "New"
+msgstr ""
+
+#. module: stock
+#: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_category
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
+#: field:report.stock.move,categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.next_id_61
+msgid "Reporting"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1343
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to Leave in the Current Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock available to be delivered"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Waiting Availability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1347
+#, python-format
+msgid "is cancelled."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr "在庫棚卸行"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Waiting "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:427
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"This menu gives you the full traceability of inventory operations on a "
+"specific product. You can filter on the product to see all the past or "
+"future movements for the product."
+msgstr ""
+"このメニューは特定の製品の在庫操作の全ての追跡能力を提供します。製品のための全ての過去および未来の移動を見るために製品をフィルタすることができます。"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr "棚卸の検証"
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Stock Inventory is already Validated."
+msgstr "在庫棚卸は既に検証済です。"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: selection:report.stock.move,type:0 view:stock.location:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr "在庫棚卸"
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Avaiable'.\n"
+" When the picking it done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:189
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by procurements"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1346
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_user
+msgid "User"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128
+#, python-format
+msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:441
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
+msgid "Future Stock Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:423
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
+#: code:addons/stock/stock.py:1157
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"This is the structure of your company's warehouses and locations. You can "
+"click on a location to get the list of the products and their stock level in "
+"this particular location and all its children."
+msgstr ""
+
+#. module: stock
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: report:stock.inventory.move:0 field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0 view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+msgid "Production Lot"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_traceability view:stock.move:0
+#: view:stock.picking:0 view:stock.production.lot:0 view:stock.tracking:0
+msgid "Traceability"
+msgstr "追跡能力"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_form
+#: model:ir.ui.menu,name:stock.menu_action_location_form view:stock.picking:0
+msgid "Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:53
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split for this product: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. When not set on the "
+"product, the one from the product category is used."
+msgstr ""
+"リアルタイム在庫評価を行う場合、特別な評価アカウントが元の場所に設定されていない限り、全入庫の移動のための対応する仕訳帳項目はこのアカウントに記帳されます"
+"。製品に設定されていない場合、製品分類のものが使用されます。"
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,move_ids:0
+#: field:stock.return.picking,product_return_moves:0
+msgid "Moves"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0 field:report.stock.move,location_dest_id:0
+#: field:stock.partial.move.line,location_dest_id:0
+#: field:stock.partial.picking.line,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: model:stock.location,name:stock.location_production
+#: selection:stock.location,usage:0
+msgid "Production"
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Future Stock-Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid "Processing Error"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0 view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
+msgid "Upstream traceability"
+msgstr "上流追跡能力"
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:447
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator_small
+msgid "Small Refrigerator"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_convenience_shop
+msgid "Convenient Store"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0 view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:189
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,name:0
+msgid ""
+"By default, the pack reference is generated following the sscc standard. "
+"(Serial number + 1 check digit)"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid ""
+"The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
+"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
+"accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid ""
+"Production lot quantity %d of %s is larger than available quantity (%d) !"
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,year:0
+#: view:report.stock.move:0 field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 selection:stock.picking,state:0
+msgid "Ready to Process"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,posx:0 help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index dc457bc4ea8..89cbd9c1340 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -49,17 +49,7 @@
              </graph>
          </field>
     </record>
-    <record id="view_stock_graph_board" model="ir.ui.view">
-         <field name="name">report.stock.move.graph</field>
-         <field name="model">report.stock.move</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Moves Analysis" type="bar">
-                 <field name="day"/>
-                 <field name="product_qty" operator="+"/>
-             </graph>
-         </field>
-    </record>
+
     <record id="view_stock_search" model="ir.ui.view">
         <field name="name">report.stock.move.search</field>
         <field name="model">report.stock.move</field>
@@ -67,37 +57,21 @@
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <group>
-                <filter icon="terp-go-year" string="Year"
-                    name="year"
-                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                    help="Current year"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-month" string="Month"
-                    name="month"
-                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                    help="Current month"/>
-                <filter icon="terp-go-month"
-                    string="Month-1"
-                    name="month-1"
-                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                     help="Last month"/>
-                <separator orientation="vertical"/>
-                <filter string="Done"
-                    name="done"
-                    icon="terp-dialog-close"
-                    domain="[('state','=','done')]"
-                    help = "Completed Stock-Moves"/>
-                <filter string="Todo"
-                    icon="terp-gtk-go-back-rtl"
-                    domain="[('state','in',('assigned','waiting','confirmed'))]"
-                    help = "Future Stock-Moves"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
-                <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
-                <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
-                <separator orientation="vertical"/>
-                <field name="product_id" default_focus="1"/>
-                <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <filter string="Done"
+                        name="done"
+                        icon="terp-dialog-close"
+                        domain="[('state','=','done')]"
+                        help = "Completed Stock-Moves"/>
+                    <filter string="Todo"
+                        icon="terp-gtk-go-back-rtl"
+                        domain="[('state','in',('assigned','waiting','confirmed'))]"
+                        help = "Future Stock-Moves"/>
+                    <filter icon="terp-go-home" name="in" string="Incoming" domain="[('type','=','in')]"/>
+                    <filter icon="terp-go-home" name="internal" string="Internal" domain="[('type','=','internal')]"/>
+                    <filter icon="terp-go-home" name="out" string="Outgoing" domain="[('type','=','out')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" default_focus="1"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters...">
@@ -190,33 +164,15 @@
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="Year"
-                        name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Current year"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-go-month" string="Month"
-                        name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Current month"/>
-                    <filter icon="terp-go-month"
-                        string="Month-1"
-                        name="month-1"
-                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                        help="Last month"/>
-                    <separator orientation="vertical"/>
                     <filter string="Real"
                         name="real"
                         icon="terp-check"
                         domain="[('state','=','done')]"
                         help="Analysis of current inventory (only moves that have already been processed)"/>
-
                     <filter string="Future"
                         icon="terp-stock"
                         domain="[('state','in',('assigned','done','waiting','confirmed'))]"
                         help = "Analysis including future moves (similar to virtual stock)"/>
-
-                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id" default_focus="1"/>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 51236e47962..69a7829f565 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -34,16 +34,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" name="stockable" string="Stockable"
                         domain="[('product_id.type','=', 'product')]"/>
                     <filter icon="terp-accessories-archiver" string="Consumable"
                         domain="[('product_id.type','=', 'consu')]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver-minus" string="Non Inv"
                         domain="[('date','=', False)]"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
-                    <field name="date"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index dca23ede353..d2a7c2d90b2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -78,8 +78,10 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Inventory Reference"/>
+                        <separator orientation="vertical"/>
                         <field name="date"/>
+                        <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <newline/>
@@ -283,9 +285,10 @@
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <group>
-                        <field name="name" />
-                        <field name="serial" />
+                        <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <field name="date" />
+                        <separator orientation="vertical"/>
                         <field name="active"/>
                     </group>
                 </search>
@@ -390,13 +393,13 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group>
+                        <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
-                        <field name="prefix"/>
-                        <field name="name"/>
-                        <field name="ref"/>
                         <field name="product_id"/>
-                        <field name="date"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -552,6 +555,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
+                    <field name="name" string="Stock Locations"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
                     <filter icon="terp-personal" name="customer"
@@ -559,7 +564,6 @@
                     <filter icon="terp-personal" name="supplier"
                         string="Supplier" domain="[('usage', '=', 'supplier')]" help="Supplier Locations" />
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="location_id" string="Parent Location"/>
                 </search>
             </field>
@@ -740,7 +744,7 @@
                     <group>
                         <group>
                             <field name="backorder_id" readonly="1"/>
-                            <field name="invoice_state" string="Invoice Control"/>
+                            <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
                             <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                         <group>
@@ -817,7 +821,7 @@
 
                                         <group string="Locations" groups="stock.group_locations">
                                             <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
                                         </group>
 
                                         <group groups="stock.group_tracking_lot" string="Traceability">
@@ -875,12 +879,12 @@
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <group>
+                        <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike', self),('origin','ilike',self)]"/>
                         <field name="partner_id"/>
                         <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
@@ -940,6 +944,7 @@
                     <field name="partner_id"/>
                     <field name="origin"/>
                     <field name="min_date"/>
+                    <field name="date"/>
                     <field name="backorder_id"/>
                     <field name="stock_journal_id" groups="account.group_account_user"/>
                     <field name="invoice_state"/>
@@ -987,16 +992,14 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group>
+                        <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
                         <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1061,8 +1064,8 @@
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
-                    <field name="invoice_state"/>
-                    <field name="stock_journal_id" widget="selection"/>
+                    <field name="invoice_state" groups="account.group_account_invoice"/>
+                    <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -1101,15 +1104,13 @@
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <group>
+                        <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-check" name="available" string="Ready to Process" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
-                        <separator orientation="vertical" />
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                        <separator orientation="vertical"/>
                         <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            domain="[('name','ilike',self),('origin','ilike',self)]"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="product_id"/>
                     </group>
@@ -1291,17 +1292,18 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical" groups="base.group_no_one"/>
+                        <field name="date" groups="base.group_no_one"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
                         <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                         <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
-                        <field name="date" groups="base.group_no_one"/>
-                        <field name="origin"/>
                         <field name="prodlot_id"/>
                     </group>
                     <newline/>
@@ -1436,7 +1438,7 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id"/>
+                        <field name="partner_id" groups="stock.group_locations"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
@@ -1477,13 +1479,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1508,13 +1510,13 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string=" Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <field name="origin"/>
                         <field name="product_id"/>
                         <field name="prodlot_id"/>
                     </group>
@@ -1703,7 +1705,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name"/>
+                    <field name="name" string="Stock Journal"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
             </field>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 722486c81fa..80b64f3ae75 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -39,10 +39,10 @@
                 <tree editable="bottom" string="Product Moves">
                     <field name="product_id" />
                     <field name="quantity" />
-                    <field name="product_uom" />
+                    <field name="product_uom" groups="product.group_uom"/>
                     <field name="location_id" />
                     <field name="location_dest_id" />
-                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
+                    <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="stock.group_production_lot"/>
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
                     <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 76f457e364a..764e345fac2 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -26,7 +26,7 @@
                         <tree editable="bottom" string="Product Moves">
                             <field name="product_id" />
                             <field name="quantity" />
-                            <field name="product_uom" />
+                            <field name="product_uom" groups="product.group_uom"/>
                             <field name="tracking" invisible="1"/>
                             <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
diff --git a/addons/stock_invoice_directly/i18n/ja.po b/addons/stock_invoice_directly/i18n/ja.po
new file mode 100644
index 00000000000..79da1ee6573
--- /dev/null
+++ b/addons/stock_invoice_directly/i18n/ja.po
@@ -0,0 +1,23 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-21 21:30+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr "部分集荷処理ウィザード"
diff --git a/addons/stock_location/i18n/ja.po b/addons/stock_location/i18n/ja.po
new file mode 100644
index 00000000000..f569acdac78
--- /dev/null
+++ b/addons/stock_location/i18n/ja.po
@@ -0,0 +1,397 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-21 22:13+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-22 04:47+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr "送付商品"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "移動"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_src_id:0
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr "元の場所"
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "この製品に製造ロットを割り当てる必要があります。"
+
+#. module: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Logistics Flows"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_id:0
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr ""
+
+#. module: stock_location
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr ""
+
+#. module: stock_location
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr ""
diff --git a/addons/stock_no_autopicking/i18n/ja.po b/addons/stock_no_autopicking/i18n/ja.po
new file mode 100644
index 00000000000..399d5b0139b
--- /dev/null
+++ b/addons/stock_no_autopicking/i18n/ja.po
@@ -0,0 +1,53 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-21 23:54+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-23 05:02+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "製品"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "製造オーダー"
+
+#. module: stock_no_autopicking
+#: field:product.product,auto_pick:0
+msgid "Auto Picking"
+msgstr "自動集荷"
+
+#. module: stock_no_autopicking
+#: help:product.product,auto_pick:0
+msgid "Auto picking for raw materials of production orders."
+msgstr "製造オーダーの原材料のための自動集荷"
+
+#. module: stock_no_autopicking
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な商品識別番号です。"
+
+#. module: stock_no_autopicking
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: stock_no_autopicking
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "オーダー数量は負または0にはできません。"
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 05b3c5a213f..60f8127165f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -50,12 +50,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
-                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
-                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
+                    <field name="name" string="Stock Periods"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
+                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
                 </search>
             </field>
         </record>
@@ -198,6 +199,7 @@
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id"/>
                     <field name="warehouse_id" />
                     <field name="period_id" />
@@ -304,6 +306,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
+                    <separator orientation="vertical"/>
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index c2cffdc1bfa..e02ce3d07dd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -74,15 +74,14 @@
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <group>
-                        <filter icon="terp-check"
-                        string="Running"
-                        domain="[('state','=','running')]"/>
+                        <field name="name" string="Subscription"/>
                         <separator orientation="vertical"/>
-                        <filter string="This Week" icon="terp-go-week" domain="[('date_init','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_init','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-today" string="Today"
-                    domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
+                        <field name="date_init"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-check"
+	                        string="Running"
+	                        domain="[('state','=','running')]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="user_id"/>
                         <field name="partner_id"/>
                     </group>
@@ -169,7 +168,8 @@
             <field name="arch" type="xml">
                 <search string="Subscription Document">
                     <group>
-                        <field name="name"/>
+                        <field name="name" string="Subscription Document"/>
+                        <separator orientation="vertical"/>
                         <field name="model"/>
                     </group>
                 </search>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 1e8fd5c9e2c..c50613f466b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -258,14 +258,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="title" string="Survey"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
                         <separator orientation="vertical"/>
-                        <field name="title"/>
                         <field name="type" widget="selection"/>
-                        <field name="responsible_id">
-                            <filter string="MY" icon="terp-personal" domain="[('responsible_id','=',uid)]" help="My Survey(s)"/>
-                        </field>
+                        <field name="responsible_id"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By...">
@@ -473,7 +473,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
-                    <field name="title"/>
+                    <field name="title" string="Page"/>
+                    <separator orientation="vertical"/>
                     <field name="survey_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -678,7 +679,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Question">
-                    <field name="question"/>
+                    <field name="question" string="Question"/>
+                    <separator orientation="vertical"/>
                     <field name="page_id"/>
                     <field name="survey" widget="selection"/>
                     <field name="type"/>
@@ -1100,14 +1102,14 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
+                        <field name="email" string="Survey"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <filter string="My Survey(s)" icon="terp-personal" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection"/>
-                        <field name="email"/>
-                        <field name="user_id">
-                        <filter string="MY" icon="terp-personal" domain="[('user_id','=',uid)]"/>
-                        </field>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/users_ldap/i18n/sv.po b/addons/users_ldap/i18n/sv.po
new file mode 100644
index 00000000000..47cd3c95ec1
--- /dev/null
+++ b/addons/users_ldap/i18n/sv.po
@@ -0,0 +1,176 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-06-23 11:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-24 05:28+0000\n"
+"X-Generator: Launchpad (build 15461)\n"
+
+#. module: users_ldap
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
+
+#. module: users_ldap
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Detta bolag är inte tillåtet för den här användaren"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_tls:0
+msgid ""
+"Request secure TLS/SSL encryption when connecting to the LDAP server. This "
+"option requires a server with STARTTLS enabled, otherwise all authentication "
+"attempts will fail."
+msgstr ""
+
+#. module: users_ldap
+#: view:res.company:0
+#: view:res.company.ldap:0
+msgid "LDAP Configuration"
+msgstr "LDAP-konfiguration"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "LDAP-binddn"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Skapa användaren om den saknas i databasen"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Klass som används för att skapa användaren"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "LDAP serveradress"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "LDAP serverport"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_binddn:0
+msgid ""
+"The user account on the LDAP server that is used to query the directory. "
+"Leave empty to connect anonymously."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "LDAP-bas"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "User Information"
+msgstr "Användarinformation"
+
+#. module: users_ldap
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Bolag"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Process Parameter"
+msgstr "Processparameter"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_tls:0
+msgid "Use TLS"
+msgstr "Använd TLS"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Nummerserie"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Login Information"
+msgstr "Inloggningsuppgifter"
+
+#. module: users_ldap
+#: view:res.company.ldap:0
+msgid "Server Information"
+msgstr "Serverinformation"
+
+#. module: users_ldap
+#: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
+msgid "Setup your LDAP Server"
+msgstr "Ställ in din LDAP-server"
+
+#. module: users_ldap
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan inte ha två användare med samma användarid !"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "LDAP-parametrar"
+
+#. module: users_ldap
+#: help:res.company.ldap,ldap_password:0
+msgid ""
+"The password of the user account on the LDAP server that is used to query "
+"the directory."
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "LDAP-lösenord"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Mallanvändare"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "LDAP-filter"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Skapa användare"
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1dc8b4cdb1f..8069de21d04 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -164,14 +164,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
+                        string="Wiki"/>
+                    <separator orientation="vertical"/>
+                    <field name="write_date" groups="base.group_no_one"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="group_id"/>
-                    <field name="tags"/>
-                    <field name="section"/>
                     <field name="write_uid"/>
-                    <field name="write_date" groups="base.group_no_one"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
author	Atul Patel (OpenERP) <atp@tinyerp.com>	2012-06-25 16:28:33 +0530
committer	Atul Patel (OpenERP) <atp@tinyerp.com>	2012-06-25 16:28:33 +0530
commit	eaa3f47b92f82d9e032bd905bfdff9430fc957c5 (patch)
tree	a068b92f1eac78a5934b0e25e5f240d1a710d8de
parent	af8c698b46217d6aad7dc5d8f4b2027b93b9092f (diff)
parent	0a22debf5fb7af0dbf4ebf5039aa6ecbfb054a95 (diff)