From 9180d920aa05a9e1e00796293c91619d649d6afc Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 28 May 2010 12:01:04 +0530
Subject: [PATCH 01/21] [IMP]:stock,account:rename the buttons name of the SQL
 reports.

bzr revid: apa@tinyerp.com-20100528063104-fwka6w697en3na9n
---
 .../account/report/account_analytic_entries_report_view.xml   | 4 ++--
 addons/account/report/account_analytic_report_view.xml        | 4 ++--
 addons/account/report/account_entries_report_view.xml         | 4 ++--
 addons/account/report/account_invoice_report_view.xml         | 4 ++--
 addons/stock/report/report_stock_picking_view.xml             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 157a08f8ca5..82a063256c1 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,10 +35,10 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
+	            	<filter icon="gtk-media-rewind" 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="gtk-media-rewind" string="Last 30 Days"
+	                <filter icon="gtk-media-rewind" 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"/>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index eba69e2785b..f853b809867 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -36,10 +36,10 @@
         <field name="arch" type="xml">
             <search string="Analytic Accounts Analysis">
             	<group>
-	                <filter icon="gtk-media-rewind" string="Last 365 Days"
+	                <filter icon="gtk-media-rewind" 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 Accounts of last 365 days"/>
-                    <filter icon="gtk-media-rewind" string="Last 30 Days"
+                    <filter icon="gtk-media-rewind" string="   30 Days   "
                             name="This Month"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 30 days"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index f61348c290c..5d1b99b578e 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -50,10 +50,10 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
             	<group colspan="10" col="12">
-	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
+	            	<filter icon="gtk-media-rewind" 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="Entries of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="Last 30 Days"
+	                <filter icon="gtk-media-rewind" string="   30 Days   "
 	                		name="This Month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Entries of last 30 days"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 597e5f43675..94f181cd587 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -54,10 +54,10 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
+	            	<filter icon="gtk-media-rewind" 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="Invoices of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="Last 30 Days"
+	                <filter icon="gtk-media-rewind" 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="Invoices of last 30 days"/>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index c343b09931a..e570e2b55ea 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -54,10 +54,10 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter icon="gtk-media-rewind" string="Last 365 Days"
+                   		<filter icon="gtk-media-rewind" string="  365 Days  "
 	                    	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Picking in last 365 days"/>
-	                	<filter icon="gtk-media-rewind" string="Last 30 Days"
+	                	<filter icon="gtk-media-rewind" string="   30 Days   "
 	                			name="month"
 	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                			help="Picking in last 30 days"/>

From 948c9e8ae2fe92369cc247a65a02142ea0ab3a38 Mon Sep 17 00:00:00 2001
From: "ssi (Open ERP)" <ssi@tinyerp.com>
Date: Fri, 28 May 2010 12:29:50 +0530
Subject: [PATCH 02/21] [ADD] added new module marketing to manage menus

bzr revid: ssi@tinyerp.com-20100528065950-ia7kz041py33m54k
---
 addons/marketing/__init__.py        | 23 +++++++++++++++++
 addons/marketing/__openerp__.py     | 38 +++++++++++++++++++++++++++++
 addons/marketing/marketing_view.xml |  6 +++++
 3 files changed, 67 insertions(+)
 create mode 100644 addons/marketing/__init__.py
 create mode 100644 addons/marketing/__openerp__.py
 create mode 100644 addons/marketing/marketing_view.xml

diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py
new file mode 100644
index 00000000000..2aefd8b3c11
--- /dev/null
+++ b/addons/marketing/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
new file mode 100644
index 00000000000..36cec655d15
--- /dev/null
+++ b/addons/marketing/__openerp__.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    "name" : "Marketing",
+    "version" : "1.1",
+    "depends" : ["base"],
+    "author" : "Tiny",
+    "category": 'Generic Modules/Marketing',
+    "description": "Menu for Marketing",
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'demo_xml':[],
+    'update_xml': ['marketing_view.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
new file mode 100644
index 00000000000..b920ce369fc
--- /dev/null
+++ b/addons/marketing/marketing_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	 <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
+	</data>
+	</openerp>
\ No newline at end of file

From e74b683ab5101ce1e495e097e6cfd87129a8eba5 Mon Sep 17 00:00:00 2001
From: "ssi (Open ERP)" <ssi@tinyerp.com>
Date: Fri, 28 May 2010 12:54:14 +0530
Subject: [PATCH 03/21] [IMP] marketing_campaign: modified menus and dependency

bzr revid: ssi@tinyerp.com-20100528072414-8uatbvbl7g3rlrj4
---
 addons/marketing_campaign/__openerp__.py              |  5 ++++-
 addons/marketing_campaign/marketing_campaign_view.xml | 11 ++++++-----
 .../report/campaign_analysis_view.xml                 |  7 ++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 9a10fdbaa3d..ad91466817c 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -23,7 +23,8 @@
 {
     "name" : "",
     "version" : "1.1",
-    "depends" : ["crm", 
+    "depends" : ["marketing",
+                 "crm", 
                 "document",
                 "poweremail" # need to get this module form the branch 
                 # lp:poweremail  
@@ -34,11 +35,13 @@
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
+    'demo_xml':[],
     'update_xml': [
         'marketing_campaign_view.xml',
         'marketing_campaign_data.xml',    
         'marketing_campaign_workflow.xml',    
         'report/campaign_analysis_view.xml',
+        'marketing_campaign_demo.xml'
     ],
     'demo_xml': [
         'marketing_campaign_demo.xml',
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 5a7f8529cc0..fb88b6d283d 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem name="Direct Marketing" id="menu_marketing" parent="base.menu_base_partner"/>
+
     <!--
     ======================
     Marketing Campaign
@@ -168,8 +168,9 @@
         
     </record>
 
-    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing" action="action_marketing_campaign_form" sequence="10" />
-        
+	<menuitem name="Campaigns" id="menu_marketing_campaign" parent="marketing.marketing_menu"/>
+    <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign" action="action_marketing_campaign_form" sequence="10" />
+		        
     <!--
     ======================
     Marketing Segments
@@ -262,7 +263,7 @@
        <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_create_date': 1}</field>
     </record>
 
-    <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing" action="action_marketing_campaign_segment_form" sequence="20" />
+    <menuitem id="menu_marketing_campaign_segment_form" parent="menu_marketing_campaign" action="action_marketing_campaign_segment_form" sequence="20" />
         
     <!--
     ======================
@@ -437,7 +438,7 @@
         <field name="context">{'group_by': [], 'search_default_todo': 1}</field>        
     </record>
 
-    <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
+    <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30" groups="base.group_extended"/>
     
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index caedbc01cd9..9963075dce6 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -61,15 +61,16 @@
     </record>
 
 	<record id="action_campaign_analysis_all" model="ir.actions.act_window">
-        <field name="name">Marketing Report</field>
+        <field name="name">Campaigns</field>
         <field name="res_model">campaign.analysis</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
         <field name="context">{'group_by': [], 'search_default_Campaign': 1, 'search_default_Segment': 1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
-
-    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing" sequence="40"/>
+    
+	<menuitem name="Reporting" id="menu_marketing_reporting" parent="marketing.marketing_menu"/>
+    <menuitem action="action_campaign_analysis_all" id="menu_action_campaign_analysis_all" parent="menu_marketing_reporting" sequence="40"/>
 		
 	</data>
 </openerp>

From 7b2e89b519c1ff686ad10a8fdf02bd25d845769f Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 28 May 2010 12:55:29 +0530
Subject: [PATCH 04/21] [IMP]:hr_expense,hr_evaluation,hr_recruitment:Improved
 the SQL View reports.

bzr revid: apa@tinyerp.com-20100528072529-fmdwey9q5qkrjd8f
---
 .../report/hr_evaluation_report_view.xml      | 12 +--
 .../report/hr_expense_report_view.xml         | 90 +++++++++----------
 .../report/hr_recruitment_report_view.xml     | 77 +++++++---------
 3 files changed, 77 insertions(+), 102 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 44c20ebbe16..6ccd1e80ab9 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">hr.evaluation.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Evaluations Statistics">
+            <tree string="Evaluations Analysis">
                 <field name="create_date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="deadline" invisible="1"/>
@@ -27,7 +27,7 @@
             <field name="model">hr.evaluation.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-            <graph string="Evaluations" type="bar">
+            <graph string="Evaluations Analysis" type="bar">
                  <field name="employee_id"/>
                  <field name="nbr" operator="+"/>
                  <field name="state" group="True"/>
@@ -40,12 +40,12 @@
         <field name="model">hr.evaluation.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Evaluations">
+            <search string="Evaluations Analysis">
             	<group>
-            		<filter icon="gtk-media-rewind" string="Last 365 Days"
+            		<filter icon="gtk-media-rewind" string="365 Days"
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                     	help="Tasks performed in last 365 days"/>
-                    <filter icon="gtk-media-rewind" string="Last 30 Days"
+                    <filter icon="gtk-media-rewind" string="30 Days"
                     	name="month"
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                     	help="Tasks performed in last 30 days"/>
@@ -99,7 +99,7 @@
     </record>
 
     <record id="action_evaluation_report_all" model="ir.actions.act_window">
-        <field name="name">Evaluations</field>
+        <field name="name">Evaluations Analysis</field>
         <field name="res_model">hr.evaluation.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1d1b1dc6e0f..6507ff87342 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">hr.expense.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Expenses Statistics">
+            <tree string="Expenses Analysis">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
@@ -36,7 +36,7 @@
          <field name="model">hr.expense.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Expenses Statistics" type="bar">
+             <graph string="Expenses Analysis" type="bar">
                  <field name="user_id"/>
                  <field name="state" group="True"/>
                  <field name="nbr" operator="+"/>
@@ -49,42 +49,42 @@
         <field name="model">hr.expense.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Expenses">
+            <search string="Expenses Analysis">
             	<group>
-            		<filter icon="terp-hr" string="Last 365 Days"
-	                  	    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                   	    help="Expenses during last 7 year"/>
-	                <filter icon="terp-hr" string="This Month"
-	                   		name="month"
-	                   		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                   		help="Expenses during last month"/>
+            		<filter icon="gtk-media-rewind" string="  365 Days  "
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+	                    help="Expenses during last 7 year"/>
+	                <filter icon="gtk-media-rewind" 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="Expenses during last month"/>
 		            <filter icon="gtk-media-rewind"
-	                        string="    7 Days    "
-	                        separator="1"
-	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                        help="Expenses during last 7 days"/>
+	                    string="    7 Days    "
+	                    separator="1"
+	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+	                    help="Expenses during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Draft"
-	                    	icon="terp-hr"
-	                    	domain="[('state','=','draft')]"
-	                    	help = "Draft Expenses"/>
+	                    icon="terp-hr"
+	                    domain="[('state','=','draft')]"
+	                    help = "Draft Expenses"/>
 		            <filter string="Waiting"
-		                	icon="terp-hr"
-		                	domain="[('state', '=' ,'confirm')]"
-		                	help = "Confirm Expenses"/>
+		                icon="terp-hr"
+		                domain="[('state', '=' ,'confirm')]"
+		                help = "Confirm Expenses"/>
 	                <filter string="Accepted"
-	                   		icon="terp-hr"
-	                   		domain="[('state','=','accepted')]"
-	                   		help = "Accepted Expenses"/>
+	                    icon="terp-hr"
+	                    domain="[('state','=','accepted')]"
+	                    help = "Accepted Expenses"/>
 	  				<separator orientation="vertical"/>
-	                <field name="user_id" widget="selection">
-                        <filter icon="terp-hr"
-	                        		string="Expenses Non Assigned User"
-	                        		help="Expenses Non Assigned User"
-	                        		domain="[('user_id','=',False)]"/>
-                    </field>
                     <field name="product_id"/>
                     <field name="employee_id" widget="selection"/>
+                    <field name="user_id" widget="selection">
+                        <filter icon="terp-hr"
+                            string="My Expenses"
+                            help="My Expenses"
+                            domain="[('user_id','=',uid)]"/>
+                    </field>
 				</group>
 				<newline/>
                 <group expand="1" string="Group By...">
@@ -106,37 +106,29 @@
                 </group>
 				<newline/>
 				<group expand="0" string="Extended filters..." groups="base.group_extended">
-					<filter string="Invoiced"
-	                   		icon="terp-hr"
-	                   		domain="[('state','=','invoiced')]"
-	                   		help = "Invoiced Expenses"/>
-	                <filter string="Reimbursed"
-	                   		icon="terp-hr"
-	                   		domain="[('state','=','paid')]"
-	                   		help = "Reimbursed Expenses"/>
-	                <filter string="Cancelled"
-	                   		icon="terp-hr"
-	                   		domain="[('state','=','cancelled')]"
-	                   		help = "Cancelled Expenses"/>
-	                <separator orientation="vertical"/>
+				    <field name="state"/>
+				    <separator orientation="vertical"/>
+				    <field name="date_confirm"/>
+				    <separator orientation="vertical"/>
+				    <field name="journal_id" widget="selection"/>
+				    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+				    <newline/>
                     <field name="department_id" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="currency_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date_confirm"/>
+                    <separator orientation="vertical"/>
                     <field name="date_valid"/>
+                    <separator orientation="vertical"/>
+                    <field name="currency_id" widget="selection"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id="action_hr_expense_report_all" model="ir.actions.act_window">
-        <field name="name">Expenses</field>
+        <field name="name">Expenses Analysis</field>
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 5913684eb80..8a9e913a454 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">hr.recruitment.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Recruitments Statistics">
+            <tree string="Recruitment Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="job_id" invisible="1"/>
@@ -33,7 +33,7 @@
          <field name="model">hr.recruitment.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Recruitments Statistics" type="bar">
+             <graph string="Recruitment Analysis" type="bar">
                  <field name="job_id"/>
                  <field name="nbr" operator="+"/>
              </graph>
@@ -45,66 +45,56 @@
         <field name="model">hr.recruitment.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Recruitments">
+            <search string="Recruitment Analysis">
             	<group>
-            	    <filter icon="terp-hr" string="This Year"
+            	    <filter icon="gtk-media-rewind" 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 this year"/>
-	                <filter icon="terp-hr" string="This Month"
+	                    help="Recruitment performed in last 356 days"/>
+	                <filter icon="gtk-media-rewind" 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 this month"/>
+	                    help="Recruitment performed in this month"/>
 		            <filter icon="gtk-media-rewind"
 	                    string="    7 Days    "
 	                    separator="1"
 	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                    help="Tasks during last 7 days"/>
+	                    help="Recruitment during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Draft"
                     	icon="terp-hr"
                     	domain="[('state','=','draft')]"
-                    	help = "Draft tasks"/>
+                    	help = "Draft recruitment"/>
 	                <filter string="Current"
 	                	icon="terp-hr"
 	                	domain="[('state', '=' ,'open')]"
-	                	help = "In progress tasks"/>
+	                	help = "In progress recruitment"/>
                    	<filter string="Pending"
                    		icon="terp-hr"
                    		domain="[('state','=','pending')]"
-                   		help = "Pending tasks"/>
+                   		help = "Pending recruitment"/>
   					<separator orientation="vertical"/>
-					<field name="department_id" widget="selection">
-						<filter icon="terp-hr"
-                           string="My Recruitments "
-                           help="My Department Recruitments"
-                           domain="[('user_id','=',uid)]"/>
-                       <filter icon="terp-hr"
-                           string="Recruitments non assigned to departments"
-                           help="Recruitments non assigned to departments"
-                           domain="[('user_id','=',False)]"/>
+  					<field name="partner_id"/>
+					<field name="department_id" widget="selection"/>
+                    <field name="user_id" widget="selection">
+                        <filter icon="terp-hr"
+                            string="My Recruitment"
+                            help="My Recruitment"
+                            domain="[('user_id','=',uid)]"/>
                     </field>
-                <separator orientation="vertical"/>
-                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-hr"
-                        string="Recruitments non assigned"
-                        help="Recruitments non assigned"
-                        domain="[('user_id','=',False)]"/>
-                </field>
                 </group>
-                 <newline/>
+                <newline/>
                 <group expand="1" string="Group By ...">
                    <filter string="User" name='User' icon="terp-hr" domain="[]" context="{'group_by':'user_id'}"/>
                    <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                    <filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
+                   <separator orientation="vertical"/>
+                   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
                    <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
                    <filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
                    <filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
                    <filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
             	   <separator orientation="vertical"/>
-            	   <filter string="State" icon="terp-hr" domain="[]" context="{'group_by':'state'}"/>
             	   <filter string="Day" name = "day" icon="terp-hr" domain="[]" context="{'group_by':'day'}"/>
             	   <filter string="Month" icon="terp-hr" domain="[]" context="{'group_by':'month'}"/>
             	   <filter string="Year" icon="terp-hr" domain="[]" context="{'group_by':'year'}"/>
@@ -112,37 +102,30 @@
 
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
-                    <filter icon="terp-hr"
-                    		string="Hired"
-                        name="done"
-                    		domain="[('state','=','done')]"/>
+                    <field name="state"/>
                     <separator orientation="vertical"/>
                     <field name="date"/>
                     <separator orientation="vertical"/>
-                    <field name="priority"/>
                     <field name="stage_id" widget="selection"/>
-                  	<field name="job_id" widget="selection"/>
-                  	<newline/>
-                  	<filter icon="terp-hr"
-                    		string="Refused"
-                    		domain="[('state','=','cancel')]"/>
+                    <field name="type_id" widget="selection"/>
+                    <newline/>
+                    <field name="priority"/>
                     <separator orientation="vertical"/>
                     <field name="date_closed"/>
                     <separator orientation="vertical"/>
-                  	<field name="type_id" widget="selection"/>
-                  	<field name="partner_id"/>
-                  	<field name="partner_address_id"/>
-                </group>             
+                  	<field name="job_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </group>
                 </search>
         </field>
     </record>
 
     <record id="action_hr_recruitment_report_all" model="ir.actions.act_window">
-        <field name="name">Recruitments</field>
+        <field name="name">Recruitment Analysis</field>
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>

From a6b52299c939417287a96b4541d44439af53964f Mon Sep 17 00:00:00 2001
From: "ssi (Open ERP)" <ssi@tinyerp.com>
Date: Fri, 28 May 2010 13:13:59 +0530
Subject: [PATCH 05/21] [FIX] marketing_campaign: improved __openerp__.py

bzr revid: ssi@tinyerp.com-20100528074359-cs32h71bk63lsfqh
---
 addons/marketing/__openerp__.py          | 1 -
 addons/marketing_campaign/__openerp__.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 36cec655d15..ee6abca5355 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -29,7 +29,6 @@
     "description": "Menu for Marketing",
     'website': 'http://www.openerp.com',
     'init_xml': [],
-    'demo_xml':[],
     'update_xml': ['marketing_view.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index ad91466817c..aca6c2f6d28 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -35,7 +35,6 @@
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
-    'demo_xml':[],
     'update_xml': [
         'marketing_campaign_view.xml',
         'marketing_campaign_data.xml',    

From ccb0152d3aa2fa6c9ecd1fc31cb3dc2abd4e1e74 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 28 May 2010 13:59:16 +0530
Subject: [PATCH 06/21] [IMP]:hr_recruitment:Improved code(remove unused fields
 from SQL View.).

bzr revid: apa@tinyerp.com-20100528082916-ku5lzla2vt21dnhq
---
 addons/hr_recruitment/report/hr_recruitment_report.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 00d15ef3f21..7c867247cd0 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -35,7 +35,7 @@ class hr_recruitment_report(osv.osv):
     _description = "Recruitments Statistics"
     _auto = False
     _rec_name = 'date'
-    
+
     def _get_data(self, cr, uid, ids, field_name, arg, context={}):
 
         """ @param cr: the current row, from the database cursor,
@@ -73,9 +73,7 @@ class hr_recruitment_report(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
@@ -88,8 +86,7 @@ class hr_recruitment_report(osv.osv):
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'create_date': fields.datetime('Create Date', readonly=True),
-        'day': fields.char('Day', size=128, readonly=True), 
+        'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
@@ -99,7 +96,6 @@ class hr_recruitment_report(osv.osv):
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
-#        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True),
         'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),

From 22ae201f7904c16292422546e1779740ce230991 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Fri, 28 May 2010 14:37:58 +0530
Subject: [PATCH 07/21] [IMP]:project_planning:Resolved Conflicts.

bzr revid: apa@tinyerp.com-20100528090758-vsx4jn5xzmq3ifdz
---
 addons/project_planning/project_planning_view.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 7dbf2195c16..0ebbcd8e519 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -112,11 +112,7 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-<<<<<<< TREE
-                                                        <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
-=======
                                                         <button name="%(project.action_project_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
->>>>>>> MERGE-SOURCE
                                                         <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
 
                                                     </group>

From 1d4290ff9d94b189fab866b285ee25acddf0c1e1 Mon Sep 17 00:00:00 2001
From: "DSH (Open ERP)" <dsh@tinyerp.com>
Date: Fri, 28 May 2010 17:17:13 +0530
Subject: [PATCH 08/21] [IMP] configuration wizard for marketing module : Done
 by PSO

bzr revid: dsh@tinyerp.com-20100528114713-zgpkw2a6nfcxlhwj
---
 addons/marketing/__init__.py         |  2 ++
 addons/marketing/marketing_view.xml  | 52 ++++++++++++++++++++++++++--
 addons/marketing/marketing_wizard.py | 38 ++++++++++++++++++++
 3 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 addons/marketing/marketing_wizard.py

diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py
index 2aefd8b3c11..c83787a6ef7 100644
--- a/addons/marketing/__init__.py
+++ b/addons/marketing/__init__.py
@@ -19,5 +19,7 @@
 #
 ##############################################################################
 
+import marketing_wizard
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index b920ce369fc..7a72f39c6eb 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -1,6 +1,52 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	 <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
-	</data>
-	</openerp>
\ No newline at end of file
+	   
+        <menuitem name="Marketing" icon="terp-crm" id="marketing_menu" sequence="10"/>
+
+        <record id="view_marketing_installer" model="ir.ui.view">
+            <field name="name">marketing.installer.view</field>
+            <field name="model">marketing.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                  <form position="attributes">
+                    <attribute name="string">Marketing Modules Installation</attribute>
+                  </form>
+        
+                  <separator string="title" position="attributes">
+                    <attribute name="string">Configure Your Marketing System</attribute>
+                  </separator>
+                  <xpath expr="//label[@string='description']"
+                         position="attributes">
+                    <attribute name="string">You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications</attribute>
+                  </xpath>
+                  <group colspan="8">
+                    <group colspan="2" col="2">
+                        <separator string="Marketing Mdules" colspan="4" />
+                        <field name="marketing_campaign" />
+                        <field name="crm_profiling" />
+                    </group>
+                  </group>
+                </data>
+            </field>
+        </record>
+
+        <record id="action_marketing_installer" model="ir.actions.act_window">
+            <field name="name">Marketing Modules Installation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">marketing.installer</field>
+            <field name="view_id" ref="view_marketing_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="marketing_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_marketing_installer"/>
+            <field name="sequence">3</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
new file mode 100644
index 00000000000..443fb09ed48
--- /dev/null
+++ b/addons/marketing/marketing_wizard.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class marketing_installer(osv.osv_memory):
+    _name = 'marketing.installer'
+    _inherit = 'res.config.installer'
+    
+    _columns = {
+        # Generic modules
+        'marketing_campaign':fields.boolean('Marketing Campaign',
+            help="Helps you to manage your marketing campaigns step by step."),
+        'crm_profiling':fields.boolean('Crm Profile',
+            help="Helps you to perform segmentation within partners.")
+            }
+        
+marketing_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 48f88c1246f555036b18565863c682b5b45ebc5d Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 31 May 2010 04:47:32 +0100
Subject: [PATCH 09/21] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100529035321-pmdc06jd7d0s5z4u
bzr revid: codehost@crowberry-20100530034446-g39k4m3i5ev8dpw4
bzr revid: codehost@crowberry-20100531034732-c5gljubmzzihgrco
---
 addons/account/i18n/pl.po                     |  53 ++--
 addons/account/i18n/zh_CN.po                  |  32 +-
 addons/account_analytic_plans/i18n/id.po      |   2 +-
 addons/account_anglo_saxon/i18n/id.po         |   2 +-
 addons/account_budget/i18n/id.po              |   2 +-
 addons/account_chart/i18n/id.po               |   2 +-
 addons/account_date_check/i18n/id.po          |   2 +-
 addons/account_followup/i18n/es.po            |   9 +-
 addons/account_followup/i18n/pt.po            |   2 +-
 .../analytic_journal_billing_rate/i18n/id.po  |   2 +-
 addons/base_setup/i18n/id.po                  |   2 +-
 addons/base_vat/i18n/pt.po                    |  12 +-
 addons/crm_profiling/i18n/pt.po               |   2 +-
 addons/hr_evaluation/i18n/id.po               | 278 ++++++++++++++++++
 addons/hr_holidays/i18n/id.po                 | 133 ++++-----
 addons/membership/i18n/zh_CN.po               |  10 +-
 addons/olap_crm/i18n/id.po                    |  31 ++
 addons/olap_extract/i18n/id.po                |  56 ++++
 addons/point_of_sale/i18n/ru.po               |  10 +-
 19 files changed, 508 insertions(+), 134 deletions(-)
 create mode 100644 addons/hr_evaluation/i18n/id.po
 create mode 100644 addons/olap_crm/i18n/id.po
 create mode 100644 addons/olap_extract/i18n/id.po

diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index c1632caa35b..1ed4700b0e0 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-06 09:55+0000\n"
+"PO-Revision-Date: 2010-05-30 15:07+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-07 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -117,7 +117,7 @@ msgstr "Nadrzędne"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Dokument dziennika"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -136,7 +136,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Skasuj uzgodnienie"
 
 #. module: account
 #: constraint:account.period:0
@@ -156,7 +156,7 @@ msgstr "Zapisy"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Centralizacja Winien"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
@@ -647,7 +647,7 @@ msgstr "Warunki płatności dla partnera"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Uzgodnienie zapisów"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
@@ -867,7 +867,7 @@ msgstr "Konta analityczne"
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr "Drukuj dziennik"
+msgstr "Drukuj zapisy dzienników"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -1339,7 +1339,7 @@ msgstr "Zamknij rok podatkowy"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizacja przeciwnej strony"
 
 #. module: account
 #: view:wizard.company.setup:0
@@ -1546,7 +1546,7 @@ msgstr "Dodatnie"
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "Drukuj stany dzienników"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1786,7 +1786,7 @@ msgstr "Uzgodnienie zapisów z faktur i płatności"
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Drukuj konta dzienników"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -1877,7 +1877,7 @@ msgstr "Data początkowa"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "x Dziennik korekt wydatków"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -2010,7 +2010,7 @@ msgstr "          Data początkowa"
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Raport dzenników analitycznych"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2119,7 +2119,7 @@ msgstr "dni"
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr "Poprzednio"
+msgstr "Przeszłość"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2168,7 +2168,8 @@ msgid "Analytic Entry"
 msgstr "Zapis analityczny"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Komunikat przeterminowanych płatności"
 
@@ -2846,7 +2847,7 @@ msgstr "Widok dziennika"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr ""
+msgstr "Centralizacja Ma"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2886,7 +2887,7 @@ msgstr "Nowa Faktura Klienta"
 #: wizard_button:account.move.line.reconcile,addendum,reconcile:0
 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0
 msgid "Reconcile"
-msgstr "Uzgodnij"
+msgstr "Uzgodnienie"
 
 #. module: account
 #: rml:account.overdue:0
@@ -3004,7 +3005,7 @@ msgstr "Uzgodnienie"
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "Centralizacja"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -3235,7 +3236,7 @@ msgstr "Uwagi"
 msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
-msgstr "Zapisy konta dla faktury zostały uzgodnione ze zapisami płatności."
+msgstr "Zapisy konta dla faktury zostały uzgodnione z zapisami płatności."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3308,7 +3309,7 @@ msgstr "Uzgodnij zapisy"
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(Faktura musi mieć skasowane uzgodnienia, jeśli chcesz ją otworzyć)"
 
 #. module: account
 #: view:account.invoice:0
@@ -3536,7 +3537,7 @@ msgstr "Zapłać i uzgodnij"
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "Dziennik główny"
+msgstr "Konta dziennika"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -3922,7 +3923,7 @@ msgstr "Wprowadź ręcznie zestawienie"
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr "Dzienniki finansowe"
+msgstr "Dzienniki księgowe"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -5504,7 +5505,7 @@ msgstr "Zapis na koncie"
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr ""
+msgstr "Stany dzienników"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5653,7 +5654,7 @@ msgstr "Do"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr ""
+msgstr "Zapisy otwartych dzienników analitycznych"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5686,7 +5687,7 @@ msgstr "Rok podatkowy do zamknięcia"
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
 #: wizard_field:account.automatic.reconcile,init,date1:0
 msgid "Start of period"
-msgstr "Pociątek okresu"
+msgstr "Początek okresu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5875,7 +5876,7 @@ msgstr "Rok podatkowy"
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Future"
-msgstr "Przyszłe"
+msgstr "Przyszłość"
 
 #. module: account
 #: help:account.account.balance.report,checktype,fiscalyear:0
@@ -5909,7 +5910,7 @@ msgstr "Zapis"
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr ""
+msgstr "Faktura zapłacona przy uzgadnianiu"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 93b325d879e..1f1aaf4dbb8 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-06 05:39+0000\n"
+"PO-Revision-Date: 2010-05-29 11:45+0000\n"
 "Last-Translator: digitalsatori <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-07 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-30 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -72,7 +72,7 @@ msgstr "选择消息"
 msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
-msgstr "该科目将用于统计当前产品分类的入库金额"
+msgstr "这科目将用于当前产品分类的销售收入科目"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -222,7 +222,7 @@ msgstr "账龄试算平衡表"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr "定期分录"
+msgstr "周期性凭证"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -875,7 +875,7 @@ msgstr "必须的"
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "费用科目"
+msgstr "采购科目"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
@@ -1575,7 +1575,7 @@ msgstr "科目编码"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "留空为使用费用科目"
+msgstr "留空为使用采购科目"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
@@ -2138,7 +2138,8 @@ msgid "Analytic Entry"
 msgstr "辅助核算凭证"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "逾期付款信息"
 
@@ -3848,7 +3849,7 @@ msgstr "这会计期间可以重叠"
 msgid ""
 "This account will be used instead of the default one to value outgoing stock "
 "for the current product"
-msgstr "这科目将替换当前产品的默认出仓"
+msgstr "这科目将用于当前产品分类的采购科目"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -4171,7 +4172,7 @@ 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 "
 "expenses accounts."
-msgstr "允许你修改报表显示的余额的符号,所以你能够看见正数的数字替代费用科目的负数"
+msgstr "允许你修改报表显示的余额的符号,所以你能够看见正数的数字替代科目的负数"
 
 #. module: account
 #: help:account.config.wizard,code:0
@@ -5365,7 +5366,7 @@ msgstr "计算"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr "选择产品的收入和费用科目"
+msgstr "选择产品的收入和采购科目"
 
 #. module: account
 #: field:account.tax,type_tax_use:0
@@ -5625,7 +5626,7 @@ msgstr "说明"
 msgid ""
 "This account will be used instead of the default one to value incoming stock "
 "for the current product"
-msgstr "这科目将替换当前产品的默认进仓"
+msgstr "这科目将用于当前产品的默认销售收入科目"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5657,7 +5658,7 @@ msgstr "科目设置"
 msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
-msgstr "这科目将替换当前业务伙伴的默认支付科目"
+msgstr "这科目将用于当前业务伙伴的默认应付科目"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -5829,7 +5830,7 @@ msgstr "科目一览"
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
-msgstr "这科目将替换当前产品分类的默认出仓"
+msgstr "这科目将用于当前产品分类的采购科目"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5851,7 +5852,7 @@ msgstr "银行详情"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "产品费用科目模板"
+msgstr "产品采购科目模板"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -5950,6 +5951,9 @@ msgstr "计算日期"
 #~ msgid "For Value percent enter % ratio between 0-1."
 #~ msgstr "值是一个百分比在0-1之间"
 
+#~ msgid "account.config.wizard"
+#~ msgstr "科目.设置.向导"
+
 #~ msgid "For Tax Type percent enter % ratio between 0-1."
 #~ msgstr "税类型是百分比在0-1之间"
 
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index bb4edb18b29..f1012dd6ec1 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po
index bf59eb13b73..d3e467bf0b2 100644
--- a/addons/account_anglo_saxon/i18n/id.po
+++ b/addons/account_anglo_saxon/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index 2c3e8b90cca..bbc7bebe665 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index 058e3f8f5a2..0d9737bac30 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po
index 79a166f2119..b0641600ce9 100644
--- a/addons/account_date_check/i18n/id.po
+++ b/addons/account_date_check/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 19087830a14..68e3e3be2df 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-30 18:05+0000\n"
-"Last-Translator: Hesed Franquet <Unknown>\n"
+"PO-Revision-Date: 2010-05-28 19:11+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -255,7 +256,7 @@ msgstr ""
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
 msgid "Ok"
-msgstr "Ok"
+msgstr "Aceptar"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 11aa146ef83..d7f2d146fcd 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
index d8e269a7cb4..532b0ebee6d 100644
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ b/addons/analytic_journal_billing_rate/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 7c3ff6f08b5..92ab4f294b9 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index 4fb9b3a9d59..d6c15aa6451 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:10+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2010-05-28 11:26+0000\n"
+"Last-Translator: cmsa <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -21,6 +21,8 @@ msgstr ""
 msgid ""
 "Enable the VAT Number for the partner. Check the validity of that VAT Number."
 msgstr ""
+"Active o NIF (Número de Identificação Fiscal) para o parceiro verificando a "
+"sua validade"
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
@@ -30,9 +32,9 @@ msgstr "XML inválido para a arquitectura de vista"
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr ""
+msgstr "Declaração Legal do IVA"
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index 90a457d5732..eb95525ad0c 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
new file mode 100644
index 00000000000..e8766d233f0
--- /dev/null
+++ b/addons/hr_evaluation/i18n/id.po
@@ -0,0 +1,278 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-05-28 10:50+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr "Informasi"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr "Jadwal evaluasi berikutnya"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr "Skor"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nama model tidak sah di definsi aksi"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr "Evaluasi"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr "Tipe Evaluasi"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr "Status"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr "Tanggal"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr "Evaluasi"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr "Evaluasi Berikutnya"
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr "Aktif"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr "Catatan"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr "Jenis"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr "Selesai"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index eda0c0e6363..1f38bf9219a 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -7,29 +7,29 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:50+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-28 11:15+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "New Holidays Request"
-msgstr ""
+msgstr "Permintaan Hari Libur Baru"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
 msgid "All Holidays Requests"
-msgstr ""
+msgstr "Semua Permintaan Hari Libur"
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nama model tidak sah di definsi aksi"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,remaining_leaves:0
@@ -44,12 +44,12 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr ""
+msgstr "Biru Cerah"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr ""
+msgstr "Coklat"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -66,7 +66,7 @@ msgstr ""
 #: view:hr.holidays.per.user:0
 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
 msgid "Employee Holidays"
-msgstr ""
+msgstr "Hari Libur Karyawan"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -79,7 +79,7 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidays0
 msgid "Holidays"
-msgstr ""
+msgstr "Hari Libur"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -94,7 +94,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr ""
+msgstr "Hijau Cerah"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
@@ -111,51 +111,51 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
 msgid "Refused Request"
-msgstr ""
+msgstr "Permintaan yang Ditolak"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
-msgstr ""
+msgstr "Disetujui"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Both"
-msgstr ""
+msgstr "Keduanya"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
-msgstr ""
+msgstr "Tolak"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,notify,end:0
 #: wizard_button:hr.holidays.summary.employee,notify,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Setuju"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
 msgid "My Holidays Requests"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
 #: field:hr.holidays.per.user,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status:0
 #: field:hr.holidays.log,holiday_status:0
 #: field:hr.holidays.per.user,holiday_status:0
 msgid "Holiday's Status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
 msgid "Request is refused."
-msgstr ""
+msgstr "Permintaan Ditolak."
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
@@ -180,12 +180,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Holiday status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
@@ -195,7 +195,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "Holidays Allowed"
-msgstr ""
+msgstr "Hari Libur Diizinkan"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
@@ -210,7 +210,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
 msgid "Holidays Per User"
-msgstr ""
+msgstr "Hari Libur Per Pengguna"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -221,19 +221,19 @@ msgstr ""
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Dikonfirmasi"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,date_from:0
 #: wizard_field:hr.holidays.summary.employee,init,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Dari"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Konfirmasi"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
@@ -256,7 +256,7 @@ msgstr ""
 #: field:hr.holidays.log,employee_id:0
 #: field:hr.holidays.per.user,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Karyawan"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -266,7 +266,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
 msgid "Employee get holidays"
-msgstr ""
+msgstr "Karyawan mendapatkan hari libur"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -281,36 +281,36 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
 msgid "Number of Holidays Requested"
-msgstr ""
+msgstr "Jumlah Permintaan Hari Libur"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 msgid "My Holiday Requests"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Jumlah Hari"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr ""
+msgstr "Status Hari Libur"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Pilihan Laporan"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_approved0
@@ -335,7 +335,7 @@ msgstr ""
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary.employee,init,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "Karyawan"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days:0
@@ -347,7 +347,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
 #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
 msgid "Holidays Per Employee"
-msgstr ""
+msgstr "Hari Libur Per Karyawan"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
@@ -367,7 +367,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
 msgid "hr.holidays.log"
-msgstr ""
+msgstr "hr.holidays.log"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
@@ -377,7 +377,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_calendar0
 msgid "Calendar"
-msgstr ""
+msgstr "Kalender"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
@@ -425,12 +425,12 @@ msgstr ""
 #: wizard_view:hr.holidays.summary,notify:0
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "Notification"
-msgstr ""
+msgstr "Pemberitahuan"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr ""
+msgstr "Karyawan mengisi di dalam sebuah permintaan untuk hari libur"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "Hitam"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
@@ -476,7 +476,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -486,12 +486,12 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
 msgid "My Holidays Request"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr ""
+msgstr "Warna dari status"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
@@ -506,7 +506,7 @@ msgstr ""
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "holidays."
-msgstr ""
+msgstr "hari libur."
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -516,22 +516,22 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.per.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
 msgid "Document for employee"
-msgstr ""
+msgstr "Dokumen untuk karyawan"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tanggal"
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
 msgid "Reufse"
-msgstr ""
+msgstr "Tolak"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,section_id:0
@@ -547,7 +547,7 @@ msgstr ""
 #: field:hr.holidays.per.user,active:0
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktif"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
@@ -557,12 +557,12 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
 msgid "Approved Request"
-msgstr ""
+msgstr "Permintaan yang Disetujui"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysrequest0
 msgid "Holidays Request"
-msgstr ""
+msgstr "Permintaan Hari Libur"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
@@ -572,12 +572,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "Umum"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "General Information"
-msgstr ""
+msgstr "Informasi Umum"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -585,7 +585,7 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,end:0
 #: wizard_button:hr.holidays.summary.employee,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
@@ -601,25 +601,26 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr ""
+msgstr "Permintaan Hari Libur Saya Ditolak"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,init,checkdept:0
 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0
 msgid "Print"
-msgstr ""
+msgstr "Cetak"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.holidays_summary
 #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
 msgid "Print Summary of Holidays"
-msgstr ""
+msgstr "Cetak Rangkuman dari Hari Libur"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,depts:0
@@ -635,12 +636,12 @@ msgstr ""
 #: selection:hr.holidays,state:0
 #: model:process.node,name:hr_holidays.process_node_refused0
 msgid "Refused"
-msgstr ""
+msgstr "Ditolak"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
 msgid "Request is approved."
-msgstr ""
+msgstr "Permintaan Disetujui."
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
@@ -651,7 +652,7 @@ msgstr ""
 #: wizard_field:hr.holidays.summary,init,holiday_type:0
 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Pilih Jenis Hari Libur"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
@@ -661,7 +662,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr ""
+msgstr "Hari libur per pengguna"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
@@ -681,7 +682,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "Merah"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
@@ -691,7 +692,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
 msgid "Holidays Process"
-msgstr ""
+msgstr "Proses Hari Libur"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
@@ -711,7 +712,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "Kuning Cerah"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 3937d1ead5a..5f3a087e093 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 08:31+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-05-30 06:24+0000\n"
+"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
@@ -96,7 +96,7 @@ msgstr "错误!你不能创建递归的账户"
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "错误：需要BVR参照"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -294,7 +294,7 @@ msgstr "准会员"
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "错误：无效的Bvr号（错误的检验和）"
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
diff --git a/addons/olap_crm/i18n/id.po b/addons/olap_crm/i18n/id.po
new file mode 100644
index 00000000000..79dd628d9a7
--- /dev/null
+++ b/addons/olap_crm/i18n/id.po
@@ -0,0 +1,31 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-05-28 10:44+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr "olap_crm"
diff --git a/addons/olap_extract/i18n/id.po b/addons/olap_extract/i18n/id.po
new file mode 100644
index 00000000000..80dc876351d
--- /dev/null
+++ b/addons/olap_extract/i18n/id.po
@@ -0,0 +1,56 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-05-28 10:43+0000\n"
+"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-29 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr "olap_extract"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr "Setuju"
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr "Nama Modul"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr "Batal"
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr "Nama Modul Baru"
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index fd1eda0c478..a7b04087207 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:56+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-05-30 08:32+0000\n"
+"Last-Translator: g0nz1k12 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -142,7 +142,7 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.receipt:0
 msgid "Tel : + 32 (0) 2 231 04 35"
-msgstr ""
+msgstr "Тел : + 32 (0) 2 231 04 35"
 
 #. module: point_of_sale
 #: field:pos.order.line,name:0
@@ -268,7 +268,7 @@ msgstr "Скидка"
 #: rml:pos.invoice:0
 #: rml:pos.receipt:0
 msgid "Fax :"
-msgstr ""
+msgstr "Факс :"
 
 #. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0

From 016768a750fb78087d64ebf5cd15bfe098037baf Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 8 Jul 2010 14:08:32 +0530
Subject: [PATCH 10/21] [IMP] Project_issue : Improved search panel

bzr revid: jvo@tinyerp.com-20100708083832-2qloe1xik8u23rcr
---
 addons/project_issue/project_issue.py       | 2 +-
 addons/project_issue/project_issue_view.xml | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 795c9883eca..533466f1615 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -113,7 +113,7 @@ class project_issue(osv.osv, crm.crm_case):
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'id': fields.integer('ID'),  
         'name': fields.char('Name', size=128, required=True),
-        'active': fields.boolean('Active', required=False),
+        'active': fields.boolean('Active', required=False), 
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'write_date': fields.datetime('Update Date' , readonly=True),
         'date_deadline': fields.date('Deadline'),
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9362e858b1e..483fda01ec1 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -177,6 +177,12 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group colspan="4" col="20">
+						<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-project" default="1"/>
+                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-project"/>
+                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-project"/>
+						
+						<separator orientation="vertical"/>
+						
                         <filter icon="gtk-home" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -209,6 +215,9 @@
 	                        context="{'group_by':'partner_id'}" />
 	                    <filter string="Salesman" icon="terp-crm"
 	                        domain="[]" context="{'group_by':'user_id'}" />
+						<separator orientation="vertical" />
+						<filter string="Month" icon="terp-crm"
+	                        domain="[]" context="{'group_by':'create_date'}" />
 	                    <separator orientation="vertical" />
                 	</group>
                 </search>

From f048d0eb2acc119a163f7c87f715110389e72bb1 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 31 May 2010 15:27:29 +0530
Subject: [PATCH 11/21] [ADD]:project:add Done By buttons in search for task
 analysis report.

bzr revid: apa@tinyerp.com-20100531095729-dak30j147w9p23jq
---
 addons/project/report/project_report.py       | 3 +++
 addons/project/report/project_report_view.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index dc9ad3adb22..7984441b460 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -31,6 +31,7 @@ class report_project_task_user(osv.osv):
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'Assigned To', readonly=True),
+        'done_by':fields.many2one('res.users', 'Done By', readonly=True),
         'date_start': fields.date('Starting Date',readonly=True),
         'no_of_days': fields.integer('# of Days', size=128, readonly=True),
         'description': fields.text('Description',readonly=True),
@@ -90,6 +91,7 @@ class report_project_task_user(osv.osv):
                     t.company_id,
                     t.partner_id,
                     t.type,
+                    w.user_id as done_by,
                     sum(remaining_hours) as remaining_hours,
                     sum(total_hours) as total_hours,
                     sum(planned_hours) as hours_planned,
@@ -104,6 +106,7 @@ class report_project_task_user(osv.osv):
                     to_char(date_start, 'MM'),
                     t.priority,
                     t.user_id,
+                    w.user_id,
                     t.state,
                     date_trunc('day',t.date_end),
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'),
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9babb1655ef..8fa33ad77ec 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -12,6 +12,7 @@
                 	<field name="name" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
+                    <field name="done_by" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1"/>
@@ -110,6 +111,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
                         <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
+                        <filter string="Done By" icon="terp-project" context="{'group_by':'done_by'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
@@ -122,6 +124,7 @@
                     <newline/>
 	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
 	                    <field name="type" widget="selection"/>
+	                    <field name="done_by" widget="selection"/>
 	                    <separator orientation="vertical"/>
                         <field name="date_start"/>
                         <field name="date_deadline"/>

From fc5904091a10418a795253835f90f664e249fddb Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 31 May 2010 15:48:33 +0530
Subject: [PATCH 12/21] [IMP]:account:Improved Invioce Analysis report as
 guidline defined by al and nel.

bzr revid: apa@tinyerp.com-20100531101833-p2nx1tz2xn2327tk
---
 .../account/report/account_invoice_report.py  | 44 ++++++++++++++-----
 .../report/account_invoice_report_view.xml    |  9 ++--
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index cd1477e79cf..523d77c84e3 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -36,10 +36,12 @@ class account_invoice_report(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
+        'uom_name': fields.char('Default UoM', size=128, readonly=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')],readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+        'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal',readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
@@ -81,46 +83,64 @@ class account_invoice_report(osv.osv):
                      to_char(s.date_invoice, 'MM') as month,
                      to_char(s.date_invoice, 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
-                     sum(l.quantity * u.factor) as product_qty,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             l.quantity * u.factor * -1
+                         else
+                             l.quantity * u.factor
+                         end) as product_qty,
                      s.partner_id as partner_id,
                      s.payment_term as payment_term,
                      s.period_id as period_id,
+                     u.name as uom_name,
                      s.currency_id as currency_id,
                      s.journal_id as journal_id,
                      s.fiscal_position as fiscal_position,
                      s.user_id as user_id,
                      s.company_id as company_id,
-                     sum(l.quantity*l.price_unit) as price_total,
-                     (sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             l.quantity*l.price_unit * -1
+                         else
+                             l.quantity*l.price_unit
+                         end) as price_total,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             l.quantity*l.price_unit * -1
+                         else
+                             l.quantity*l.price_unit
+                         end) / sum(l.quantity * u.factor)::decimal(16,2) as price_average,
                      count(*) as nbr,
                      s.type as type,
                      s.state,
+                     pt.categ_id,
                      s.date_due as date_due,
                      s.address_contact_id as address_contact_id,
                      s.address_invoice_id as address_invoice_id,
                      s.account_id as account_id,
                      s.partner_bank as partner_bank,
-                     s.residual as residual,
+                     sum(case when s.type in ('out_refund','in_invoice') then
+                             s.residual * -1
+                         else
+                             s.residual
+                         end) as residual,
                      case when s.state != 'paid' then null else
-                            extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
+                     extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
                      end as delay_to_pay
-                 from
-                 account_invoice_line l
-                 left join
-                     account_invoice s on (s.id=l.invoice_id)
-                     left join product_uom u on (u.id=l.uos_id),
+                 from account_invoice_line l
+                 left join account_invoice s on (s.id=l.invoice_id)
+                 left join product_template pt on (pt.id=l.product_id)
+                 left join product_uom u on (u.id=l.uos_id),
                  account_move_line am left join account_invoice i on (i.move_id=am.move_id)
-                 where
-                        am.account_id=i.account_id
+                 where am.account_id=i.account_id
                  group by
                      s.type,
                      s.date_invoice,
                      s.partner_id,
                      l.product_id,
+                     u.name,
                      l.uos_id,
                      s.user_id,
                      s.state,
                      s.residual,
+                     pt.categ_id,
                      s.company_id,
                      s.payment_term,
                      s.period_id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 94f181cd587..965d5078ae9 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -16,8 +16,10 @@
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
-                <field name="product_qty" invisible="1"/>
+                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
+                <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
+                <field name="product_qty"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="state" invisible="1"/>
@@ -97,16 +99,17 @@
                 <group expand="1" string="Group By...">
                     <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id','set_visible':True}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Default UoM" icon="terp-account" context="{'group_by':'uom_name'}"/>
                     <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
-                    <filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Category of Product" icon="terp-account" context="{'group_by':'categ_id'}"/>
                     <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
                     <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
                     <newline/>

From f25789bbfc4eb7e3854b05d1a8ea9f7b770cba6d Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.co.in>
Date: Mon, 31 May 2010 17:03:15 +0530
Subject: [PATCH 13/21] [IMP]: Make Done By fieldvisible in a view

bzr revid: jni@tinyerp.co.in-20100531113315-7fk4aosz91prm0bs
---
 addons/project/report/project_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 8fa33ad77ec..b444d175311 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -12,7 +12,7 @@
                 	<field name="name" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="done_by" invisible="1"/>
+                    <field name="done_by"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1"/>

From f1274a2a72772622d4e77d5c5320e00601fc2db3 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Mon, 31 May 2010 18:16:48 +0530
Subject: [PATCH 14/21] [REF]

bzr revid: jvo@tinyerp.com-20100531124648-0sweu1d8yvtznyst
---
 addons/mail_gateway/__openerp__.py  | 4 ++--
 addons/mail_gateway/mail_gateway.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index b5e56a03ee1..aaf12b926b3 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -27,8 +27,8 @@
     * IMAP / IMAP with SSL
     * POP / POP with SSL
     * SMTP / SMTP with TLS
-    * ACL basd access polocy 
-    * Queing and History for Emails
+    * ACL based access policy 
+    * Queueing and History for Emails
     * Easy Integration with any Module""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 8534c32c510..05d27ce3ef2 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -30,7 +30,7 @@ class one2many_domain(fields.one2many):
                                             user=user, context=context)
 
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
+        if context is None:
             context = {}
         res = {}
         msg_obj = obj.pool.get('mailgate.message')
@@ -65,7 +65,7 @@ class mailgate_thread(osv.osv):
         @param email: Email address if any
         @param details: Details of case history if any 
         @param context: A standard dictionary for contextual values"""
-        if not context:
+        if context is None:
             context = {}
         # The mailgate sends the ids of the cases and not the object list
         if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):

From 552c994c373b0531456193bbdcc3a532feab52b5 Mon Sep 17 00:00:00 2001
From: "DSH (Open ERP)" <dsh@tinyerp.com>
Date: Mon, 31 May 2010 20:22:20 +0530
Subject: [PATCH 15/21] [NEW] mailchimp module for marketing campaign - only
 mailchimp account access

bzr revid: dsh@tinyerp.com-20100531145220-6j6mu3huol444535
---
 .../marketing_campaign_mailchimp/__init__.py  |  24 ++++
 .../__openerp__.py                            |  41 ++++++
 .../marketing_campaign_mailchimp.py           | 131 ++++++++++++++++++
 .../marketing_campaign_mailchimp_view.xml     |  87 ++++++++++++
 4 files changed, 283 insertions(+)
 create mode 100644 addons/marketing_campaign_mailchimp/__init__.py
 create mode 100644 addons/marketing_campaign_mailchimp/__openerp__.py
 create mode 100644 addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
 create mode 100644 addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml

diff --git a/addons/marketing_campaign_mailchimp/__init__.py b/addons/marketing_campaign_mailchimp/__init__.py
new file mode 100644
index 00000000000..0f354314327
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import marketing_campaign_mailchimp
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py
new file mode 100644
index 00000000000..bd614607b97
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/__openerp__.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    "name" : "",
+    "version" : "1.1",
+    "depends" : ['marketing_campaign'],
+    "author" : "Tiny",
+    "category": 'Generic Modules/Marketing',
+    "description": """
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+        'marketing_campaign_mailchimp_view.xml',
+    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
new file mode 100644
index 00000000000..a1c3162cee2
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+import urllib2
+import simplejson as json
+
+mailchimp_url = 'http://%s.api.mailchimp.com/1.2'
+
+class marketing_campaign_mailchimp_account(osv.osv): #{{{
+    _name = "marketing.campaign.mailchimp.account"
+    
+    _columns = {
+            'name': fields.char('Account Name', size=64),
+            'username': fields.char('Username', size=64, required=True),
+            'password': fields.char('Password', size=64, required=True),
+            'apikey': fields.char('API Key', size=128),
+            'data_center': fields.selection([('us1', 'US1'), ('us2', 'US2'), 
+                                            ('uk1', 'UK1')], 'Data Center'),
+            'state': fields.selection([('draft', 'Draft'), ('approved', 'Approved'), 
+                           ('cancelled', 'Cancelled')], 'State', readonly=True)
+        }
+    
+    _defaults = {
+            'state': lambda *a: 'draft'
+        }
+    
+    def get_response(self, cr, uid, mailchimp_id, method, params={}):
+        mailchimp_account = self.browse(cr, uid, mailchimp_id)
+        params['output'] = 'json'
+        if method == 'login':
+                params['username'] = mailchimp_account.username
+                params['password'] = mailchimp_account.password
+        else :
+                params['apikey'] = mailchimp_account.apikey
+        params = '&'.join(map(lambda x : '%s=%s' %(x, params[x]), params))
+        url = mailchimp_url%mailchimp_account.data_center+ '/?method=%s'%method
+        req = urllib2.Request(url, params)
+        handle = urllib2.urlopen(req)
+        response = json.loads(handle.read())
+        return response 
+    
+    def button_approve(self, cr, uid, ids, context):
+        acc_obj = self.browse(cr, uid, ids)[0]
+        vals = {}
+        if not acc_obj.apikey:
+            method = 'login'
+        else:
+            method = 'ping'
+        response = self.get_response(cr, uid, acc_obj.id, method)
+        if 'error' not in response:
+            if method == 'login' :
+                vals['apikey'] = response
+            vals['state'] = 'approved'
+            self.write(cr, uid, ids, vals)
+        else : 
+            raise osv.except_osv('Error!!!',
+                            "Can't approved accoutnt : %s"%response['error'])
+        return True
+    
+    def button_cancel(self, cr, uid, ids, context):
+        self.write(cr, uid, ids, {'state': 'cancelled'})
+        return True
+    
+marketing_campaign_mailchimp_account() #}}}
+
+#class marketing_campaign_mailchimp_list(osv.osv_memory): #{{{
+#    _name = "marketing.campaign.mailchimp.list"
+#    
+#    _columns = {
+#            'name': fields.char('Name', size=64),
+#            'mailchimp_account_id': fields.many2one('marketing.campaign.mailchimp.account', 'Account'),
+#            'list_id': fields.char('List Id', size=64,),
+#        }
+#    
+#    _defaults = {
+#            'state': lambda *a: 'draft'
+#        }
+#    
+#marketing_campaign_mailchimp_list() #}}}
+
+class marketing_campaign_segment(osv.osv): #{{{
+    _inherit = "marketing.campaign.segment"
+    
+    _columns = {
+            'synchro': fields.boolean('Mailchimp Synchro'),
+            'mailchimp_account_id': fields.many2one(
+                            'marketing.campaign.mailchimp.account', 'Account'),
+            'mailchimp_list': fields.char('List', size=64),
+        }
+    
+    def onchange_mailchimp(self, cr, uid, ids, mailchimp_account_id):
+        if mailchimp_account_id:
+            return {'value':{'mailchimp_list':''}}
+        return {'value':{}}
+    
+    def onchange_mailchimp_list(self, cr, uid, ids, mailchimp_account_id, 
+                                                                mailchimp_list):
+        if mailchimp_account_id and mailchimp_list:
+            lists = self.pool.get('marketing.campaign.mailchimp.account').get_response(cr,
+                                             uid, mailchimp_account_id, 'lists')
+            list_names = [list['name'] for list in lists]
+            if mailchimp_list not in list_names:
+                raise osv.except_osv('Error!!!',"Lists doesn't exists")
+        else :
+            return {}
+        return {'value':{}}
+marketing_campaign_segment() #}}}
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
new file mode 100644
index 00000000000..6721cfc4fba
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <!--
+    ================================================================
+    Marketing Segments Inherited View - mailchimp
+    ================================================================
+    -->
+
+    <record model="ir.ui.view" id="view_marketing_campaign_segment_form_inherit">
+        <field name="name">marketing.campaign.segment.form.inherit</field>
+        <field name="model">marketing.campaign.segment</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="marketing_campaign.view_marketing_campaign_segment_form"/>
+        <field name="arch" type="xml">
+            <field name="date_done" position="after">
+                <separator string="Mailchimp Synchronization" colspan="4"/>
+                <field name="synchro"/>
+                <group colspan="2" attrs="{'invisible':[('synchro','!=',True)]}">
+                    <field name="mailchimp_account_id" attrs="{'required':[('synchro','=',True)]}" domain="[('state','=','approved')]" on_change="onchange_mailchimp(mailchimp_account_id)"/>
+                    <field name="mailchimp_list" attrs="{'required':[('synchro','=',True)]}" on_change="onchange_mailchimp_list(mailchimp_account_id,mailchimp_list)"/>
+                </group>
+            </field>
+        </field>
+    </record>
+
+
+    <!--
+    ================================================================
+    Mailchimp Account
+    ================================================================
+    -->
+
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+    <menuitem name="Mailchimps" id="menu_action_mailchimp" parent="base.menu_tools" />
+
+    <record model="ir.ui.view" id="view_marketing_campaign_mailchimp_account_tree">
+        <field name="name">marketing.campaign.mailchimp.account.tree</field>
+        <field name="model">marketing.campaign.mailchimp.account</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="All Accounts">
+                <field name="name"/>
+                <field name="username" />
+                <field name="password"/>
+                <field name="data_center"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_marketing_campaign_mailchimp_account_form">
+        <field name="name">marketing.campaign.mailchimp.account.form</field>
+        <field name="model">marketing.campaign.mailchimp.account</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Account">
+                <field name="name" select="1"/>
+                <newline/>
+                <field name="username" select="1"/>
+                <field name="password" select="1"/>
+                <field name="apikey" />
+                <field name="data_center"/>
+                <separator string="Status" colspan="4"/>
+                <group col="13" colspan="4">
+                    <field name="state" nolabel="1"/>
+                    <button name="button_approve" string="Approve" states="draft" type="object"/>
+                    <button name="button_cancel" string="Cancel" states="draft,approved" type="object"/>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_marketing_campaign_mailchimp_account">
+        <field name="name">All Mailchimp Accounts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">marketing.campaign.mailchimp.account</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_marketing_campaign_mailchimp_account_tree"/>
+    </record>
+
+    <menuitem id="menu_action_marketing_campaign_mailchimp_account" parent="menu_action_mailchimp" action="action_marketing_campaign_mailchimp_account" sequence="40"/>
+
+    </data>
+</openerp>

From a8b4f5b484235436c08402bba66488e1dde6e7b6 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Tue, 1 Jun 2010 04:44:56 +0100
Subject: [PATCH 16/21] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100601034456-kpsq8y0cqpk9c9k6
---
 addons/crm/i18n/es.po                    | 36 +++++++-----
 addons/idea/i18n/id.po                   | 72 ++++++++++++------------
 addons/profile_crm/i18n/pl.po            |  8 +--
 addons/project_retro_planning/i18n/pl.po |  8 +--
 4 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index d0b526f542e..79f079d2df0 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-05-17 23:03+0000\n"
-"Last-Translator: Carlos Incaser <Unknown>\n"
+"PO-Revision-Date: 2010-05-31 22:24+0000\n"
+"Last-Translator: victor tejada yau <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-19 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-01 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -951,6 +951,8 @@ msgid ""
 "Category related to the section.Subdivide the CRM cases independently or "
 "section-wise."
 msgstr ""
+"Categoria relacionada a la seccion. subdividido independientemente los casos "
+"CRM  o modo-seccion"
 
 #. module: crm
 #: field:crm.case.rule,act_state:0
@@ -1340,7 +1342,7 @@ msgstr "Calcular la segmentación"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Email"
-msgstr ""
+msgstr "Dirigir correo electronico"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
@@ -1563,6 +1565,8 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Te ayuda a organizar los procesos para emplear trabajos: evaluacion, "
+"reunion, integracion de correo electronico"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1619,7 +1623,7 @@ msgstr "Convertido"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Reply to Last Email"
-msgstr ""
+msgstr "Responder el ultimo correo electronico"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1629,7 +1633,7 @@ msgstr "Descripción de segmentación"
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Gives Location of Meeting"
-msgstr ""
+msgstr "Dando la ubicacion de la reunion"
 
 #. module: crm
 #: view:crm.case:0
@@ -1644,7 +1648,7 @@ msgstr "Historial"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_job
 msgid "Job Cases"
-msgstr ""
+msgstr "casos de trabajos"
 
 #. module: crm
 #: view:crm.job:0
@@ -1654,7 +1658,7 @@ msgstr "Trabajos - selección de personal"
 #. module: crm
 #: field:crm.case.rule,regex_name:0
 msgid "Regular Expression on Case Name"
-msgstr ""
+msgstr "Expresion regular en nombre de caso"
 
 #. module: crm
 #: field:crm.case,state:0
@@ -1719,7 +1723,7 @@ msgstr "¡No se ha encontrado Email en la dirección de su compañía!"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Search Funds"
-msgstr ""
+msgstr "buscar fondos"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1729,7 +1733,7 @@ msgstr "Tipo de reclamación"
 #. module: crm
 #: view:crm.case:0
 msgid "Helpdesk Support Tree"
-msgstr ""
+msgstr "Arbol de soporte tecnico"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -1760,12 +1764,14 @@ msgstr "Referencia"
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Exception de regla"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
 msgstr ""
+"Verifica esto si tu quieres enviar la norma en un correo electronico a el "
+"socio"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead2
@@ -1810,7 +1816,7 @@ msgstr "Importe de venta"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Add a CC"
-msgstr ""
+msgstr "Agregar un CC"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1838,7 +1844,7 @@ msgstr "Alarma"
 #. module: crm
 #: field:crm.case.rule,act_mail_to_watchers:0
 msgid "Mail to watchers (CC)"
-msgstr ""
+msgstr "correo a los observadores (CC)"
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1903,7 +1909,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_set_rrule
 msgid "Set RRULE"
-msgstr ""
+msgstr "Establecer RRULE"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor4
@@ -1981,7 +1987,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email Fail!"
-msgstr ""
+msgstr "Correo electronico fallo"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
diff --git a/addons/idea/i18n/id.po b/addons/idea/i18n/id.po
index 190156f359b..da1e1c37693 100644
--- a/addons/idea/i18n/id.po
+++ b/addons/idea/i18n/id.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 17:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-06-01 01:00+0000\n"
+"Last-Translator: Pandu Pradana <p4ndupr4d4n4@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-01 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -27,7 +27,7 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "Sangat Baik"
 
 #. module: idea
 #: view:idea.idea:0
@@ -39,7 +39,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
 #: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
 msgid "My Ideas"
-msgstr ""
+msgstr "Ide Saya"
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
@@ -51,13 +51,13 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Not Voted"
-msgstr ""
+msgstr "Tidak Memberikan Suara"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
 msgid "My Open Ideas"
-msgstr ""
+msgstr "Ide Terbuka Saya"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea
@@ -69,18 +69,18 @@ msgstr ""
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Kategori Anak"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr ""
+msgstr "Ide Baru"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr ""
+msgstr "Ide berdasar Kategori"
 
 #. module: idea
 #: field:idea.vote,score:0
@@ -101,7 +101,7 @@ msgstr ""
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 msgid "Statistics on Votes"
-msgstr ""
+msgstr "Statistik pada Voting"
 
 #. module: idea
 #: constraint:ir.model:0
@@ -112,17 +112,17 @@ msgstr ""
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Category for an idea"
-msgstr ""
+msgstr "Kategori untuk sebuah ide"
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Manager Ide"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr ""
+msgstr "Statistik Voting"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -161,12 +161,12 @@ msgstr "Pelaporan"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr ""
+msgstr "Statistik Voting Ide"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "idea.vote"
-msgstr ""
+msgstr "ide.voting"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -177,7 +177,7 @@ msgstr ""
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "Komentar anda"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_config
@@ -193,12 +193,12 @@ msgstr ""
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr ""
+msgstr "stat"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "Voting Saya"
 
 #. module: idea
 #: constraint:ir.ui.view:0
@@ -208,7 +208,7 @@ msgstr ""
 #. module: idea
 #: view:idea.vote:0
 msgid "Votes"
-msgstr ""
+msgstr "Memilih"
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
@@ -230,28 +230,28 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "Jumlah voting"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr ""
+msgstr "Nomer Voting"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "ide.ide"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
 #: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
 msgid "My Draft Ideas"
-msgstr ""
+msgstr "Draf ide saya"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 msgid "Vote"
-msgstr ""
+msgstr "Pemilihan"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -264,7 +264,7 @@ msgstr ""
 #: view:idea.idea:0
 #: model:ir.ui.menu,name:idea.menu_idea_idea
 msgid "All Ideas"
-msgstr ""
+msgstr "Semua Ide"
 
 #. module: idea
 #: view:idea.comment:0
@@ -277,17 +277,17 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr ""
+msgstr "Jumlah komentar"
 
 #. module: idea
 #: field:idea.idea,title:0
 msgid "Idea Summary"
-msgstr ""
+msgstr "Ringkasan Ide"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr ""
+msgstr "Kategori berdasarkan ide"
 
 #. module: idea
 #: field:idea.category,summary:0
@@ -299,7 +299,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 #: model:ir.ui.menu,name:idea.menu_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "Ide Terbuka"
 
 #. module: idea
 #: view:idea.idea:0
@@ -317,7 +317,7 @@ msgstr ""
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr ""
+msgstr "Kategori Induk"
 
 #. module: idea
 #: field:idea.idea,user_id:0
@@ -335,14 +335,14 @@ msgstr ""
 #: field:idea.vote,idea_id:0
 #: field:idea.vote.stat,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "Ide"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Sangat Buruk"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -352,7 +352,7 @@ msgstr ""
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
 msgid "All Votes"
-msgstr ""
+msgstr "Semua Pemilihan"
 
 #. module: idea
 #: view:idea.idea:0
@@ -367,7 +367,7 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,vote_avg:0
 msgid "Average Score"
-msgstr ""
+msgstr "Skor Rata-rata"
 
 #. module: idea
 #: view:idea.idea:0
@@ -377,4 +377,4 @@ msgstr ""
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr ""
+msgstr "Isi ide"
diff --git a/addons/profile_crm/i18n/pl.po b/addons/profile_crm/i18n/pl.po
index 3aa36f39bd8..f69342219c5 100644
--- a/addons/profile_crm/i18n/pl.po
+++ b/addons/profile_crm/i18n/pl.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-31 12:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-01 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
 #: model:ir.module.module,description:profile_crm.module_meta_information
 msgid "Profile for CRM"
-msgstr ""
+msgstr "Profil dla CRM"
diff --git a/addons/project_retro_planning/i18n/pl.po b/addons/project_retro_planning/i18n/pl.po
index 3edfe6ebb85..b6d03844595 100644
--- a/addons/project_retro_planning/i18n/pl.po
+++ b/addons/project_retro_planning/i18n/pl.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-31 12:41+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-01 03:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
 msgid "Project Retro planning"
-msgstr ""
+msgstr "Wsteczne planowanie projektu"

From af3c93419627b0560c2fb264577d757849e3574d Mon Sep 17 00:00:00 2001
From: "DSH (Open ERP)" <dsh@tinyerp.com>
Date: Tue, 1 Jun 2010 10:29:12 +0530
Subject: [PATCH 17/21] [FIX] view fix for the mailchimp

bzr revid: dsh@tinyerp.com-20100601045912-7gl89qhm7v5p1knu
---
 .../marketing_campaign_mailchimp_view.xml                    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
index 6721cfc4fba..7a84f17311d 100644
--- a/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
+++ b/addons/marketing_campaign_mailchimp/marketing_campaign_mailchimp_view.xml
@@ -43,7 +43,6 @@
             <tree string="All Accounts">
                 <field name="name"/>
                 <field name="username" />
-                <field name="password"/>
                 <field name="data_center"/>
                 <field name="state"/>
             </tree>
@@ -59,9 +58,9 @@
                 <field name="name" select="1"/>
                 <newline/>
                 <field name="username" select="1"/>
-                <field name="password" select="1"/>
+                <field name="password" select="1" password="True"/>
                 <field name="apikey" />
-                <field name="data_center"/>
+                <field name="data_center" required="1"/>
                 <separator string="Status" colspan="4"/>
                 <group col="13" colspan="4">
                     <field name="state" nolabel="1"/>

From 1471e8735bd682a408b113aeb9301e9e3e20f656 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 1 Jun 2010 11:00:23 +0530
Subject: [PATCH 18/21] [MOD] Improvements in views, new icon added for view
 button

bzr revid: vir@tinyerp.com-20100601053023-bgpp728959jtlxwa
---
 addons/mrp/mrp_view.xml                       | 26 +++++------
 .../mrp/report/mrp_production_order_view.xml  | 44 +++++++++----------
 addons/mrp_operations/mrp_operations_view.xml |  8 ++--
 .../mrp_procurement/mrp_procurement_view.xml  | 24 +++++-----
 addons/mrp_repair/mrp_repair_view.xml         |  6 +--
 addons/point_of_sale/pos_view.xml             | 14 +++---
 addons/product/product_view.xml               | 16 +++----
 7 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 15ed872391f..bcda66e8679 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -296,9 +296,9 @@
 	                    <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}"/>
+                    <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
                    </group>
                 </search>
             </field>
@@ -655,21 +655,21 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group col='9' colspan='4'>
-                       <filter icon="terp-mrp" string="Draft"
+                       <filter icon="terp-document-new" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current" name="Current"
+                       <filter icon="terp-check" string="Current" name="Current"
                            default="1"
                            domain="[('state','in',('confirmed','ready','exception'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
-                       <filter icon="terp-mrp" string="Ready"
+                       <filter icon="terp-camera_test" string="Ready"
                            domain="[('state','=','ready')]"
                            help="Manufacturing Orders which are ready to produce" />
-                       <filter icon="terp-mrp" string="In Production"
+                       <filter icon="terp-check" string="In Production"
                            domain="[('state','=','in_production')]"
                            help="Manufacturing Orders which are in production" />
                        <separator orientation="vertical"/>
-                       <filter icon="terp-mrp" string="Late"
+                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
                            help="Production started late" />
                        <separator orientation="vertical"/>
@@ -679,12 +679,12 @@
                        <field name="origin"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="10" col="8">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Routing" icon="terp-mrp" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
+                    <group expand="0" string="Group By" colspan="10" col="8">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 5663ef93210..93f7134d29f 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -48,10 +48,10 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-mrp" domain="[('year','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-mrp" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                   		<filter string="This Year" icon="terp-go-year" domain="[('year','=',time.localtime()[0])]" default="1" />
+						<filter string="This Month" icon="terp-go-month" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
                         <separator orientation="vertical"/>
-						<filter string="Current" icon="terp-mrp" domain="[('state','in',('open','draft'))]"/>
+						<filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
 						<separator orientation="vertical"/>
 						<field name="origin"/>
 						<field name="date_planned"/>
@@ -59,39 +59,39 @@
                    <newline/>
 
                    <group expand="1" string="Group By...">
-                    	<filter string="Source Location" icon="terp-mrp" context="{'group_by':'location_src_id'}"/>
-                    	<filter string="Destination Location" icon="terp-mrp" context="{'group_by':'location_dest_id'}"/>
-                    	<filter string="Picking" icon="terp-mrp" context="{'group_by':'picking_id'}"/>
+                    	<filter string="Source Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
+                    	<filter string="Destination Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
+                    	<filter string="Picking" icon="terp-accessories-archiver" context="{'group_by':'picking_id'}"/>
                     	<separator orientation="vertical"/>
-                        <filter string="Routing" icon="terp-mrp" context="{'group_by':'routing_id'}"/>
-                        <filter string="Product" name="Product" icon="terp-mrp" context="{'group_by':'product_id'}" />
-                        <filter string="State" icon="terp-mrp" context="{'group_by':'state'}"/>
+                        <filter string="Routing" icon="terp-stock_align_left_24" context="{'group_by':'routing_id'}"/>
+                        <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     	<separator orientation="vertical"/>
                     	<filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
-                    	<filter string="Month" icon="terp-mrp" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-mrp" context="{'group_by':'year'}"/>
+                    	<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
                     <newline/>
 	                <group expand="0" string="Extended options..." groups="base.group_extended">
-	                    <filter icon="terp-mrp" string="Draft" domain="[('state','=','draft')]"/>
-	                    <filter icon="terp-mrp" string="Picking Exception" domain="[('state','=','picking_except')]"/>
+	                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
+	                    <filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
 	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-mrp" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
-	                    <filter icon="terp-mrp" string="Ready to Produce" domain="[('state','=','ready')]"/>
+	                    <filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
+	                    <filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>
 	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]"/>
-	                    <filter icon="terp-mrp" string="Done" domain="[('state','=','done')]"/>
-	                    <filter icon="terp-mrp" string="Cancelled" domain="[('state','=','cancel')]"/>
+	                    <filter icon="terp-check" string="In Production" domain="[('state','=','in_production')]"/>
+	                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+	                    <filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
 	                    <newline/>
 	                    <filter icon="terp-mrp" string="Not urgent" domain="[('priority','=','0')]"/>
-	                    <filter icon="terp-mrp" string="Normal" domain="[('priority','=','1')]"/>
+	                    <filter icon="terp-check" string="Normal" domain="[('priority','=','1')]"/>
 	                    <separator orientation="vertical"/>
-	                    <filter icon="terp-mrp" string="Urgent" domain="[('priority','=','2')]"/>
-	                    <filter icon="terp-mrp" string="Very Urgent" domain="[('priority','=','3')]"/>
+	                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Urgent" domain="[('priority','=','2')]"/>
+	                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Very Urgent" domain="[('priority','=','3')]"/>
 	                    <separator orientation="vertical"/>
 	                    <field name="date_start"/>
 						<field name="date_finnished"/>
-	                </group>                   
+	                </group>
                   </search>
             </field>
         </record>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 37e90a995b4..a5c6564644e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -96,10 +96,10 @@
                 		<field name="production_id"/>
                 	</group>
                 	<newline/>
-                    <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product'}"/>
-                        <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
+                    <group expand="0" string="Group By" colspan="10" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
index 1defa214754..7345dc94f93 100644
--- a/addons/mrp_procurement/mrp_procurement_view.xml
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -86,12 +86,12 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
-                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
-                       <filter icon="terp-mrp" string="Late"
+                       <filter icon="terp-check" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-emblem-important" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
+                       <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
                            help="Procurement started late" />
-                       <filter icon="terp-mrp" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
+                       <filter icon="terp-gtk-go-back-rtl" string="To Fix" domain="[('state', '=', 'exception'),('message','=','')]" help="Procurement Orders with exceptions and without message"/>
                        <separator orientation="vertical"/>
                        <field name="name"/>
                        <field name="origin"/>
@@ -100,11 +100,11 @@
                        <field name="state" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By" colspan="4" col="8" groups="base.group_extended">
-                        <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Reason" icon="terp-mrp" domain="[]" context="{'group_by':'name'}"/>
-                        <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-                    	<filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
+                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
+                    	<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -191,9 +191,9 @@
                         <field name="product_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Warehouse" icon="terp-stock" domain="[]"  context="{'group_by':'warehouse_id'}"/>
-                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                    <group expand="0" string="Group By..." colspan="4" col="10">
+                        <filter string="Warehouse" icon="terp-go-home" domain="[]"  context="{'group_by':'warehouse_id'}"/>
+                        <filter string="Location" icon="terp-go-home" domain="[]" context="{'group_by':'location_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 47e80be3e31..36afb1dd97a 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -184,9 +184,9 @@
               	</group>
               	<newline/>
                   <group expand="1" string="Group By" colspan="10" col="8" groups="base.group_extended">
-                      <filter string="Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
-                      <filter string="State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
-                      <filter string="Partner" icon="terp-mrp" domain="[]" context="{'group_by':'partner_id'}"/>
+                      <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
+                      <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                      <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                   </group>
              </search>
           </field>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index ef8ae334810..62b15db0234 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -153,19 +153,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <filter icon="terp-sale" string="Quotations" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-sale" string="Running" domain="[('state','in',('payment','advance'))]"/>
+                    <filter icon="terp-document-new" string="Quotations" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-check" string="Running" domain="[('state','in',('payment','advance'))]"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="11" col="11" groups="base.group_extended">
-                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8b08982acd0..37bdddfeb8c 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,22 +9,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
-                   <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
-                   <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
+                   <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
+                   <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
                    <separator orientation="vertical"/>
-                   <filter string="Can be sold" icon="terp-stock" domain="[('sale_ok','=',1)]"/>
-                   <filter string="Can be Purchased" icon="terp-stock" domain="[('purchase_ok', '=', 1)]" />
+                   <filter string="Can be sold" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
+                   <filter string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
                    <separator orientation="vertical"/>
                    <field name="default_code"/>
                    <field name="name"/>
                    <field name="categ_id" widget="selection" operator="child_of"/>
                    <newline/>
-                   <group  expand='1' string='Group by...' groups="base.group_extended">
-                       <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
+                   <group  expand='0' string='Group by...' groups="base.group_extended">
+                       <filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
                        <separator orientation="vertical"/>
-                       <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
                        <separator orientation="vertical"/>
-                       <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
+                       <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
                    <newline/>
                    <group expand="0" string="Extended options..." groups="base.group_extended">

From 6426e1214d7824ae985a7b9b20056cb6e1c18456 Mon Sep 17 00:00:00 2001
From: Quentin De Paoli <qdp@cyan>
Date: Tue, 1 Jun 2010 09:59:41 +0200
Subject: [PATCH 19/21] [MERGE] merge team2's work of sprint 20-21 ('event on
 partner cleaning' task)

bzr revid: qdp@cyan-20100601075941-q6u1gebh37l1ghs3
---
 bin/addons/base/res/partner/crm.py           | 30 +----------
 bin/addons/base/res/partner/crm_view.xml     | 55 ++------------------
 bin/addons/base/res/partner/partner_view.xml |  2 +-
 bin/addons/base/security/ir.model.access.csv |  2 -
 4 files changed, 8 insertions(+), 81 deletions(-)

diff --git a/bin/addons/base/res/partner/crm.py b/bin/addons/base/res/partner/crm.py
index c48c5bbddac..ba9dbcf1b04 100644
--- a/bin/addons/base/res/partner/crm.py
+++ b/bin/addons/base/res/partner/crm.py
@@ -59,43 +59,17 @@ class res_partner_event(osv.osv):
     _name = "res.partner.event"
     _columns = {
         'name': fields.char('Events',size=64, required=True),
-        'som': fields.many2one('res.partner.som', 'State of Mind'),
         'description': fields.text('Description'),
-        'planned_cost': fields.float('Planned Cost'),
-        'planned_revenue': fields.float('Planned Revenue'),
-        'probability': fields.float('Probability (0.50)'),
-        'document': fields.reference('Document', selection=_links_get, size=128),
         'partner_id': fields.many2one('res.partner', 'Partner', select=True),
         'date': fields.datetime('Date', size=16),
         'user_id': fields.many2one('res.users', 'User'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
-        'partner_type': fields.selection([('customer','Customer'),('retailer','Retailer'),('prospect','Commercial Prospect')], 'Partner Relation'),
-        'type': fields.selection([('sale','Sale Opportunity'),('purchase','Purchase Offer'),('prospect','Prospect Contact')], 'Type of Event'),
-        'event_ical_id': fields.char('iCal id', size=64),
     }
     _order = 'date desc'
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
+        'user_id': lambda self, cr, uid, context: uid, 
     }
 res_partner_event()
 
 
-class res_partner_event_type(osv.osv):
-    _name = "res.partner.event.type"
-    _description = "Partner Events"
-    _columns = {
-        'name': fields.char('Event Type',size=64, required=True),
-        'key': fields.char('Key', size=64, required=True),
-        'active': fields.boolean('Active'),
-    }
-    _defaults = {
-        'active': lambda *a: 1
-    }
-    def check(self, cr, uid, key, context={}):
-        return self.search(cr, uid, [('key','=',key)])
-res_partner_event_type()
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/bin/addons/base/res/partner/crm_view.xml b/bin/addons/base/res/partner/crm_view.xml
index 3a0e25b8898..d4cde6844bd 100644
--- a/bin/addons/base/res/partner/crm_view.xml
+++ b/bin/addons/base/res/partner/crm_view.xml
@@ -33,40 +33,6 @@
         <menuitem id="next_id_14" name="Partner Events" parent="base.menu_base_config_partner"/>
         <menuitem action="res_partner_canal-act" id="menu_res_partner_canal-act" parent="next_id_14"/>
 
-        <record id="res_partner_event_type-view" model="ir.ui.view">
-            <field name="name">res.partner.event.type.form</field>
-            <field name="model">res.partner.event.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Event Type">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
-                    <field name="key" select="1"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="res_partner_event_type_view_tree" model="ir.ui.view">
-            <field name="name">res.partner.event.type.tree</field>
-            <field name="model">res.partner.event.type</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Event Type">
-                    <field name="name"/>
-                    <field name="active"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="res_partner_event_type-act" model="ir.actions.act_window">
-            <field name="name">Active Partner Events</field>
-            <field name="res_model">res.partner.event.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'active_test': False}</field>
-        </record>
-        <menuitem action="res_partner_event_type-act" id="menu_res_partner_event_type-act" parent="base.next_id_14"/>
-
         <record id="res_partner_som_tree-view" model="ir.ui.view">
             <field name="name">res.partner.som.tree</field>
             <field name="model">res.partner.som</field>
@@ -103,22 +69,13 @@
             <field name="model">res.partner.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Events">
+                <form string="Event Logs">
                     <separator colspan="4" string="General Description"/>
-                    <field name="name" select="1"/>
-                    <field name="partner_type" select="1"/>
-                    <field name="som" select="1"/>
+                    <field name="name" select="1" string="Name"/>
                     <field name="date" select="1"/>
-                    <field name="canal_id" select="1"/>
-                    <field name="type" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="probability"/>
-                    <field name="planned_revenue"/>
-                    <field name="planned_cost"/>
                     <separator colspan="4" string="Description"/>
-                    <field colspan="4" name="description"/>
-                    <separator colspan="4" string="Document Link"/>
-                    <field colspan="4" name="document"/>
+                    <field colspan="4" name="description" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -128,11 +85,9 @@
             <field name="model">res.partner.event</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Partner Events">
+                <tree string="Event Logs">
                     <field name="date"/>
-                    <field name="name"/>
-                    <field name="som"/>
-                    <field name="partner_type"/>
+                    <field name="name" string="Event"/>
                     <field name="user_id"/>
                 </tree>
             </field>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 415c15e0455..dfec5b51454 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -312,7 +312,7 @@
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                         <page string="History">
-                            <field colspan="4" name="events" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="events" nolabel="1" widget="one2many_list" string="Event Logs"/>
                         </page>
 
                     </notebook>
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index 03757eb397e..ba9a7287d81 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -71,8 +71,6 @@
 "access_res_partner_category_group_partner_manager","res_partner_category group_partner_manager","model_res_partner_category","group_partner_manager",1,1,1,1
 "access_res_partner_event_group_user","res_partner_event group_user","model_res_partner_event","group_user",1,1,1,1
 "access_res_partner_event_group_partner_manager","res_partner_event group_partner_manager","model_res_partner_event","group_partner_manager",1,1,1,1
-"access_res_partner_event_type_group_partner_manager","res_partner_event_type group_partner_manager","model_res_partner_event_type","group_partner_manager",1,1,1,1
-"access_res_partner_event_type_group_user","res_partner_event_type group_user","model_res_partner_event_type","group_user",1,0,0,0
 "access_res_partner_som_group_user","res_partner_som group_user","model_res_partner_som","group_partner_manager",1,1,1,1
 "access_res_partner_som_group_partner_manager","res_partner_som group_partner_manager","model_res_partner_som","group_user",1,0,0,0
 "access_res_partner_title_group_user","res_partner_title group_user","model_res_partner_title","group_partner_manager",1,1,1,1

From b57d119133e969f3f4494b07575d3f7c11f46b0d Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Tue, 1 Jun 2010 16:17:58 +0530
Subject: [PATCH 20/21] [IMP,MOD] Icons added for views in Project_*,
 Purchase_*, report_intraset, resource modules

bzr revid: vir@tinyerp.com-20100601104758-3u4cp6gem4q0b1wb
---
 .../mrp/report/mrp_production_order_view.xml  |  2 +-
 addons/project/project_view.xml               | 44 ++++++++--------
 addons/project/report/project_report_view.xml | 38 +++++++-------
 addons/project_issue/project_issue_view.xml   | 38 +++++++-------
 .../report/project_issue_report_view.xml      | 52 +++++++++----------
 .../project_long_term_view.xml                | 16 +++---
 .../report/task_report_view.xml               | 10 ++--
 addons/purchase/purchase_view.xml             | 28 +++++-----
 .../purchase/report/purchase_report_view.xml  | 52 +++++++++----------
 .../purchase_requisition_view.xml             | 26 +++++-----
 .../report_intrastat_view.xml                 |  4 +-
 addons/resource/resource_view.xml             | 14 ++---
 12 files changed, 162 insertions(+), 162 deletions(-)

diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 93f7134d29f..ec58fa31231 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -83,7 +83,7 @@
 	                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
 	                    <filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
 	                    <newline/>
-	                    <filter icon="terp-mrp" string="Not urgent" domain="[('priority','=','0')]"/>
+	                    <filter icon="terp-gtk-media-pause" string="Not urgent" domain="[('priority','=','0')]"/>
 	                    <filter icon="terp-check" string="Normal" domain="[('priority','=','1')]"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Urgent" domain="[('priority','=','2')]"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 05d34e7445d..a9e97c00864 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -111,11 +111,11 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Draft" domain="[('state', 'in',('draft'))]" help="Draft Projects" default="1"/>
-                       <filter icon="terp-project" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
+                       <filter icon="terp-document-new" string="Draft" domain="[('state', 'in',('draft'))]" help="Draft Projects" default="1"/>
+                       <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/>
                        <separator orientation="vertical"/>
-                       <filter icon="terp-project" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
+                       <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
+                       <filter icon="terp-personal-" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
                        <separator orientation="vertical"/>
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1"/>
@@ -123,8 +123,8 @@
                    </group>
                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Users" name="Users"  icon="terp-project" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner"  icon="terp-project" domain = "[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Users" name="Users"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
                       </group>
                </search>
             </field>
@@ -408,15 +408,15 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="In Progress" domain="[('state','=','open')]" help="Open 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" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection">
-                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
@@ -424,14 +424,14 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Users" name="group_user_id" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="Project" name="group_project_id" icon="terp-project" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
-                        <filter string="Stage" name="group_stage_id" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
-                        <filter string="State" name="group_state" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Deadline" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
-                        <filter string="End Date" icon="terp-project" domain="[]" context="{'group_by':'date_end'}"/>
+                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="End Date" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
                     </group>
                 </search>
             </field>
@@ -605,8 +605,8 @@
            <field name="arch" type="xml">
                <search string="Messages">
                    <group col="20" colspan="4">
-                       <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-project" string="This Month" />
-                       <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-project" string="Today" />
+                       <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-go-month" string="This Month" />
+                       <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-go-today" string="Today" />
 
 	                   <separator orientation="vertical"/>
 	                   <field name="subject"/>
@@ -616,9 +616,9 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                       <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                       <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
-                       <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+                       <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                       <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                    </group>
                </search>
            </field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 07b4263a5cf..a87dade8573 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -56,49 +56,49 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                 	<group>
-	                    <filter icon="gtk-media-rewind" string="  365 Days  "
+	                    <filter icon="terp-go-year" string="  365 Days  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 	                    	    help="Tasks performed in last 365 Days"/>
-	                    <filter icon="gtk-media-rewind" string="   30 Days   "
+	                    <filter icon="terp-go-month" string="   30 Days   "
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Tasks performed in last 30 days"/>
-		                <filter icon="gtk-media-rewind"
+		                <filter icon="terp-go-week"
 	                            string="    7 Days    "
 	                            separator="1"
 	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Tasks during last 7 days"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Draft"
-	                    		icon="terp-project"
+	                    		icon="terp-document-new"
 	                    		domain="[('state','=','draft')]"
 	                    		help = "Draft tasks"/>
 		                <filter string="Current"
-		                		icon="terp-project"
+		                		icon="terp-check"
 		                		domain="[('state', '=' ,'open')]"
 		                		help = "In progress tasks"/>
 	                   	<filter string="Pending"
-	                   			icon="terp-project"
+	                   			icon="terp-gtk-media-pause"
 	                   			domain="[('state','=','pending')]"
 	                   			help = "Pending tasks"/>
                       	<filter string="Done"
-                    			icon="terp-project"
+                    			icon="terp-dialog-close"
                     			name="done"
                     			domain="[('state','=','done')]"/>
 	  					<separator orientation="vertical"/>
 	  					<field name="partner_id" />
 	                    <field name="user_id" widget="selection">
-	                        <filter icon="terp-project"
+	                        <filter icon="terp-personal"
 	                        		string="My Task"
 	                        		help = "My tasks"
 	                        		domain="[('user_id','=',uid)]" />
-	                        <filter icon="terp-project"
+	                        <filter icon="terp-personal-"
 	                        		string="Non Assigned Tasks to users"
 	                        		help="Non Assigned Tasks to users"
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
 	                    <field name="project_id" widget="selection">
-	                        <filter icon="terp-project"
+	                        <filter icon="terp-folder-blue"
 	                        		string="My Projects"
 	                        		help="My Projects"
 	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
@@ -106,20 +106,20 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="10" col="11">
-                        <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
-                        <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
+                        <filter string="Project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
-                        <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
-                        <filter string="Done By" icon="terp-project" context="{'group_by':'done_by'}" />
+                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
+                        <filter string="Done By" icon="terp-personal" context="{'group_by':'done_by'}" />
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Stage" icon="terp-project" context="{'group_by':'type'}" />
+                        <filter string="Stage" icon="terp-stage" context="{'group_by':'type'}" />
                         <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-project" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
                     <newline/>
 	                <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index aa0cb7e91f5..fff8cf07df3 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -180,18 +180,18 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group colspan="4" col="20">
-						<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-project" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-project"/>
-						
+						<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
+                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
+                        <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
+
 						<separator orientation="vertical"/>
-						
-                        <filter icon="gtk-home" string="   Today   "
+
+                        <filter icon="terp-go-today" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
                             help="Today's bugs"
                             />
-                        <filter icon="gtk-media-rewind"
+                        <filter icon="terp-go-week"
                             string="    7 Days    " separator="1"
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
@@ -200,26 +200,26 @@
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
-                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
+                            <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
+                            <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Bugs"/>
                         </field>
                         <field name="project_id" select="1" widget="selection" string="Project"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-	                    <filter string="Stage" icon="terp-crm" domain="[]"
+	                    <filter string="Stage" icon="terp-stage" domain="[]"
 	                        context="{'group_by':'stage_id'}" />
-	                    <filter string="Priority" icon="terp-crm" domain="[]"
+	                    <filter string="Priority" icon="terp-rating-rated" domain="[]"
 	                        context="{'group_by':'priority'}" />
-	                    <filter string="Campaign" icon="terp-crm"
+	                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
 	                        domain="[]" context="{'group_by':'type_id'}" />
 	                    <separator orientation="vertical" />
-	                    <filter string="Partner" icon="terp-crm" domain="[]"
+	                    <filter string="Partner" icon="terp-personal" domain="[]"
 	                        context="{'group_by':'partner_id'}" />
-	                    <filter string="Salesman" icon="terp-crm"
+	                    <filter string="Salesman" icon="terp-personal"
 	                        domain="[]" context="{'group_by':'user_id'}" />
 						<separator orientation="vertical" />
-						<filter string="Month" icon="terp-crm"
+						<filter string="Month" icon="terp-go-month"
 	                        domain="[]" context="{'group_by':'create_date'}" />
 	                    <separator orientation="vertical" />
                 	</group>
@@ -281,12 +281,12 @@
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
                     <group>
-                        <filter icon="gtk-home" string="   Today   "
+                        <filter icon="terp-go-today" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
                             help="Today's features"
                             />
-                        <filter icon="gtk-media-rewind"
+                        <filter icon="terp-go-week"
                             string="    7 Days    " separator="1"
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Features during last 7 days"
@@ -297,8 +297,8 @@
                         <field name="name" select='1' string="Feature description"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                            <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
+                            <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>
                         <field name="project_id" select="1" widget="selection" string="Project"/>
 
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 5694d33993b..adc1b3c662f 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -53,25 +53,25 @@
                   <group col="16" colspan="8">
                    		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter string="This Month" icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                       <filter icon="terp-go-week" string="7 Days" separator="1"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
 
                    		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
+                        <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
+					   <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
 
@@ -88,7 +88,7 @@
 
                    		</field>
                    		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
+                           <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
@@ -96,11 +96,11 @@
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <group  expand="0" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-personal"
                         	domain="[]" context="{'group_by':'user_id'}" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
 
@@ -109,42 +109,42 @@
                         	context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
                         	domain="[]" context="{'group_by':'state'}" />
 
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                         	domain="[]" context="{'group_by':'categ_id'}" />
 
-						<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+						<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
 	            		<separator orientation="vertical"/>
-	            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
-	            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
+	            		<filter string="Project"  icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" />
+	            		<filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
 	            		<separator orientation="vertical"/>
-	            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
-	            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
+	            		<filter string="Type"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+	            		<filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
 	            		<newline/>
-	            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
-	            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-	            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/>
+	            		<filter string="Assigned To"  icon="terp-personal" domain="[]" context="{'group_by':'assigned_to'}"/>
+	            		<filter string="Partner"  icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+	            		<filter string="Channel"  icon="terp-call-start" domain="[]" context="{'group_by':'canal_id'}"/>
 
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-sale"
                         	domain="[]" context="{'group_by':'day'}"/>
 
-                        <filter string="Month" icon="terp-sale"
+                        <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
 
-                        <filter string="Year" icon="terp-sale"
+                        <filter string="Year" icon="terp-go-year"
                         	domain="[]" context="{'group_by':'name'}" />
 
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                         <filter icon="terp-sale"
+                         <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-sale"
+                    	<filter icon="terp-gtk-stop"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
                     	<group>
@@ -156,8 +156,8 @@
                     		<field name="task_id"/>
                     		<separator orientation="vertical"/>
                     		<field name="assigned_to" widget="selection">
-                    			<filter icon="terp-crm"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
- 						    	<filter icon="terp-crm"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
+                    			<filter icon="terp-personal"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
+ 						    	<filter icon="terp-personal-"  help="Non Assigned Project Issue"  domain="[('assigned_to','=',False)]"/>
                     		</field>
                     		<newline/>
                     		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3c82086d13b..d339c4e3535 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -196,23 +196,23 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-project" default="1"/>
-                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
-                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/>
+                        <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
+                        <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
                         <field name="responsible_id" widget="selection"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'responsible_id'}"/>
-                        <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 35a7c9f3de6..5a653985a20 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -148,16 +148,16 @@
             <field name="arch" type="xml">
             	<search string="Tasks by User">
             		<group colspan="4" col="3">
-	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
+	            		<filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" />
+	            		<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" />
 	            		<separator orientation="vertical"/>
 	                    <field name="user_id" select="1" widget="selection"/>
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
-                	    <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" default="1" />
-                    	<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
-                    	<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
+                	    <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" default="1" />
+                    	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" />
+                    	<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" />
                 	</group>
             	</search>
             </field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 94a43cad0d9..72d4feb0ae9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -150,12 +150,12 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
-                    <filter icon="terp-purchase" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
-                    <filter icon="terp-purchase" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
-                    <filter icon="terp-purchase" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
+                    <filter icon="terp-camera_test" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
+                    <filter icon="terp-check" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
+                    <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
@@ -163,13 +163,13 @@
                     <field name="create_uid" select="1" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Expected Date" icon="terp-sale" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                    <filter string="Source Document”" icon="terp-purchase" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
+                    <filter string="Source Document”" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
@@ -290,9 +290,9 @@
                         <field name="product_id" widget="selection" />
                         </group>
                         <newline/>
-                        <group expand="1" string="Group By...">
-                        <filter string="State" icon="terp-crm" domain="[]" context="{'group_by' : 'state'}" />
-                        <filter string="Order Reference" icon="terp-crm" domain="[]" context="{'group_by' : 'product_id'}" />
+                        <group expand="0" string="Group By...">
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
+                        <filter string="Order Reference" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by' : 'product_id'}" />
                         </group>
                </search>
             </field>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 0cfc357b51f..5dd8dd31900 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -53,26 +53,26 @@
         <field name="arch" type="xml">
             <search string="Purchase Orders">
             <group colspan="10" col="12">
-            	<filter icon="terp-purchase" string="This Year"
+            	<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="Tasks performed in this year"/>
-                <filter icon="terp-purchase" string="This Month"
+                <filter icon="terp-go-month" string="This Month"
                 		name="month"
                 		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                 		help="Tasks performed in this month"/>
-                <filter icon="gtk-media-rewind"
+                <filter icon="terp-go-week"
                         string="    7 Days    "
                         separator="1"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                         help="Tasks during last 7 days"/>
                 <separator orientation="vertical"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-document-new"
                     	string="Quotations"
                     	domain="[('state','=','draft')]"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-gtk-media-pause"
                 		string="Waiting Schedule"
                 		domain="[('state','=','waiting_date')]"/>
-                <filter icon="terp-purchase"
+                <filter icon="terp-camera_test"
                 		string="Manual in progress"
                 		domain="[('state','=','manual')]"/>
 
@@ -80,7 +80,7 @@
                 <field name="partner_id" string="Supplier"/>
                 <field name="product_id"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-purchase"
+                    <filter icon="terp-personal-"
                     		string="Purchase Non User"
                     		help="Purchase Non User"
                     		domain="[('user_id','=',False)]"/>
@@ -89,30 +89,30 @@
 				</group>
 				<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Location" icon="terp-purchase" context="{'group_by':'location_id'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Responsible" name="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
-                    <filter string="Pricelist" icon="terp-purchase" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Validated by" icon="terp-purchase" context="{'group_by':'validator'}"/>
+                    <filter string="Responsible" name="Responsible" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Pricelist" icon="terp-dolar" context="{'group_by':'pricelist_id'}"/>
+                    <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Address Contact Name" icon="terp-purchase" context="{'group_by':'partner_address_id'}"/>
-                    <filter string="Dest. Contact Name" icon="terp-purchase" context="{'group_by':'dest_address_id'}"/>
-                    <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
+                    <filter string="Address Contact Name" icon="terp-personal" context="{'group_by':'partner_address_id'}"/>
+                    <filter string="Dest. Contact Name" icon="terp-gtk-jump-to-ltr" context="{'group_by':'dest_address_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Supplier" name="partner_id" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
-                    <filter string="Fiscal Position" icon="terp-purchase" context="{'group_by':'fiscal_position'}"/>
+                    <filter string="Supplier" name="partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Fiscal Position" icon="terp-go-year" context="{'group_by':'fiscal_position'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-purchase" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-purchase" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-purchase" context="{'group_by':'name'}"/>
+                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
+                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
                 </group>
 				<newline/>
                 <group expand="0" string="Extended filters..." colspan="10" col="12" groups="base.group_extended">
-                    <filter icon="terp-purchase" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
-                    <filter icon="terp-purchase" string="Done" domain="[('state','=','done')]"/>
+                    <filter icon="terp-emblem-important" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <separator orientation="vertical"/>
                     <field name="date_approve"/>
                     <separator orientation="vertical"/>
@@ -122,8 +122,8 @@
                     <field name="validator" widget="selection"/>
 
                     <newline/>
-                    <filter icon="terp-purchase" string="Invoice Exception  " domain="[('state','=','invoice_except')]"/>
-                    <filter icon="terp-purchase" string="Cancel" domain="[('state','=','cancel')]"/>
+                    <filter icon="terp-emblem-important" string="Invoice Exception  " domain="[('state','=','invoice_except')]"/>
+                    <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]"/>
                     <separator orientation="vertical"/>
                     <field name="expected_date"/>
                     <separator orientation="vertical"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 4a4587f5f04..186815c9bc3 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -39,7 +39,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="origin"/>
-					<field name="company_id" groups="base.group_multi_company" widget="selection"/>                    
+					<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
 
                 <notebook colspan="4">
@@ -65,7 +65,7 @@
 	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
 						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
 						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-	                </group>                        
+	                </group>
                     </page>
                     <page string="Quotations">
 						<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
@@ -77,8 +77,8 @@
 			                    <field name="location_id"/>
 			                    <field name="minimum_planned_date"/>
 			                    <field name="origin"/>
-			                    <field name="state"/>	
-			                    </tree>	
+			                    <field name="state"/>
+			                    </tree>
                      	</field>
 						<separator colspan="4" string=""/>
                      	<group col="8" colspan="4">
@@ -117,8 +117,8 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
-                    <filter icon="terp-purchase" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
-					<filter icon="terp-purchase" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>                    
+                    <filter icon="terp-check" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
+					<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Requisition Reference"/>
                     <field name="purchase_ids" select="1"/>
@@ -127,13 +127,13 @@
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="10" groups="base.group_extended">
-                    <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-  					<separator orientation="vertical"/>                    
-                    <filter string="Date Start" icon="terp-purchase" domain="[]" context="{'group_by':'date_start'}"/>
-                    <filter string="Date End" icon="terp-purchase" domain="[]" context="{'group_by':'date_end'}"/>
-                    <separator orientation="vertical"/>                    
-					<filter string="Origin" icon="terp-purchase" domain="[]" context="{'group_by':'origin'}"/>
+                  <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+  					<separator orientation="vertical"/>
+                    <filter string="Date Start" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                    <filter string="Date End" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
+                    <separator orientation="vertical"/>
+					<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index e7a12e8ac5e..0449b097ec4 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -97,8 +97,8 @@
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <group col="10" colspan="4">
-                        <filter string="This Year" icon="terp-stock" domain="[('name','=',time.localtime()[0])]"/>
-                        <filter string="This Month" icon="terp-stock" domain="[('month','=',time.localtime()[1])]"/>
+                        <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" select="1"/>
                         <field name="month" select="1"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 5a1e4429754..adc3b6cd115 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -17,10 +17,10 @@
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                   <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
@@ -55,9 +55,9 @@
                        <field name="resource_id" string="Resource" widget="selection"/>
                    </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resouce" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/>
-                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="Resouce" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
             </field>

From 602cefb0c33740e82c142f994bb6996075c795ad Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 2 Jun 2010 04:33:01 +0100
Subject: [PATCH 21/21] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100602033301-7e2zpmcn74gkvu98
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/pl.po    | 6 +++---
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 46177ccaf8d..f994df7b464 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-31 04:12+0000\n"
+"PO-Revision-Date: 2010-06-01 05:21+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-01 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 98b8fbdd3c6..901ff235284 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-31 04:11+0000\n"
+"PO-Revision-Date: 2010-06-01 05:19+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-01 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po
index cac6c9f6a18..73c0b684140 100644
--- a/bin/addons/base/i18n/pl.po
+++ b/bin/addons/base/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-31 12:39+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-06-01 04:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-01 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 09bb6d0cd9a..ae549c8e0b9 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-31 04:13+0000\n"
+"PO-Revision-Date: 2010-06-01 05:22+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: 2010-06-01 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 63ebfb9fcee..7f7bd981104 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-31 04:12+0000\n"
+"PO-Revision-Date: 2010-06-01 05:22+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-01 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index d413eb689a4..ae94c8b5e67 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-31 04:12+0000\n"
+"PO-Revision-Date: 2010-06-01 05:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-01 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-06-02 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base