diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 54c1082a2c1..263c711dfff 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -346,9 +346,9 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                    <group col="10" colspan="4">
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter icon="terp-account" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
+                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
@@ -357,16 +357,16 @@
                         <field name="amount_total"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-account" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-account" domain="[]"  context="{'group_by':'user_id'}"/>
-                        <filter string="State" icon="terp-account" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Salesman" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Invoice Date" icon="terp-account" domain="[]"  context="{'group_by':'date_invoice'}"/>
-                        <filter string="Due Date" icon="terp-account" domain="[]"  context="{'group_by':'date_due'}"/>
+                        <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>
+                        <filter string="Due Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_due'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4636428dc0c..318795aaa58 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -836,8 +836,8 @@
             <field name="arch" type="xml">
                 <search string="Search Entry Lines">
                     <group col='10' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
                         <separator orientation="vertical"/>
                         <field name="date" select='1'/>
                         <field name="account_id" select='1'/>
@@ -979,8 +979,8 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
                         <separator orientation="vertical"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 87f0c741768..7d325b771ea 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.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-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 0181308a55e..b37100f9c97 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 1d74edb3f3a..03037963ded 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -25,8 +25,8 @@
             <field name="arch" type="xml">
             	<search string="Analytic Account">
             		<group col="8" colspan="4">
-	            		<filter icon="gtk-execute" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
-	            		<filter icon="gtk-execute" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+	            		<filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
+	            		<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="code" select="1"/>
@@ -414,8 +414,8 @@
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
                 	<group col="8" colspan="4">
-	                	<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-		               	<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
+	                	<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
+		               	<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
 		               	<separator orientation="vertical"/>
 	                    <field name="name" select="1"/>
 	               		<field name="month" select="1"/>
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index 137fa0c69ae..bd9101a3382 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -45,10 +45,10 @@
         <field name="arch" type="xml">
             <search string="Accounts Analysis">
                <group>
-               <filter icon="terp-account"
+               <filter icon="terp-go-today"
 	                    	string="At Date"
 	                    	domain="[('currency_mode','=', 'current')]"/>
-	                <filter icon="terp-account"
+	                <filter icon="terp-stock_format-default"
 	                    	string="Average Rate"
 	                    	domain="[('currency_mode','=','average')]"/>
 	            <separator orientation="vertical"/>
@@ -56,15 +56,15 @@
             	<field name="code"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'name'}"/>
-                    <filter string="Code"  icon="terp-account" context="{'group_by':'code'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'name'}"/>
+                    <filter string="Code"  icon="terp-stock_format-scientific" context="{'group_by':'code'}"/>
+                    <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Currencies Rate" icon="terp-account" context="{'group_by':'currency_mode'}"/>
-                    <filter string="Internal Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'user_type'}"/>
-                    <filter string="Parent Account" icon="terp-account" context="{'group_by':'parent_account_id'}"/>
+                    <filter string="Currencies Rate" icon="terp-dolar" context="{'group_by':'currency_mode'}"/>
+                    <filter string="Internal Type" icon="terp-go-home" context="{'group_by':'type'}"/>
+                    <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}"/>
+                    <filter string="Parent Account" icon="terp-folder-orange" context="{'group_by':'parent_account_id'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 82a063256c1..1564859540a 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -35,14 +35,14 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<filter icon="terp-go-year" string="  365 Days  "
 		                    domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Analytic Entries of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                		name="month"
 	                		domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Analytic Entries of last 30 days"/>
-	                <filter icon="gtk-media-rewind"
+	                <filter icon="terp-go-week"
 	                        string="    7 Days    "
 	                        separator="1"
 	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -50,25 +50,25 @@
 	                <separator orientation="vertical"/>
 	                <field name="product_id" />
 	                <field name="user_id" widget="selection">
-	                <filter icon="terp-account" domain="[('user_id','=',uid)]" help="My Entries"/>
+	                <filter icon="terp-gtk-jump-to-ltr" domain="[('user_id','=',uid)]" help="My Entries"/>
 	                </field>
 	            </group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="0" string="Group By...">
+                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
+                    <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Account"  icon="terp-account" context="{'group_by':'account_id'}"/>
-                    <filter string="General Account" icon="terp-account" context="{'group_by':'general_account_id'}"/>
-                    <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account"  icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Product UOM" icon="terp-account" context="{'group_by':'product_uom_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <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':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index f853b809867..290e6950569 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -36,26 +36,26 @@
         <field name="arch" type="xml">
             <search string="Analytic Accounts Analysis">
             	<group>
-	                <filter icon="gtk-media-rewind" string="  365 Days  "
+	                <filter icon="terp-go-year" string="  365 Days  "
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts of last 365 days"/>
-                    <filter icon="gtk-media-rewind" string="   30 Days   "
+                    <filter icon="terp-go-month" 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"/>
-                    <filter icon="gtk-media-rewind"
+                    <filter icon="terp-go-week"
                             string="    7 Days    "
                             separator="1"
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Accounts during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <filter icon="terp-account"
+	                <filter icon="terp-document-new"
                     		string="Draft"
                     		domain="[('state','=','draft')]"/>
-                    <filter icon="terp-account"
+                    <filter icon="terp-camera_test"
                     		string="Open"
                     		domain="[('state','=','open')]"/>
-                    <filter icon="terp-account"
+                    <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
                     <separator orientation="vertical"/>
@@ -63,28 +63,28 @@
 	                <field name="product_id" />
 	                <field name="partner_id"/>
 	                <field name="user_id" widget="selection">
-	                    <filter icon="terp-account"
+	                    <filter icon="terp-folder-orange"
 	                        	string="My Accounts"
 	                        	help="My Account"
 	                        	domain="[('user_id','=',uid)]"/>
 	                </field>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                	<filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Associated Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                <group expand="0" string="Group By..." colspan="10" col="12">
+                	<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Associated Partner" icon="terp-personal+" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-					<filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Analytic Account" icon="terp-account" context="{'group_by':'parent_id'}"/>
-                    <filter string="Analytic Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+					<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'parent_id'}"/>
+                    <filter string="Analytic Journal" icon="terp-folder-green" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Account Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <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':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 5d1b99b578e..0c3a77db2a7 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -50,25 +50,25 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
             	<group colspan="10" col="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<filter icon="terp-go-year" string="  365 Days  "
 	            			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Entries of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" 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"/>
-	                <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="Entries during last 7 days"/>
 	                <separator orientation="vertical"/>
                     <filter string="Draft"
-                    		icon="terp-account"
+                    		icon="terp-document-new"
                     		domain="[('state','=','draft')]"
                     		help = "Draft entries"/>
                     <filter string="Posted"
-                            icon="terp-account"
+                            icon="terp-camera_test"
                             domain="[('state','=','posted')]"
                             help = "Posted entries"/>
                     <separator orientation="vertical"/>
@@ -78,24 +78,24 @@
                     <field name="analytic_account_id"/>
 					</group>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
-                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Journal" name="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="State of Move Line" icon="terp-account" context="{'group_by':'state_2'}"/>
-                    <filter string="Period" icon="terp-account" context="{'group_by':'period_id'}"/>
-                    <filter string="Period of Move Line" icon="terp-account" context="{'group_by':'period_id2'}"/>
+                    <filter string="Analytic Account" name="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
+                    <filter string="State of Move Line" icon="terp-stock_effects-object-colorize" context="{'group_by':'state_2'}"/>
+                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <filter string="Period of Move Line" icon="terp-go-month" context="{'group_by':'period_id2'}"/>
                     <newline/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <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':'year'}"/>
                  </group>
                  <newline/>
                  <group expand="0" string="Extended options..." groups="base.group_extended">
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 523d77c84e3..1fb90a86bec 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -49,6 +49,7 @@ class account_invoice_report(osv.osv):
         'price_total':fields.float('Total Price', readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
+        'reconciled':fields.integer('# reconciled lines', readonly=True),
         'type': fields.selection([
             ('out_invoice','Customer Invoice'),
             ('in_invoice','Supplier Invoice'),
@@ -62,7 +63,7 @@ class account_invoice_report(osv.osv):
             ('open','Open'),
             ('paid','Done'),
             ('cancel','Cancelled')
-            ], 'Order State', readonly=True),
+            ], 'Invoice State', readonly=True),
         'date_due': fields.date('Due Date', readonly=True),
         'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
         'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
@@ -89,6 +90,7 @@ class account_invoice_report(osv.osv):
                              l.quantity * u.factor
                          end) as product_qty,
                      s.partner_id as partner_id,
+                     s.reconciled::integer,
                      s.payment_term as payment_term,
                      s.period_id as period_id,
                      u.name as uom_name,
@@ -137,6 +139,7 @@ class account_invoice_report(osv.osv):
                      l.product_id,
                      u.name,
                      l.uos_id,
+                     s.reconciled,
                      s.user_id,
                      s.state,
                      s.residual,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 965d5078ae9..542b695e7dd 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -20,8 +20,6 @@
                 <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"/>
                 <field name="period_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
@@ -29,8 +27,11 @@
                 <field name="date_due" invisible="1"/>
                 <field name="address_contact_id" invisible="1"/>
                 <field name="address_invoice_id" invisible="1"/>
-                <field name="account_id" invisible="1"/>
                 <field name="partner_bank" invisible="1"/>
+                <field name="account_id" invisible="1"/>
+                <field name="reconciled"  sum="# Reconciled"/>
+                <field name="price_average" avg="Average Price"/>
+                <field name="price_total" sum="Total Price"/>
                 <field name="residual"  sum="Total Residual"/>
                 <field name="delay_to_pay"  avg="Avg. Delay To Pay"/>
             </tree>
@@ -56,87 +57,78 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="gtk-media-rewind" string="  365 Days  "
+	            	<filter icon="terp-go-year" string="  365 Days  "
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
 		                    help="Invoices of last 365 days"/>
-	                <filter icon="gtk-media-rewind" string="   30 Days   "
+	                <filter icon="terp-go-month" string="   30 Days   "
 	                		name="month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
 	                		help="Invoices of last 30 days"/>
-	                <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="Invoices during last 7 days"/>
 	                <separator orientation="vertical"/>
-                    <filter string="Draft"
-                    		icon="terp-account"
-                    		domain="[('state','=','draft')]"
-                    		help = "Draft Invoices"/>
+                    <filter string="Current"
+	                		icon="terp-check"
+                    		domain="[('state','in',('draft','open'))]"
+                    		help = "Draft and Open Invoices"/>
                    	<filter string="Pro-forma"
-                   			icon="terp-account"
+                   			icon="terp-check"
                    			domain="[('state','=','proforma'),('state','=','proforma2')]"
                    			help = "Pro-forma Invoices"/>
                    	<filter string="Current"
-	                		icon="terp-account"
 	                		domain="[('state', '=' ,'open')]"
 	                		help = "open Invoices"/>
 	                <filter string="Done"
-                            icon="terp-account"
+                            icon="terp-dialog-close"
                             domain="[('state','=','paid')]"
                             help = "Done Invoices"/>
-  					<separator orientation="vertical"/>
-  					<field name="partner_id"/>
+                  <separator orientation="vertical"/>
+                  <field name="partner_id"/>
                     <field name="user_id" widget="selection">
-                    <filter icon="terp-account"
+                    <filter icon="terp-dolar"
                     		string="My Invoices"
                     		help="My Invoices"
                     		domain="[('user_id','=',uid)]"/>
                     </field>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-account" context="{'group_by':'product_id','set_visible':True}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Salesman" name='User' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" 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'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" 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="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <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'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <newline/>
-                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
+                    <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':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
-
-                    <field name="date" string="Date Invoiced"/>
+                    <field name="product_id"/>
+                    <field name="account_id"/>
                     <separator orientation="vertical"/>
                     <field name="type"/>
-                    <field name="currency_id" widget="selection"/>
-                    <field name="partner_bank" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="address_contact_id"/>
-                    <field name="account_id"/>
-                    <newline/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
-                    <field name="period_id" widget="selection"/>
+                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <separator orientation="vertical"/>
-                	<field name="address_invoice_id"/>
-                	<field name="product_id"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="date" string="Date Invoiced"/>
+                    <field name="date_due"/>
                 </group>
             </search>
         </field>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index 9b1688730aa..190ff856c8a 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -153,8 +153,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
-					<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
+					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
+					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
 					<separator orientation="vertical"/>
 					<field name="name" select="1"/>
 					<field name="month" select="1"/>
@@ -221,8 +221,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
-					<filter icon="terp-sale" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
-					<filter icon="terp-sale" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
+					<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
+					<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
 					<separator orientation="vertical"/>
 					<field name="name" select="1"/>
 					<field name="month" select="1"/>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index b48ccc55daa..e7a0faf069d 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -185,8 +185,8 @@
            <field name="arch" type="xml">
                <search string="Budget">
                    <group col="20" colspan="4">
-                       <filter string="Draft" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
-                       <filter string="To Validate" domain="[('state','=','validate')]" help="To Validate Budgets" />
+                       <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
+                       <filter string="To Validate" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Validate Budgets" />
                        <separator orientation="vertical"/>
                        <field name="name" select="1"/>
                        <field name="code" select="1" />
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 45fce2cbd2b..e647ce85b34 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:18+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
+"PO-Revision-Date: 2010-06-07 04:28+0000\n"
+"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+msgstr "Datum :"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -35,17 +35,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
 msgid "All payable entries"
-msgstr ""
+msgstr "Sve stavke potraživanja"
 
 #. module: account_followup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "Ispisana Poruka"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -60,18 +60,18 @@ msgstr ""
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Ukupni dug"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: Korisničko ime"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Select partners"
-msgstr ""
+msgstr "Odaberi partnere"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -82,17 +82,17 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Dug"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Email Settings"
-msgstr ""
+msgstr "Email Postavke"
 
 #. module: account_followup
 #: field:account_followup.stat,account_type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Tip Računa"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -108,7 +108,7 @@ msgstr ""
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "%(date)s: Trenutni Datum"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -131,7 +131,7 @@ msgstr ""
 #: field:account_followup.followup,description:0
 #: rml:account_followup.followup.print:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -141,27 +141,27 @@ msgstr ""
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "VAT:"
-msgstr ""
+msgstr "VAT:"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum Računa"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,email_subject:0
 msgid "Email Subject"
-msgstr ""
+msgstr "Predmet email-a"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Paid"
-msgstr ""
+msgstr "Plaćeno"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -186,17 +186,17 @@ msgstr ""
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "Odabir Partnera"
 
 #. module: account_followup
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za Arhitekturu Prikaza!"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr ""
+msgstr "Tip Uvjeta"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,init:0
@@ -206,12 +206,12 @@ msgstr ""
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Select partners to remind"
-msgstr ""
+msgstr "Odaberite partnere za opomenu"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -240,23 +240,23 @@ msgstr ""
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
 msgid "First move"
-msgstr ""
+msgstr "Prvi potez"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr ""
+msgstr "Kraj Mjeseca"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -273,7 +273,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Lines"
-msgstr ""
+msgstr "Linije"
 
 #. module: account_followup
 #: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index fa12e8b9841..519155a16d0 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
new file mode 100644
index 00000000000..f96eb08f2fe
--- /dev/null
+++ b/addons/account_tax_include/__init__.py
@@ -0,0 +1,25 @@
+# -*- 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 account_tax_include
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
new file mode 100644
index 00000000000..5bb1a2e2399
--- /dev/null
+++ b/addons/account_tax_include/__openerp__.py
@@ -0,0 +1,42 @@
+# -*- 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': 'Invoices and prices with taxes included',
+    'version': '1.0',
+    'category': 'Generic Modules/Accounting',
+    'description': """Allow the user to work tax included prices.
+Especially useful for b2c businesses.
+
+This module implement the modification on the invoice form.
+""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['account'],
+    'init_xml': [],
+    'update_xml': ['account_tax_include_view.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': '0070514190381',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
new file mode 100644
index 00000000000..d84a21afff7
--- /dev/null
+++ b/addons/account_tax_include/account_tax_include.py
@@ -0,0 +1,230 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+import decimal_precision as dp
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+    _columns = {
+        'price_type': fields.selection([('tax_included','Tax included'),
+                                        ('tax_excluded','Tax excluded')],
+                                        'Price method', required=True, readonly=True,
+                                        states={'draft':[('readonly',False)]}),
+    }
+    _defaults = {
+        'price_type': 'tax_excluded',
+    }
+
+    def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
+        map_old_new = {}
+        refund_ids = []
+        for old_inv_id in ids:
+            new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description)
+            refund_ids += new_id
+            map_old_new[old_inv_id] = new_id[0]
+
+        for old_inv_id in map_old_new.keys():
+            old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type']
+            self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record})
+        return refund_ids
+
+account_invoice()
+
+class account_invoice_line(osv.osv):
+    _inherit = "account.invoice.line"
+
+    def _amount_line2(self, cr, uid, ids, name, args, context=None):
+        """
+        Return the subtotal excluding taxes with respect to price_type.
+        """
+        res = {}
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        dec_obj = self.pool.get('decimal.precision')
+        for line in self.browse(cr, uid, ids):
+            cur = line.invoice_id and line.invoice_id.currency_id or False
+            res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context)
+            res[line.id] = {
+                'price_subtotal': 0.0,
+                'price_subtotal_incl': 0.0,
+                'data': []
+            }
+            if not line.quantity:
+                continue
+            if line.invoice_id:
+                product_taxes = []
+                if line.product_id:
+                    if line.invoice_id.type in ('out_invoice', 'out_refund'):
+                        product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id)
+                    else:
+                        product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
+
+                if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
+                    res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
+                else:
+                    res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
+                    for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
+                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], dec_obj.precision_get(cr, uid, 'Account'))
+            else:
+                res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
+
+            if res[line.id]['price_subtotal']:
+                res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
+                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity):
+                    res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount']
+                    res[line.id]['data'].append(tax)
+            else:
+                res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
+                for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
+                    res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
+                    res[line.id]['data'].append( tax)
+
+            res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
+            res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
+        return res
+
+    def _price_unit_default(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        if 'check_total' in context:
+            t = context['check_total']
+            if context.get('price_type', False) == 'tax_included':
+                for l in context.get('invoice_line', {}):
+                    if len(l) >= 3 and l[2]:
+                        p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0)
+                        t = t - (p * l[2].get('quantity'))
+                return t
+            return super(account_invoice_line, self)._price_unit_default(cr, uid, context)
+        return 0
+
+    def _get_invoice(self, cr, uid, ids, context):
+        result = {}
+        for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
+            for line in inv.invoice_line:
+                result[line.id] = True
+        return result.keys()
+
+    _columns = {
+        'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
+            store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
+        'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
+            store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
+                }
+
+    _defaults = {
+        'price_unit': _price_unit_default,
+                }
+
+    def move_line_get_item(self, cr, uid, line, context=None):
+        return {
+                'type':'src',
+                'name':line.name,
+                'price_unit':(line.quantity) and (line.price_subtotal / line.quantity) or line.price_subtotal,
+                'quantity':line.quantity,
+                'price':line.price_subtotal,
+                'account_id':line.account_id.id,
+                'product_id': line.product_id.id,
+                'uos_id':line.uos_id.id,
+                'account_analytic_id':line.account_analytic_id.id,
+                }
+
+    def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
+        if context is None:
+            context = {}
+        # if the tax is already included, just return the value without calculations
+        if context.get('price_type', False) == 'tax_included':
+            return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
+        else:
+            return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
+
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
+        # note: will call product_id_change_unit_price_inv with context...
+
+        # Temporary trap, for bad context that came from koo:
+        # if isinstance(context, str):
+        #       print "str context:", context
+
+        ctx = (context and context.copy()) or {}
+        ctx.update({'price_type': ctx.get('price_type','tax_excluded')})
+        return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
+
+account_invoice_line()
+
+class account_invoice_tax(osv.osv):
+    _inherit = "account.invoice.tax"
+
+    def compute(self, cr, uid, invoice_id, context=None):
+        tax_grouped = {}
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
+        line_obj = self.pool.get('account.invoice.line')
+
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
+        line_ids = map(lambda x: x.id, inv.invoice_line)
+
+        cur = inv.currency_id
+        company_currency = inv.company_id.currency_id.id
+
+        for line in inv.invoice_line:
+            data = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
+            for tax in data['data']:
+                val={}
+                val['invoice_id'] = inv.id
+                val['name'] = tax['name']
+                val['amount'] = tax['amount']
+                val['manual'] = False
+                val['sequence'] = tax['sequence']
+                val['base'] = tax['price_unit'] * line['quantity']
+
+                if inv.type in ('out_invoice','in_invoice'):
+                    val['base_code_id'] = tax['base_code_id']
+                    val['tax_code_id'] = tax['tax_code_id']
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['account_id'] = tax['account_collected_id'] or line.account_id.id
+                else:
+                    val['base_code_id'] = tax['ref_base_code_id']
+                    val['tax_code_id'] = tax['ref_tax_code_id']
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['account_id'] = tax['account_paid_id'] or line.account_id.id
+
+                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
+                if not key in tax_grouped:
+                    tax_grouped[key] = val
+                else:
+                    tax_grouped[key]['amount'] += val['amount']
+                    tax_grouped[key]['base'] += val['base']
+                    tax_grouped[key]['base_amount'] += val['base_amount']
+                    tax_grouped[key]['tax_amount'] += val['tax_amount']
+
+        for t in tax_grouped.values():
+            t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
+            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
+            t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
+
+        return tax_grouped
+
+account_invoice_tax()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_tax_include/account_tax_include_view.xml b/addons/account_tax_include/account_tax_include_view.xml
new file mode 100644
index 00000000000..32aea6802d1
--- /dev/null
+++ b/addons/account_tax_include/account_tax_include_view.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_tax_view_price" model="ir.ui.view">
+            <field name="name">account.tax.exlcuded.view.form</field>
+            <field name="type">form</field>
+            <field name="model">account.tax</field>
+            <field name="inherit_id" ref="account.view_tax_form"/>
+            <field name="arch" type="xml">
+                <field name="python_compute" position="after">
+                    <separator colspan="4" string="Compute Code for Taxes included prices"/>
+                    <field colspan="4" name="python_compute_inv" nolabel="1"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="account_invoice_view_price" model="ir.ui.view">
+            <field name="name">account.invoice.vat.exlcuded.view.form</field>
+            <field name="type">form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <field name="payment_term" position="after">
+                    <field name="price_type"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="invoice_supplier_form_tax_include" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.tax_include</field>
+            <field name="type">form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1" position="before">
+                    <field name="price_type"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="invoice_supplier_form_tax_include2" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.tax_include2</field>
+            <field name="type">form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <field name="price_subtotal" position="after">
+                    <field name="price_subtotal_incl"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="invoice_supplier_form_tax_include3" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.tax_include3</field>
+            <field name="type">form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <field name="product_id" position="replace">
+                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id,{'price_type':parent.price_type})"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_invoice_line_tree" model="ir.ui.view">
+            <field name="name">account.invoice.line.tree</field>
+            <field name="model">account.invoice.line</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="price_subtotal" position="after">
+                    <field name="price_subtotal_incl"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/account_tax_include/i18n/account_tax_include.pot b/addons/account_tax_include/i18n/account_tax_include.pot
new file mode 100644
index 00000000000..e19a7fd9712
--- /dev/null
+++ b/addons/account_tax_include/i18n/account_tax_include.pot
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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:51+0000\n"
+"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
diff --git a/addons/account_tax_include/i18n/ar.po b/addons/account_tax_include/i18n/ar.po
new file mode 100644
index 00000000000..2ea3d31ed0a
--- /dev/null
+++ b/addons/account_tax_include/i18n/ar.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-02-03 06:24+0000\n"
+"Last-Translator: <>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/bg.po b/addons/account_tax_include/i18n/bg.po
new file mode 100644
index 00000000000..fff9c26bf05
--- /dev/null
+++ b/addons/account_tax_include/i18n/bg.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-09-08 12:06+0000\n"
+"Last-Translator: lem0na <nickyk@gmx.net>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Невалиден XML за преглед на архитектурата"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Начин на изчисляване"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "С включен данък"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Без данък"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po
new file mode 100644
index 00000000000..ab16e300b28
--- /dev/null
+++ b/addons/account_tax_include/i18n/bs.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-02-10 12:26+0000\n"
+"Last-Translator: adnan <adnankraljic@yahoo.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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Cjenovna procedura"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Računi i cijene sa uključenim porezom"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Porez uključen"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Porez nije uključen"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Izračunaj cijene sa porezima"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Sub-ukupno"
diff --git a/addons/account_tax_include/i18n/ca.po b/addons/account_tax_include/i18n/ca.po
new file mode 100644
index 00000000000..249686fa488
--- /dev/null
+++ b/addons/account_tax_include/i18n/ca.po
@@ -0,0 +1,53 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-29 06:30+0000\n"
+"Last-Translator: Jordi Esteve - http://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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invàlid per a la definició de la vista!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Mètode preu"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Factures i preus amb impostos inclosos"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Impostos inclosos"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Impostos exclosos"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Codi pel càlcul dels preus amb impostos inclosos"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
new file mode 100644
index 00000000000..2cc4bc1bcc0
--- /dev/null
+++ b/addons/account_tax_include/i18n/cs.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-04-26 09:10+0000\n"
+"Last-Translator: Martin Volf <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-28 03:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neplatný XML pro zobrazení architektury"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Metoda určování cen"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Faktury a ceny včetně daní"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Daně zahrnuty"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Daně vyloučeny"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Výpočetní kód pro ceny včetně daně"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Mezisoučet"
diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po
new file mode 100644
index 00000000000..fa5d2ce1610
--- /dev/null
+++ b/addons/account_tax_include/i18n/de.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-04-09 13:20+0000\n"
+"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Preismethode"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Rechnungen und Preise mit inkludierten Steuern"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Steuer inklusive"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Steuern exklusive"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Berechnungsgrundlage (inkl. Steuer)"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Zwischensumme"
diff --git a/addons/account_tax_include/i18n/el.po b/addons/account_tax_include/i18n/el.po
new file mode 100644
index 00000000000..6d3910fb43b
--- /dev/null
+++ b/addons/account_tax_include/i18n/el.po
@@ -0,0 +1,53 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-09-08 15:27+0000\n"
+"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"Language-Team: Greek <el@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-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Μέθοδος Τιμής"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Τιμολόγια και τιμές με ενσωμάτωση φόρων"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Συμπερίληψη φόρου"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Εξαιρούνται φόροι"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Κωδικός Υπολογισμού για Φόρους που εμπεριέχονται στις τιμές"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Υποσύνολο"
diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po
new file mode 100644
index 00000000000..892197cf816
--- /dev/null
+++ b/addons/account_tax_include/i18n/en_AU.po
@@ -0,0 +1,53 @@
+# English (Australia) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-09 21:19+0000\n"
+"Last-Translator: MoLE <Unknown>\n"
+"Language-Team: English (Australia) <en_AU@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-10 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalid XML for View Architecture!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Price method"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Invoices and prices with taxes included"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Tax included"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Tax excluded"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Compute Code for Taxes included prices"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/en_GB.po b/addons/account_tax_include/i18n/en_GB.po
new file mode 100644
index 00000000000..0341993acca
--- /dev/null
+++ b/addons/account_tax_include/i18n/en_GB.po
@@ -0,0 +1,53 @@
+# English (United Kingdom) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-09 21:20+0000\n"
+"Last-Translator: MoLE <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalid XML for View Architecture!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Price method"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Invoices and prices with taxes included"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Tax included"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Tax excluded"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Compute Code for Taxes included prices"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es.po b/addons/account_tax_include/i18n/es.po
new file mode 100644
index 00000000000..4fa9a9219c7
--- /dev/null
+++ b/addons/account_tax_include/i18n/es.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-24 20:17+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Método precio"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Facturas y precios con impuestos incluidos"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Impuestos incluidos"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Impuestos excluidos"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Código para el cálculo de precios con impuestos incluidos"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es_AR.po b/addons/account_tax_include/i18n/es_AR.po
new file mode 100644
index 00000000000..4d7230f383b
--- /dev/null
+++ b/addons/account_tax_include/i18n/es_AR.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-14 18:28+0000\n"
+"Last-Translator: Silvana Herrera <sherrera@thymbra.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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para la definición de la vista!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Método de precio"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Facturas y precios con impuestos incluidos"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Impuestos incluidos"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Impuestos no incluidos"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Código del cálculo para precios con impuestos incluídos"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/et.po b/addons/account_tax_include/i18n/et.po
new file mode 100644
index 00000000000..6bd6d5cdaa7
--- /dev/null
+++ b/addons/account_tax_include/i18n/et.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-09 16:28+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-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Hinna meetod"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Makse sisaldavad arved ja hinnad"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Maksuga"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Maksuta"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Arvuta kood maksuga hindadele"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Vahesumma"
diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po
new file mode 100644
index 00000000000..6e3c999484d
--- /dev/null
+++ b/addons/account_tax_include/i18n/fi.po
@@ -0,0 +1,53 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-17 10:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Hinnan tyyppi"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Laskut ja hinnat veroilla"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Vero sisältyy"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Ilman veroa"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Laske koodi hinnoille joissa on vero mukana"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Välisumma"
diff --git a/addons/account_tax_include/i18n/fr.po b/addons/account_tax_include/i18n/fr.po
new file mode 100644
index 00000000000..c26f075fd75
--- /dev/null
+++ b/addons/account_tax_include/i18n/fr.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-11-17 09:23+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-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Méthode de prix"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Factures et prix avec taxes comprises"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Taxe comprise"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Hors-taxe"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Code de calcul pour les prix taxes comprises"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Sous-total"
diff --git a/addons/account_tax_include/i18n/gl.po b/addons/account_tax_include/i18n/gl.po
new file mode 100644
index 00000000000..e677bb72d35
--- /dev/null
+++ b/addons/account_tax_include/i18n/gl.po
@@ -0,0 +1,54 @@
+# translation of account-tax-include-es.po to Galego
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: account-tax-include-es\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-09-08 12:37+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: Galego <g11n@mancomun.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-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML non válido para a definición da vista!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Método prezo"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Facturas e prezos con impostos incluídos"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Imposto incluído"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Imposto excluído"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Código para o cálculo dos impostos en prezos incluídos"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/hr.po b/addons/account_tax_include/i18n/hr.po
new file mode 100644
index 00000000000..ac67721e45b
--- /dev/null
+++ b/addons/account_tax_include/i18n/hr.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-11-17 09:23+0000\n"
+"Last-Translator: Dragan Jovanovic <dragan.jovanovic@strojotex.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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Cjenovna metoda"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Računi i cijene sa uključenim porezom"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Porez uključen"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Nije uključen porez"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Kod za izračun cijena sa uključenim porezima"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Podzbroj"
diff --git a/addons/account_tax_include/i18n/hu.po b/addons/account_tax_include/i18n/hu.po
new file mode 100644
index 00000000000..2ea3d31ed0a
--- /dev/null
+++ b/addons/account_tax_include/i18n/hu.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-02-03 06:24+0000\n"
+"Last-Translator: <>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po
new file mode 100644
index 00000000000..bcb9daf3353
--- /dev/null
+++ b/addons/account_tax_include/i18n/id.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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:44+0000\n"
+"Last-Translator: <>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
new file mode 100644
index 00000000000..0e304d60033
--- /dev/null
+++ b/addons/account_tax_include/i18n/it.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-02-03 08:32+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-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per Visualizzazione Architettura!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Tasse incluse"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Tasse escluse"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po
new file mode 100644
index 00000000000..118579be264
--- /dev/null
+++ b/addons/account_tax_include/i18n/ko.po
@@ -0,0 +1,53 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-09-08 16:43+0000\n"
+"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "뷰 아키텍처의 XML이 유효하지 않습니다."
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "가격 방식"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "세금이 포함된 인보이스와 가격"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "세금 포함"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "세금 제외"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "세금 포함 가격을 위한 컴퓨터 코드"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "서브토털"
diff --git a/addons/account_tax_include/i18n/lt.po b/addons/account_tax_include/i18n/lt.po
new file mode 100644
index 00000000000..110d0fdd041
--- /dev/null
+++ b/addons/account_tax_include/i18n/lt.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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:54+0000\n"
+"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po
new file mode 100644
index 00000000000..a5c550807f5
--- /dev/null
+++ b/addons/account_tax_include/i18n/nl.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-12-14 21:11+0000\n"
+"Last-Translator: Pieter J. Kersten (EduSense BV) <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:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Prijsmethode"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Facturen en prijzen inclusief belastingen"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Inclusief belastingen"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Exclusief belastingen"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Bereken code voor prijzen inclusief belastingen"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotaal"
diff --git a/addons/account_tax_include/i18n/nl_BE.po b/addons/account_tax_include/i18n/nl_BE.po
new file mode 100644
index 00000000000..1854bbfc9d4
--- /dev/null
+++ b/addons/account_tax_include/i18n/nl_BE.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-04-24 15:12+0000\n"
+"Last-Translator: <>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/oc.po b/addons/account_tax_include/i18n/oc.po
new file mode 100644
index 00000000000..5d0f82c83d6
--- /dev/null
+++ b/addons/account_tax_include/i18n/oc.po
@@ -0,0 +1,53 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-04-29 14:21+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@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-05 03:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Metòde de prètz"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Facturas e prèses amb taxas inclusas"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Taxa inclusa"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Fòra taxa"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Còde de calcul pels prèses amb taxas compresas"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Sostotal"
diff --git a/addons/account_tax_include/i18n/pl.po b/addons/account_tax_include/i18n/pl.po
new file mode 100644
index 00000000000..aa4daff1f43
--- /dev/null
+++ b/addons/account_tax_include/i18n/pl.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-21 15:43+0000\n"
+"Last-Translator: Andrzej MoST (Marcin Ostajewski) <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:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Metoda wyceny"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Faktury i ceny zawierające podatki."
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Zawiera podatek"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Nie zawiera podatku"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Wylicz kod dla cen z podatkiem"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Suma częściowa"
diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po
new file mode 100644
index 00000000000..23c89d66568
--- /dev/null
+++ b/addons/account_tax_include/i18n/pt.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-28 23:29+0000\n"
+"Last-Translator: Paulino <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para a arquitectura da vista"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Método do preço"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Facturas e preços com imposto incluído"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Imposto incluído"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Imposto excluído"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Código de cálculo para preços com imposto incluído"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/pt_BR.po b/addons/account_tax_include/i18n/pt_BR.po
new file mode 100644
index 00000000000..165ddba21ef
--- /dev/null
+++ b/addons/account_tax_include/i18n/pt_BR.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-09-08 12:28+0000\n"
+"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalido XML para Arquitetura da View"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po
new file mode 100644
index 00000000000..53f0beb8e17
--- /dev/null
+++ b/addons/account_tax_include/i18n/ro.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-28 16:40+0000\n"
+"Last-Translator: geopop65 <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:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Metoda de pret"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Facturi şi preţuri cu taxele incluse"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Taxe incluse"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Fără taxe"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Calcul cod pentru preţuri cu taxe incluse"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
new file mode 100644
index 00000000000..de13c665c78
--- /dev/null
+++ b/addons/account_tax_include/i18n/ru.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-06-06 06:51+0000\n"
+"Last-Translator: mr.The <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-08 03:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Метод расчета цены"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Счета и цены с налогами"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "С налогами"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "До налогов"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Выполнить код для цен с налогами"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Промежуточный итог"
diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po
new file mode 100644
index 00000000000..8518e5bcb1f
--- /dev/null
+++ b/addons/account_tax_include/i18n/sk.po
@@ -0,0 +1,53 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-06 14:22+0000\n"
+"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neplatné XML pre zobrazenie architektúry!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Faktúry a ceny zahrnuté s DPH"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Medzisúčet"
diff --git a/addons/account_tax_include/i18n/sl.po b/addons/account_tax_include/i18n/sl.po
new file mode 100644
index 00000000000..defa396c48f
--- /dev/null
+++ b/addons/account_tax_include/i18n/sl.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-11-17 09:23+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-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Metoda cene"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Računi in cene z vključenimi davki"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Davek vključen"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Davek ni vključen"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Koda izračuna za davke v cenah"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Delna vsota"
diff --git a/addons/account_tax_include/i18n/sq.po b/addons/account_tax_include/i18n/sq.po
new file mode 100644
index 00000000000..a2b9ac5d219
--- /dev/null
+++ b/addons/account_tax_include/i18n/sq.po
@@ -0,0 +1,104 @@
+# Translation of OpenERP Server.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
+"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
+"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po
new file mode 100644
index 00000000000..8991458538f
--- /dev/null
+++ b/addons/account_tax_include/i18n/sv.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-02-14 15:44+0000\n"
+"Last-Translator: Treecko <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:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Felaktig XML för Vyarkitektur!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/tlh.po b/addons/account_tax_include/i18n/tlh.po
new file mode 100644
index 00000000000..901fb52fa52
--- /dev/null
+++ b/addons/account_tax_include/i18n/tlh.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-02-03 06:24+0000\n"
+"Last-Translator: <>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
new file mode 100644
index 00000000000..fae1694aa91
--- /dev/null
+++ b/addons/account_tax_include/i18n/tr.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-02-14 21:31+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-04-17 04:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Fiyat Yöntemi"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Vergiler dahil fiyat ve faturalar"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "KDV Dahil"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "KDV Hariç"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Alt Toplam"
diff --git a/addons/account_tax_include/i18n/uk.po b/addons/account_tax_include/i18n/uk.po
new file mode 100644
index 00000000000..20833c98611
--- /dev/null
+++ b/addons/account_tax_include/i18n/uk.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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:16+0000\n"
+"Last-Translator: Eugene Babiy <eugene.babiy@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:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_tax_include/i18n/vi.po b/addons/account_tax_include/i18n/vi.po
new file mode 100644
index 00000000000..164b9c65f98
--- /dev/null
+++ b/addons/account_tax_include/i18n/vi.po
@@ -0,0 +1,104 @@
+# Translation of OpenERP Server.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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:00:38+0000\n"
+"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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:00:38+0000\n"
+"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
new file mode 100644
index 00000000000..b7cad52c049
--- /dev/null
+++ b/addons/account_tax_include/i18n/zh_CN.po
@@ -0,0 +1,63 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+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-03-20 07:29+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "无效的视图结构XML文件!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "价格规则"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "发票和含税价"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "含税"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "不含税"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "含税价格计算代码"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "小计"
+
+#~ msgid ""
+#~ "Allow the user to work tax included prices.\n"
+#~ "Especially useful for b2c businesses.\n"
+#~ "    \n"
+#~ "This module implement the modification on the invoice form.\n"
+#~ msgstr ""
+#~ "允许用户使用含税价格\n"
+#~ "特别适用于B2C商务\n"
+#~ "\n"
+#~ "这模块使发票的格式生效\n"
diff --git a/addons/account_tax_include/i18n/zh_TW.po b/addons/account_tax_include/i18n/zh_TW.po
new file mode 100644
index 00000000000..a2ba31339c4
--- /dev/null
+++ b/addons/account_tax_include/i18n/zh_TW.po
@@ -0,0 +1,52 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_tax_include
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-01-30 12:43+0000\n"
+"Last-Translator: <>\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-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 0095d950f76..aed57a283aa 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -71,7 +71,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_account_move_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>
@@ -79,10 +79,10 @@
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
-                        <filter icon="terp-account" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
-                        <filter icon="terp-account" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                        <filter icon="terp-account" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
+                        <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
+                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers"/>
                         <separator orientation="vertical"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
@@ -92,14 +92,14 @@
                         <field name="period_id" select='1'/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="12" col="10">
-                        <filter string="Journal" icon="terp-account" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-account" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-account" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
-                        <filter string="States" icon="terp-account" domain="[]" context="{'group_by':'state'}"/>
+                    <group expand="0" string="Group By..." colspan="12" col="10">
+                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
+                        <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Extended options...">
+                    <group expand="0" string="Extended options...">
                        <field name="journal_id" widget="selection" context="{'journal_id': self}" />
                        <field name="period_id" widget="selection" context="{'period_id': self}" groups="base.group_extended"/>
                        <field name="type" context="{'type': self}" />
@@ -107,7 +107,7 @@
                 </search>
             </field>
         </record>
-        
+
          <!--  Receipt Vouchers -->
         <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
             <field name="name">Customer Vouchers</field>
@@ -119,7 +119,7 @@
         </record>
         <menuitem id="menu_action_receipt_vou_voucher_list"
         action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="8"/>
-        
+
         <!--  Purchase Vouchers -->
         <record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
             <field name="name">Vendor Vouchers</field>
@@ -256,7 +256,7 @@
 <!--        </record>-->
 <!--        <menuitem id="menu_action_view_jour_voucher_form"-->
 <!--            action="action_view_jour_voucher_form" parent="menu_action_other_voucher_list"/>-->
-        
+
         <record model="ir.ui.view" id="view_account_journal_form_inherit">
             <field name="name">account.journal.form.inherit</field>
             <field name="model">account.journal</field>
@@ -268,7 +268,7 @@
                 </field>
             </field>
         </record>
-        
+
         <act_window
             domain="[('journal_id', '=', active_id)]"
             id="act_journal_voucher_open"
@@ -276,6 +276,6 @@
             context="{'journal_id': active_id, 'type':type}"
             res_model="account.voucher"
             src_model="account.journal"/>
-        
+
         </data>
 </openerp>
diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po
index baf4157d3ab..6a76e867e21 100644
--- a/addons/account_voucher_payment/i18n/ca.po
+++ b/addons/account_voucher_payment/i18n/ca.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-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher_payment
diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po
index 7cdb7cd2526..600b962c9d6 100644
--- a/addons/account_voucher_payment/i18n/es.po
+++ b/addons/account_voucher_payment/i18n/es.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-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher_payment
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index 326474f19c4..aab4490920c 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.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-06-06 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index 534ec4e0e32..bde1b397caa 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index fc5140c8303..d0c1a57ba84 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -95,10 +95,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
-                   <filter icon="gtk-apply" string="Accepted"
+                   <filter icon="terp-check" string="Accepted"
                        domain="[('state','=', 'accepted')]"
                        separator="1" help="Accepted Invitations" />
-                   <filter icon="gtk-close" string="Declined"
+                   <filter icon="terp-dialog-close" string="Declined"
                        domain="[('state','=', 'declined')]"
                        separator="1" help="Declined Invitations" />
                    <separator orientation="vertical"/>
@@ -108,19 +108,19 @@
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
                    <newline/>
-				    <group expand="1" string="Group By...">
-						<filter string="Type" icon="terp-project" help="Invitation Type"
+				    <group expand="0" string="Group By...">
+						<filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
 					        domain="[]" context="{'group_by':'cutype'}" />
-					    <filter string="Role" icon="terp-project"
+					    <filter string="Role" icon="terp-gtk-select-all"
 					        domain="[]" context="{'group_by':'role'}" />
-					    <filter string="Required Reply" icon="terp-crm"
+					    <filter string="Required Reply" icon="terp-mail-replied"
 					        domain="[]" context="{'group_by':'rsvp'}" />
 					    <separator orientation="vertical" />
-					    <filter string="User" icon="terp-partner" domain="[]"
+					    <filter string="User" icon="terp-personal" domain="[]"
 					        context="{'group_by':'user_id'}" />
-					    <filter string="Contact" icon="terp-partner" domain="[]"
-					        context="{'group_by':'partner_address_id'}" />						
-					    <filter string="State" icon="terp-project" help="Invitation Type"
+					    <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
+					        context="{'group_by':'partner_address_id'}" />
+					    <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':' state'}" />
 					</group>
                </search>
@@ -383,7 +383,7 @@
 	        <field name="arch" type="xml">
                 <search string="Search Events">
                        <group col="12" colspan="4">
-                           <filter icon="terp-partner" string="My Events"
+                           <filter icon="terp-go-today" string="My Events"
                                domain="[('user_id','=',uid)]"
                                help="My Events" />
                            <separator orientation="vertical"/>
@@ -396,15 +396,15 @@
                            <field name="class" select="1"/>
                        </group>
                        <newline/>
-						<group expand="1" string="Group By...">
-							<filter string="Date" icon="terp-project"
+						<group expand="0" string="Group By...">
+							<filter string="Date" icon="terp-go-month"
 						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Availability" icon="terp-project"
+						    <filter string="Availability" icon="terp-camera_test"
 						        domain="[]" context="{'group_by':'show_as'}" />
-						    <filter string="Privacy" icon="terp-crm"
+						    <filter string="Privacy" icon="terp-locked"
 						        domain="[]" context="{'group_by':'class'}" />
 						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						    <filter string="Responsible" icon="terp-personal" domain="[]"
 						        context="{'group_by':'user_id'}" />
 						</group>
                 </search>
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index 6adc7468085..e9ea4ca9884 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 687d398b8f6..3b01565a325 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dbfbeedf0a8..465c63ae626 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -50,7 +50,7 @@
                          name="convert_opportunity"
                          string="Convert"
                          help="Convert to Opportunity"
-                         icon="gtk-index"   
+                         icon="gtk-index"
                          type="object"/>
                     <newline />
                     <field name="section_id" colspan="1"
@@ -273,23 +273,23 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-project"
+                <filter icon="terp-check"
                     string="Current"
                     default="1" name="current"
                     domain="[('state','in',('draft','open'))]"/>
-                <filter icon="terp-project"
+                <filter icon="terp-camera_test"
                     string="Open"
                     domain="[('state','=','open')]"/>
-                <filter icon="terp-project"
+                <filter icon="terp-gtk-media-pause"
                     string="Pending"
                     domain="[('state','=','pending')]"/>
 
                 <separator orientation="vertical"/>
-                <filter icon="gtk-home" string="Today"
+                <filter icon="terp-go-today" string="Today"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
                             ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
                     help="Todays' Opportunities" />
-                <filter icon="gtk-media-rewind" string="7 Days"
+                <filter icon="terp-go-week" string="7 Days"
                     help="Opportunities during last 7 days"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
                      ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -298,32 +298,32 @@
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
+                    <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
                 <field name="section_id" default="context.get('section_id', False)" widget="selection"
                     context="{'invisible_section': False}">
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id','=',uid)]"
                         help="My Sale Team"/>
-                    <filter icon="terp-crm"
+                    <filter icon="terp-personal+"
                         context="{'invisible_section': False}"
                         domain="[]"
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="1" string="Group By...">
-                    <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-crm" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Referrer" icon="terp-crm" domain="[]" context="{'group_by':'referred'}"/>
+                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Creation" icon="terp-project"
+                    <filter string="Creation" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e2decc30340..cd3b7866a89 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -263,32 +263,32 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
-                           <filter icon="terp-project" name="current" string="Current"
+                           <filter icon="terp-check" name="current" string="Current"
                                 domain="[('state','in',('draft', 'open'))]"
                                 help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id" select="1" widget="selection">
-                               <filter icon="terp-crm"
+                               <filter icon="terp-personal+"
                                    domain="[('section_id','=',context.get('section_id',False))]"
                                    help="My Sale Team" />
                            </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                        <newline/>
-					   	<group expand="1" string="Group By...">
-							<filter string="Date" icon="terp-project"
+					   	<group expand="0" string="Group By...">
+							<filter string="Date" icon="terp-go-month"
 						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Privacy" icon="terp-crm"
+						    <filter string="Privacy" icon="terp-locked"
 						        domain="[]" context="{'group_by':'class'}" />
 						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						    <filter string="Responsible" icon="terp-personal" domain="[]"
 						        context="{'group_by':'user_id'}" />
-						    <filter string="Partner" icon="terp-partner" domain="[]"
+						    <filter string="Partner" icon="terp-personal" domain="[]"
 						        context="{'group_by':'partner_id'}" />
 						    <separator orientation="vertical" />
-						    <filter string="State" icon="terp-crm" domain="[]"
+						    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
 						        context="{'group_by':'state'}" />
 						    <separator orientation="vertical" />
 						</group>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 407c3c53cf4..eadc4158d69 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -275,21 +275,21 @@
                 <field name="type">search</field>
                 <field name="arch" type="xml">
                     <search string="Search Opportunities">
-                        <filter icon="terp-project"
+                        <filter icon="terp-check"
                             string="Current"
                             name="current"
                             domain="[('state','in',('draft','open'))]"/>
-                        <filter icon="terp-project"
+                        <filter icon="terp-camera_test"
                             string="Open"
                             domain="[('state','=','open')]"/>
-                        <filter icon="terp-project"
+                        <filter icon="terp-gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
                         <separator orientation="vertical"/>
-                        <filter icon="gtk-home" string="Today"
+                        <filter icon="terp-go-today" string="Today"
                             domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
                             help="Todays' Opportunities" />
-                        <filter icon="gtk-media-rewind" string="7 Days"
+                        <filter icon="terp-go-week" string="7 Days"
                             help="Opportunities during last 7 days"
                             domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
                                 ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -297,33 +297,33 @@
                         <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
                         <field name="user_id" widget="selection">
-                            <filter icon="terp-partner"
+                            <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Opportunities" />
                         </field>
                         <field name="section_id"
                             default="context.get('section_id', False)" select="1"
                             widget="selection">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-personal+"
                                 domain="[('section_id','=',context.get('section_id',False))]"
                                 help="My Sale Team" />
                         </field>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="16">
-                            <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="Category" icon="terp-crm"
+                            <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
 
                             <separator orientation="vertical" />
-                            <filter string="Salesman" icon="terp-crm"
+                            <filter string="Salesman" icon="terp-personal"
                                 domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
                             <separator orientation="vertical" />
-                            <filter string="Creation" icon="terp-project"
+                            <filter string="Creation" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'create_date'}" />
-                            <filter string="Exp.Closing" icon="terp-project"
+                            <filter string="Exp.Closing" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'date_deadline'}" />
                         </group>
                     </search>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c5813a38b09..db8adda789c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -136,7 +136,7 @@
             </form>
         </field>
     </record>
-	
+
 	<!--Inbound Phonecalls Form View -->
 
 	<record model="ir.ui.view" id="crm_case_inbound_phone_form_view">
@@ -196,9 +196,9 @@
             </form>
         </field>
     </record>
-    
+
     <!--Inbound Phonecalls Tree View -->
-    
+
     <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
         <field name="name">CRM - Inbound Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
@@ -247,12 +247,12 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="gtk-home" string="Today"
+               <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
                    help="Todays's Phonecalls"
                />
-               <filter icon="gtk-media-rewind"
+               <filter icon="terp-go-week"
                    string="7 Days"
                    help="Phonecalls during last 7 days"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')),\
@@ -262,31 +262,31 @@
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner"
+                   <filter icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
                    select="1" widget="selection" string="Sales Team">
-                   <filter icon="terp-crm"
+                   <filter icon="terp-personal+"
                        domain="[('section_id','=',context.get('section_id',False))]"
                        help="My Sale Team" />
                </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
-                   <filter string="Partner" icon="terp-crm" domain="[]"
+                   <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-crm"
+                   <filter string="Responsible" icon="terp-personal"
                        domain="[]" context="{'group_by':'user_id'}" />
                    <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-project"
+                   <filter string="Creation" icon="terp-go-month"
                        domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-project" domain="[]"
+                   <filter string="Date" icon="terp-go-month" domain="[]"
                        context="{'group_by':'date'}" />
                </group>
            </search>
         </field>
     </record>
-    
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 2992959bdd0..ee5a6ac35f4 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -70,10 +70,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
                    <group col="10" colspan="4">
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Type for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Type for this month" />
                            <separator orientation="vertical"/>
@@ -162,10 +162,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                    <group col="8" colspan="4">
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Team and Stage for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Team and Stage for this month" />
                            <separator orientation="vertical"/>
@@ -237,10 +237,10 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                    <group col='8' colspan='4'>
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by Section, Category and Stage for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by Section, Category and Stage for this month" />
                            <separator orientation="vertical"/>
@@ -330,10 +330,10 @@
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                    <group col='12' colspan='4'>
-                           <filter string="This Year" icon="terp-hr"
+                           <filter string="This Year" icon="terp-go-year"
                                domain="[('name','=',time.localtime()[0])]"
                                help="Cases by User for this year" />
-                           <filter string="This Month" icon="terp-hr"
+                           <filter string="This Month" icon="terp-go-month"
                                domain="[('month','=',time.localtime()[1])]"
                                help="Cases by User for this month" />
                            <separator orientation="vertical"/>
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 39806c50803..db9837b5d0c 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -21,6 +21,7 @@
 
 from osv import fields,osv
 import tools
+from crm import crm
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -91,9 +92,11 @@ class crm_lead_report(osv.osv):
         'create_date': fields.datetime('Create Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'email': fields.integer('# of Emails', size=128, readonly=True),
-        'expected_closing_days': fields.integer('# of Expected Closing Days', size=128, readonly=True),
         'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
+        'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
         'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
+        'probability': fields.float('Probability',digits=(16,2),readonly=True),
+        'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]" , readonly=True),
@@ -101,7 +104,12 @@ class crm_lead_report(osv.osv):
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'opening_date': fields.date('Opening Date', readonly=True),
+        'creation_date': fields.date('Creation Date', readonly=True),
+        'date_closed': fields.date('Close Date', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),
@@ -122,36 +130,47 @@ class crm_lead_report(osv.osv):
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
+                    to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
+                    to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
                     c.state as state,
                     c.user_id,
+                    c.probability,
                     c.stage_id,
                     c.type as type,
                     c.company_id,
+                    c.priority,
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
-                    count(*) as nbr,
+                    c.planned_revenue,
+                    (select 1) as nbr,
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
                     (select count(id) from mailgate_message where thread_id=c.id) as email,
                     date_trunc('day',c.create_date) as create_date,
-                    sum(cast(to_char(date_trunc('day',c.date_open) - date_trunc('day',c.date_deadline),'DD') as int)) as expected_closing_days,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
+                    avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24) as  delay_expected,
                     avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as  delay_open
                 from
                     crm_lead c
                 group by
                     to_char(c.create_date, 'YYYY'),
+                    to_char(c.date_open, 'YYYY-MM-DD'),
+                    to_char(c.date_closed, 'YYYY-mm-dd'),
                     to_char(c.create_date, 'MM'),
                     c.state,
                     c.user_id,
                     c.id,
                     c.section_id,
                     c.stage_id,
-                    categ_id,
+                    c.probability,
+                    c.categ_id,
                     c.partner_id,
+                    c.planned_revenue,
                     c.company_id,
+                    c.priority,
                     c.type,
                     c.create_date,
                     to_char(c.create_date, 'YYYY-MM-DD')
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 770d9292b6f..f6ac9238b3c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -10,19 +10,24 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Leads Analysis">
-				<field name="name" invisible="1"/>
-				<field name="month" invisible="1"/>
-				<field name="section_id" invisible="1"/>
-				<field name="user_id" invisible="1"/>
-    			<field name="company_id" invisible="1"/>
-				<field name="partner_id" invisible="1"/>
-				<field name="day" invisible="1"/>
-				<field name="nbr" string="#Leads" sum="#Leads" attrs="{'string': 'type'=='opportunity' and '#opp' or '#lead'}"/>
-                <field name="delay_close" sum='Avg Closing Delay'/>
+                <field name="name" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="type" invisible="1"/>
+                <field name="priority" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="section_id" invisible="1"/>
+                <field name="user_id" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="nbr" sum="# Leads"/>
+                <field name="email" sum="#Mails"/>
+                <field name="delay_open" sum='Avg Closing Delay'/>
+                <field name="delay_close" sum='Avg Closing Delay'/>
+                <field name="delay_expected"/>
+                <field name="avg_answers"/>
              </tree>
             </field>
         </record>
@@ -71,20 +76,17 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group col="16" colspan="8">
-                   	    <filter string="Last 365 Days" icon="gtk-media-rewind"
+                   	    <filter string="Last 365 Days" 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="Last 30 Days" icon="gtk-media-rewind" name="This Month"
+                        <filter string="Last 30 Days" 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-crm"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					    <filter icon="terp-crm"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					    <filter icon="terp-crm"
+                        <filter icon="terp-check"
+                    		string="Current"
+                    		domain="[('state','in',('draft','open')]"/>
+					    <filter icon="terp-check"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
                    		<separator orientation="vertical" />
@@ -98,40 +100,51 @@
                    			help="My section" />
                    		</field>
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-crm"
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                         	domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Company" icon="terp-crm"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-                        <filter string="Section" icon="terp-crm"
+                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Section" icon="terp-personal+"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-crm"
-                        	domain="[]" context="{'group_by':'state'}" />
-						<filter string="Stage" icon="terp-crm" domain="[]"
-							context="{'group_by':'stage_id'}" />
-                        <filter string="Category" icon="terp-crm"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                         	domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-crm"
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        	domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-crm"
+                        <filter string="Month" icon="terp-go-month"
                         	domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-crm"
+                        <filter string="Year" icon="terp-go-year"
                         	domain="[]" context="{'group_by':'name'}" />
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="state"/>
-	            	   <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-		               <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="partner_id"/>
+                    		<separator orientation="vertical"/>
+                         <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                          <separator orientation="vertical"/>
+                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       	<newline/>
+                          <field name="creation_date"/>
+                          <field name="opening_date"/>
+                          <field name="date_closed"/>
                    </group>
                </search>
             </field>
@@ -144,23 +157,26 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree string="Opportunities Analysis">
-				<field name="name" invisible="1"/>
-				<field name="month" invisible="1"/>
-				<field name="section_id" invisible="1" groups="base.group_extended"/>
-				<field name="user_id" invisible="1"/>
-    			<field name="company_id" invisible="1" groups="base.group_extended"/>
-				<field name="partner_id" invisible="1"/>
-				<field name="day" invisible="1"/>
-				<field name="nbr" string="#Opportunities" sum="#Opportunities"/>
-				<field name="email" sum="# of Emails"/>
-				<field name="expected_closing_days" sum='# of Expected Closing Days'/>
-				<field name="delay_open" sum='Delay to open'/>
-                <field name="delay_close" sum='Delay to close'/>
+            <tree string="Leads Analysis">
+                <field name="name" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="section_id" invisible="1" groups="base.group_extended"/>
+                <field name="user_id" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
+                <field name="priority"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="type" invisible="1"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
+                <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
+                <field name="planned_revenue" sum="Planned Revenues"/>
+                <field name="email" sum="# of Emails"/>
+                <field name="delay_open" sum='Delay to open'/>
+                <field name="delay_close" sum='Delay to close'/>
+                <field name="delay_expected"/>
+                <field name="probability" widget="progressbar"/>
              </tree>
             </field>
         </record>
@@ -173,7 +189,7 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'lead')]</field>
+            <field name="domain">['|',('type', '=', 'lead'),('type', '=', False)]</field>
             <field name="search_view_id" ref="view_report_crm_lead_filter"/>
         </record>
 
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index c1954f8607f..c0e666e4eaa 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -21,6 +21,7 @@
 
 from osv import fields,osv
 import tools
+from crm import crm
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -78,6 +79,7 @@ class crm_phonecall_report(osv.osv):
         '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),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         '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"),
@@ -89,15 +91,22 @@ class crm_phonecall_report(osv.osv):
                                   ('07', 'July'), ('08', 'August'),\
                                   ('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), 
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
+        'duration': fields.float('Duration', digits=(16,2),readonly=True, group_operator="avg"),
+        'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.phonecall')]", readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'opening_date': fields.date('Opening Date', readonly=True),
+        'creation_date': fields.date('Creation Date', readonly=True),
+        'date_closed': fields.date('Close Date', readonly=True),
     }
 
     def init(self, cr):
@@ -114,23 +123,45 @@ class crm_phonecall_report(osv.osv):
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
+                    to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
+                    to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    c.categ_id,
+                    c.partner_id,
+                    c.stage_id,
+                    c.duration,
+                    c.company_id,
+                    c.priority,
+                    (select 1) as nbr,
+                    0 as avg_answers,
+                    0.0 as perc_done,
+                    0.0 as perc_cancel,
+                    date_trunc('day',c.create_date) as create_date,
+                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
+                    avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as  delay_open
+                    
+                from
+                    crm_phonecall c
+                where c.categ_id in (select res_id from ir_model_data where (name = 'categ_phone1' or name ='categ_phone2'))
+                group by 
+                    to_char(c.create_date, 'YYYY'),
+                    to_char(c.create_date, 'MM'),\
                     c.state,
                     c.user_id,
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
                     c.company_id,
-                    count(*) as nbr,
-                    0 as avg_answers,
-                    0.0 as perc_done,
-                    0.0 as perc_cancel,
-                    date_trunc('day',c.create_date) as create_date,
-                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close
-                from
-                    crm_phonecall c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
-                     c.state, c.user_id,c.section_id, c.categ_id,c.partner_id,c.company_id
-                     ,to_char(c.create_date, 'YYYY-MM-DD'),c.create_date
+                    c.duration,
+                    c.priority,
+                    to_char(c.date_open, 'YYYY-MM-DD'),
+                    to_char(c.date_closed, 'YYYY-mm-dd'),
+                    c.stage_id,
+                    to_char(c.create_date, 'YYYY-MM-DD'),
+                    c.create_date
             )""")
 
 crm_phonecall_report()
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 4e57ba1d474..ddc50460e31 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -10,18 +10,22 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Phone calls">
-					<field name="name" invisible="1"/>
-					<field name="month" invisible="1"/>
-					<field name="section_id" invisible="1"/>
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
+                    <field name="priority" invisible="1"/>
+                    <field name="stage_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-					<field name="nbr" string="#Phone calls" sum="#Phone calls"/>
-	                <field name="delay_close" avg="Avg Closing Delay"/>
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
-				</tree>
+                    <field name="nbr" string="#Phone calls" sum="#Phone calls"/>
+                    <field name="duration" avg="Duration"/>
+                    <field name="delay_close" avg="Avg Closing Delay"/>
+                    <field name="delay_open" sum='Delay to open'/>
+              </tree>
             </field>
         </record>
 
@@ -36,9 +40,9 @@
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
-					<field name="section_id" select="1"/>
+                    <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
-                     <field name="delay_close"/>
+                   <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
@@ -73,97 +77,86 @@
                   <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-check"
+                    		string="Current"
+                    		domain="[('state','in',('draft','oprn'))]"/>
                         <filter icon="terp-hr"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
+                        <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
-                   			default="context.get('section_id', False)"
-                   			widget="selection"
-                   			context="{'invisible_section': False}">
+                      <filter string="Stage" icon="terp-crm" domain="[]"
+                          context="{'group_by':'stage_id'}" />
 
-                   			<filter icon="terp-crm"
+
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
-                   		</field>
-                   		<field name="company_id" widget="selection" groups="base.group_multi_company">
-                           <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
-                        </field>
-
                       	<field name="user_id" select="1" widget="selection">
 	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                     <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <group  expand="0" string="Group By...">
+                        <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
+                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                        	domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                            domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                            domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             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..."  groups="base.group_extended">
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                    	<group>
-		            	    <separator orientation="vertical"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-			             </group>
+                      <field name="partner_id"/>
+                   		<separator orientation="vertical"/>
+                         <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                       	<newline/>
+                        <field name="creation_date"/>
+                        <field name="opening_date"/>
+                        <field name="date_closed"/>
                    </group>
-                   <newline/>
                </search>
             </field>
         </record>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 2b3f883024c..61cf7c6368d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -258,16 +258,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current" name="current"
+                   <filter icon="terp-check" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
                        separator="1" help="Current Claims" default="1"
                    />
-                   <filter icon="gtk-execute"
+                   <filter icon="terp-camera_test"
                        string="In Progress"
                        domain="[('state','=','open')]"
                        separator="1" help="In Progress Claims"
                    />
-                   <filter icon="gtk-media-pause"
+                   <filter icon="terp-gtk-media-pause"
                        string="Pending"
                        domain="[('state','=','pending')]"
                        separator="1" help="All pending Claims"
@@ -276,18 +276,18 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
+                           <filter icon="terp-personal-"
                                domain="[('user_id','=', False)]"
                                help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1"
                        widget="selection"/>
                    <newline/>
-                   <group expand="1" string="Group By...">
-                       <filter string="Deadline" icon="terp-crm"
+                   <group expand="0" string="Group By...">
+                       <filter string="Deadline" icon="terp-go-month"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />
-                       <filter string="Closure" icon="terp-crm"
+                       <filter string="Closure" icon="terp-go-month"
                            domain="[]"
                            context="{'group_by':'date_closed'}" />
                    </group>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index ca6fdb95277..7892039436c 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -77,25 +77,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')]"/>
 
@@ -105,69 +105,69 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</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"/>
                         </field>
 
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
-                    <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <newline/>
+                   <group  expand="0" string="Group By...">
+                        <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'}" groups="base.group_multi_company"/>
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             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="Stage" icon="terp-sale" domain="[]"
+                        <filter string="Stage" icon="terp-stage" domain="[]"
                              context="{'group_by':'stage_id'}" />
 
-                        <filter string="Category" icon="terp-sale"
+                        <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical"/>
-                         <filter string="Priority" icon="terp-sale" domain="[]"
+                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
                              context="{'group_by':'priority'}" />
-                         <filter string="Type" icon="terp-sale" domain="[]"
+                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
                              context="{'group_by':'type_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             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..." 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')]"/>
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6853da7c89a..9ef1c936be4 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -269,13 +269,13 @@
                 <field name="arch" type="xml">
                     <search string="Search Funds">
                         <group>
-                            <filter icon="gtk-new" string="Current"
+                            <filter icon="terp-check" string="Current"
                                 domain="[('state','in',('draft', 'open'))]" name="current"
                                 help="Current Funds" />
-                            <filter icon="gtk-yes" string="Open"
+                            <filter icon="terp-camera_test" string="Open"
                                 domain="[('state','=','open')]"
                                 help="Open Funds" />
-                            <filter icon="gtk-media-pause"
+                            <filter icon="terp-gtk-media-pause"
                                 string="Pending"
                                 domain="[('state','=','pending')]"
                                 help="Pending Funds" />
@@ -285,26 +285,26 @@
                                 string="Fund Description" />
                             <field name="user_id" select="1"
                                 widget="selection">
-                                <filter icon="terp-partner"
+                                <filter icon="terp-personal-"
                                     domain="[('user_id','=', False)]"
                                     help="Unassigned" />
                             </field>
                             <field name="section_id" select="1" widget="selection" string="Sales Team">
-                                <filter icon="terp-crm"
+                                <filter icon="terp-personal+"
                                     domain="[('section_id','=',context.get('section_id',False))]"
                                     help="My section" />
                             </field>
                         </group>
                         <newline/>
-                        <group expand="1" string="Group By...">
-                            <filter string="Partner" icon="terp-partner"
+                        <group expand="0" string="Group By...">
+                            <filter string="Partner" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'partner_id'}" />
-                            <filter string="Responsible" icon="terp-crm"
+                            <filter string="Responsible" icon="terp-personal"
                                 domain="[]"
                                 context="{'group_by':'user_id'}" />
                             <separator orientation="vertical" />
-                            <filter string="Type" icon="terp-project"
+                            <filter string="Type" icon="terp-stock_symbol-selection"
                                 domain="[]"
                                 context="{'group_by':'type_id'}" />
                         </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 20e8ef68b6b..6e27fc8390d 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -76,25 +76,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')]"/>
 
@@ -104,60 +104,61 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</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"/>
                         </field>
 
                       	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
-                   <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-sale"
+                   <newline/>
+                   <group  expand="0" string="Group By...">
+                        <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'}" />
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             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'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
+                        <filter string="Day" icon="terp-go-month"
                             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..." 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')]"/>
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 451f6c7119e..57e7bba0199 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -234,12 +234,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
-                    <filter icon="gtk-home" string="Today"
+                    <filter icon="terp-go-today" string="Today"
                         separator="1"
                         domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
                         help="Todays's Helpdesk Requests"
                         />
-                    <filter icon="gtk-media-rewind"
+                    <filter icon="terp-go-week"
                         string="7 Days" separator="1"
                         help="Helpdesk requests during last 7 days"
                         domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
@@ -249,17 +249,17 @@
                     <field name="partner_id" />
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id" select="1" widget="selection" string="Sales Team">
-                        <filter icon="terp-crm"
+                        <filter icon="terp-personal+"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             help="My section" />
                     </field>
                     <newline/>
-                    <group expand="1" string="Group By...">
-                        <filter string="Customer" icon="terp-crm"
+                    <group expand="0" string="Group By...">
+                        <filter string="Customer" icon="terp-personal"
                             domain="[]" context="{'group_by':'partner_id'}" />
-                        <filter string="State" icon="terp-crm" domain="[]"
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
                             context="{'group_by':'state'}" />
-                        <filter string="Priority" icon="terp-crm"
+                        <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
                     </group>
                 </search>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index f564bb38d4d..c6875e21a4a 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -71,25 +71,25 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="9">
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter string="This Year" icon="terp-go-year"
                    			domain="[('name','=',time.localtime()[0])]"
                    			default="1" />
 
-                   		<filter string="This Month" icon="terp-hr"
+                   		<filter string="This Month" icon="terp-go-month"
                    			domain="[('month','=',time.strftime('%%m'))]"
                    			default="1" />
 
                    		<separator orientation="vertical" />
-                   		<filter string="Current" icon="terp-hr"
+                   		<filter string="Current" icon="terp-check"
                    			domain="[('state','in',('open','draft'))]" />
 
-                   		<filter string="Won" icon="terp-hr"
+                   		<filter string="Won" icon="terp-check"
                    			domain="[('state','=','done')]" />
 
-                   		<filter string="Lost" icon="terp-hr"
+                   		<filter string="Lost" icon="terp-dialog-close"
                    			domain="[('state','=','cancel')]" />
 
-                   		<filter string="Deadline" icon="terp-hr"
+                   		<filter string="Deadline" icon="terp-go-month"
                    			domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
 
                    		<separator orientation="vertical" />
@@ -98,14 +98,14 @@
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
-                   			<filter icon="terp-crm"
+                   			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
                    				help="My section" />
 
                    		</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"/>
@@ -114,59 +114,41 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                  <group expand="1" string="Group By...">
-                        <filter string="User" icon="terp-sale"
+                  <group expand="0" string="Group By...">
+                        <filter string="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
 
-                        <filter string="Company" icon="terp-sale"
+                        <filter string="Company" icon="terp-go-home"
                             domain="[]"
                             context="{'group_by':'company_id'}" />
 
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Section" icon="terp-personal+"
                             domain="[]"
                             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="Partner" icon="terp-sale"
+                        <filter string="Partner" icon="terp-personal"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
 
                         <separator orientation="vertical" />
-                        <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..."  groups="base.group_extended">
-                        <filter icon="terp-sale"
-                            string="Lowest"
-                            domain="[('priority','=','5')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Low"
-                            domain="[('priority','=','4')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Normal"
-                            domain="[('priority','=','3')]"/>
-
-                        <filter icon="terp-sale"
-                            string="High"
-                            domain="[('priority','=','2')]"/>
-
-                        <filter icon="terp-sale"
-                            string="Highest"
-                            domain="[('priority','=','1')]"/>
-
+                        <filter string="Priority" icon="terp-rating-rated"
+                            domain="[]" context="{'group_by':'priority'}" />
                    </group>
-                   
+
 
                </search>
             </field>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index fd424ad7d52..0bab191d942 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -234,22 +234,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
              <search string="IR Attachment">
-             <filter icon="gtk-media-rewind" string="Recent"
+             <filter icon="terp-go-month" string="Recent"
                     help="less 1 month modified/created attachments"
                     domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                 />
                     <separator orientation="vertical"/>
                   <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
+                    <filter icon="terp-personal"
                         domain="[('user_id','=', False)]"
                         help="Filter on my Attachment" />
                     </field>
                     <field name="partner_id" widget="selection"/>
                     <newline/>
-                 <group expand="1" string="Group By...">
-                    <filter string="Partner" icon="terp-partner" domain="[]"
+                 <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
-                    <filter string="Directory" icon="gtk-open" domain="[]" context="{'group_by':'parent_id'}"/>
+                    <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
                  </group>
               </search>
              </field>
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 4afc66fb4d7..00743d768e7 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -41,8 +41,8 @@
                 <search string="All users files">
                 	<group col="12" colspan="4">
                         <separator orientation="vertical"/>
-						<filter icon="terp-stock" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-						<filter icon="terp-stock" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
+						<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
+						<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="month" select="1"/>
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index e6ff86d1087..f94fa886ee6 100755
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -129,14 +129,14 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Mailboxes">
-                    <filter icon="terp-crm" string="Drafts" name="draft" domain="[('folder','=','drafts']"/>
-                    <filter icon="terp-crm" string="Outbox" name="outbox" domain="[('folder','=','outbox')]"/>
+                    <filter icon="terp-mail-message-new" string="Drafts" name="draft" domain="[('folder','=','drafts']"/>
+                    <filter icon="terp-mail-" string="Outbox" name="outbox" domain="[('folder','=','outbox')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-crm" string="Sent" domain="[('folder','=','sent')]"/>
-                    <filter icon="terp-crm" string="Trash" domain="[('folder','=','trash')]"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Sent" domain="[('folder','=','sent')]"/>
+                    <filter icon="terp-mail_delete" string="Trash" domain="[('folder','=','trash')]"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-crm" string="Not Applicable" domain="[('state','=','na')]"/>
-                    <filter icon="terp-crm" string="Sending" domain="[('state','=','sending')]"/>
+                    <filter icon="terp-gtk-stop" string="Not Applicable" domain="[('state','=','na')]"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Sending" domain="[('state','=','sending')]"/>
                     <separator orientation="vertical"/>
                     <field name="email_from" select="1"/>
                     <field name="email_to" select="1"/>
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 28004486e04..d342519af6c 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -1,162 +1,163 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr
-#
+# * hr
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-07 21:48+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
-msgstr ""
+msgstr "OpenERP korisnik"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.edit_workgroup
 #: model:ir.ui.menu,name:hr.menu_edit_workgroup
 msgid "Working Time Categories"
-msgstr ""
+msgstr "Kategorije radnog vremena"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivne odjele!"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "SIN No"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "Ljudski Resursi"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Sunday"
-msgstr ""
+msgstr "Nedjelja"
 
 #. module: hr
 #: view:res.users:0
 msgid "Parents"
-msgstr ""
+msgstr "Roditelji"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: hr
 #: view:hr.department:0
 msgid "Department"
-msgstr ""
+msgstr "Odjel"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Contact  of employee"
-msgstr ""
+msgstr "Kontakt Djelatnika"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work Email"
-msgstr ""
+msgstr "Poslovni Email"
 
 #. module: hr
 #: field:hr.timesheet.group,name:0
 msgid "Group name"
-msgstr ""
+msgstr "Ime Grupe"
 
 #. module: hr
 #: field:hr.department,company_id:0
 #: field:hr.employee,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Friday"
-msgstr ""
+msgstr "Petak"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "Ishodni Odjel"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: hr
 #: field:hr.timesheet,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Posao od"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "Hijerarhija Djelatnika"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Unmaried"
-msgstr ""
+msgstr "Nije u braku"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr ""
+msgstr "Žensko"
 
 #. module: hr
 #: view:hr.timesheet.group:0
 msgid "Working Time Category"
-msgstr ""
+msgstr "Kategorija radnog vremena"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
-msgstr ""
+msgstr "Struktura Djelatnika"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "Osobni ID brojevi"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr ""
+msgstr "Poslovni telefon"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Slijedne Kategorije"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "Lokacija ureda"
 
 #. module: hr
 #: view:hr.employee:0
@@ -164,52 +165,52 @@ msgstr ""
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr ""
+msgstr "Djelatnik"
 
 #. module: hr
 #: field:hr.timesheet.group,manager:0
 msgid "Workgroup manager"
-msgstr ""
+msgstr "Voditelj Radne Grupe"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "Podređeni Djelatnici"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Izvještavanje"
 
 #. module: hr
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr ""
+msgstr "Članovi"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr ""
+msgstr "SSN No"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid "Fill up contact information"
-msgstr ""
+msgstr "Ispunite kontakt podatke"
 
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Divorced"
-msgstr ""
+msgstr "Razveden-a"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Ishodna Kategorija"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -217,276 +218,277 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_department_def
 #: model:ir.ui.menu,name:hr.menu_department_tree
 msgid "Departments"
-msgstr ""
+msgstr "Odjeli"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "Kontakt Djelatnika"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Maried"
-msgstr ""
+msgstr "U braku"
 
 #. module: hr
 #: field:hr.timesheet,tgroup_id:0
 msgid "Employee's timesheet group"
-msgstr ""
+msgstr "Grupa kontrolnih kartica Djelatnika"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr ""
+msgstr "Muško"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
 msgid "Create openerp user"
-msgstr ""
+msgstr "Kreiraj OpenERP Korisnika"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "Kategorija Djelatnika"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Utorak"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr ""
+msgstr "Odjel Ljudskih Resursa"
 
 #. module: hr
 #: field:hr.employee,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Povezani Korisnik"
 
 #. module: hr
 #: field:hr.employee,category_id:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "Bilješka"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "Kontakt podaci"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Monday"
-msgstr ""
+msgstr "Ponedjeljak"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr ""
+msgstr "Struktura Kategorija"
 
 #. module: hr
 #: field:hr.timesheet,dayofweek:0
 msgid "Day of week"
-msgstr ""
+msgstr "Dan u tjednu"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Birthday"
-msgstr ""
+msgstr "Rođendan"
 
 #. module: hr
 #: field:hr.employee,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivnu Hijerarhiju Djelatnika"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract Process"
-msgstr ""
+msgstr "Proces rada s Ugovorom Djelatnika"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Create OpenERP User"
-msgstr ""
+msgstr "Kreiraj OpenERP Korisnika"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee Complete Form"
-msgstr ""
+msgstr "Cjelovit formular Djelatnika"
 
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr ""
+msgstr "Tvrtke"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Srijeda"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr ""
+msgstr "Kategorije djelatnika"
 
 #. module: hr
 #: field:hr.timesheet,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: hr
 #: field:res.users,parent_id:0
 msgid "Parent Users"
-msgstr ""
+msgstr "Ishodni korisnici"
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr ""
+msgstr "Poslovna adresa"
 
 #. module: hr
 #: field:hr.employee,marital:0
 msgid "Marital Status"
-msgstr ""
+msgstr "Bračni status"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Niz Kontrolne kartice"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr ""
+msgstr "Osobni podaci"
 
 #. module: hr
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: hr
 #: view:hr.timesheet:0
 #: field:hr.timesheet.group,timesheet_id:0
 #: model:ir.model,name:hr.model_hr_timesheet_group
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Thursday"
-msgstr ""
+msgstr "Četvrtak"
 
 #. module: hr
 #: field:hr.timesheet,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Rad do"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Other"
-msgstr ""
+msgstr "Drugi"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr ""
+msgstr "Kategorije Djelatnika"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Kućna adresa"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr ""
+msgstr "Odjel"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Narodnost"
 
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other ID"
-msgstr ""
+msgstr "Drugi ID broj"
 
 #. module: hr
 #: field:hr.timesheet,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr ""
+msgstr "Spol"
 
 #. module: hr
 #: view:hr.employee:0
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list
 msgid "Employees"
-msgstr ""
+msgstr "Djelatnici"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr ""
+msgstr "Ime Odjela"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "Slijedni Odjeli"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr ""
+msgstr "Poslovni podaci"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Fill up employee's contact information"
-msgstr ""
+msgstr "Ispunite kontakt podatke Djelatnika"
 
 #. module: hr
 #: field:hr.department,manager_id:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Voditelj"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 msgid "All Employees"
-msgstr ""
+msgstr "Svi Djelatnici"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Saturday"
-msgstr ""
+msgstr "Subota"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_new
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_new
 msgid "New Employee"
-msgstr ""
+msgstr "Novi Djelatnik"
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 32aeb52c2e9..4c93f32f7de 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 2b0f6b4addf..85fa541ec10 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -29,7 +29,7 @@ class hr_expense_report(osv.osv):
     _auto = False
     _rec_name = 'date'
     _columns = {
-        'date': fields.date('Date', readonly=True),
+        'date': fields.date('Date ', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
@@ -44,9 +44,11 @@ class hr_expense_report(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice',readonly=True),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'price_total':fields.float('Total Price', readonly=True),
+        'delay_valid':fields.float('Delay Valid', readonly=True),
+        'delay_confirm':fields.float('Delay Confirm', readonly=True),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
         'price_average':fields.float('Average Price', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
@@ -75,20 +77,22 @@ class hr_expense_report(osv.osv):
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
                      s.invoice_id,
+                     s.user_valid as user_id,
                      s.department_id,
                      to_char(date_trunc('day',s.create_date), 'YYYY') as year,
                      to_char(date_trunc('day',s.create_date), 'MM') as month,
                      to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD') as day,
+                     avg(extract('epoch' from age(s.date_valid,s.date)))/(3600*24) as  delay_valid,
+                     avg(extract('epoch' from age(s.date_valid,s.date_confirm)))/(3600*24) as  delay_confirm,
                      l.product_id as product_id,
                      l.analytic_account as analytic_account,
                      sum(l.unit_quantity * u.factor) as product_qty,
-                     s.user_id as user_id,
                      s.company_id as company_id,
                      sum(l.unit_quantity*l.unit_amount) as price_total,
                      (sum(l.unit_quantity*l.unit_amount)/sum(l.unit_quantity * u.factor))::decimal(16,2) as price_average,
                      count(*) as nbr,
                      (select unit_quantity from hr_expense_line where id=l.id and product_id is not null) as no_of_products,
-                     (select count(analytic_account) from hr_expense_line where id=l.id and analytic_account is not null) as no_of_account,
+                     (select analytic_account from hr_expense_line where id=l.id and analytic_account is not null) as no_of_account,
                      s.state
                  from hr_expense_line l
                  left join hr_expense_expense s on (s.id=l.expense_id)
@@ -104,10 +108,10 @@ class hr_expense_report(osv.osv):
                      l.analytic_account,
                      s.invoice_id,
                      s.currency_id,
+                     s.user_valid,
                      s.department_id,
                      l.uom_id,
                      l.id,
-                     s.user_id,
                      s.state,
                      s.journal_id,
                      s.company_id,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index a4aa15e7076..bcc560573ab 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -9,7 +9,6 @@
             <tree string="Expenses Analysis">
                 <field name="date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
-                <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -21,12 +20,13 @@
                 <field name="currency_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
+                <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
-                <field name="no_of_account" sum="# of Accounts"/>
+                <field name="delay_valid"/>
+                <field name="delay_confirm"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -37,7 +37,7 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Expenses Analysis" type="bar">
-                 <field name="user_id"/>
+                 <field name="employee_id"/>
                  <field name="state" group="True"/>
                  <field name="nbr" operator="+"/>
              </graph>
@@ -76,48 +76,49 @@
 	                    icon="terp-camera_test"
 	                    domain="[('state','=','accepted')]"
 	                    help = "Accepted Expenses"/>
+	                <filter string="Cancelled"
+	                    icon="terp-dialog-close"
+	                    domain="[('state','=','cancelled')]"
+	                    help = "Cancelled Expenses"/>
 	  				<separator orientation="vertical"/>
-                    <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>
+                    <field name="employee_id"/>
 				</group>
 				<newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
-                    <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
                     <filter string="Force Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-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':'year'}"/>
                 </group>
-				<newline/>
-				<group expand="0" string="Extended filters..." groups="base.group_extended">
-				    <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"/>
+                <newline/>
+                <group expand="0" string="Extended filters..." groups="base.group_extended">
+                    <field name="product_id"/>
                     <separator orientation="vertical"/>
+                    <field name="journal_id" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="department_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
                     <field name="date_valid"/>
-                    <separator orientation="vertical"/>
-                    <field name="currency_id" widget="selection"/>
+
                 </group>
             </search>
         </field>
@@ -128,7 +129,7 @@
         <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,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_employee':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_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index b86674b1aa8..6e180f8cd55 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -1,382 +1,388 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_timesheet
-#
+# * hr_timesheet_sheet
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-06-07 21:18+0000\n"
+"Last-Translator: Drazen Bosak <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:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet,init:0
 #: wizard_view:hr.analytical.timesheet.my,init:0
 msgid "Choose your month"
-msgstr ""
+msgstr "Izaberite svoj mjesec"
 
 #. module: hr_timesheet
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr ""
+msgstr "Kontrolna kartica Djelatnika"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.si_so
 #: model:ir.ui.menu,name:hr_timesheet.menu_si_so
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Prijava / Odjava po Projektu"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0
 msgid "Stop Working"
-msgstr ""
+msgstr "Prestanite s radom"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "(Keep empty for current_time)"
-msgstr ""
+msgstr "(Treba ostati prazno za current_time)"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Greška: Zadana Jedinica Mjere (JM) i kupovna Jedinica Mjere (JM) moraju biti "
+"u istoj kategoriji."
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Sign in status"
-msgstr ""
+msgstr "Status Prijave"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(Treba ostati prazno za tekuće vijeme)"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_out,server_date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Tekući Datumž"
 
 #. module: hr_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nepravilno ime modela u definiciji radnje."
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,report:0
 #: wizard_button:hr.analytical.timesheet.my,init,report:0
 #: wizard_button:hr.analytical.timesheet_users,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Tiskaj"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "Minimalni Analitički Konto"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
 msgid "Current Server Date"
-msgstr ""
+msgstr "Tekući datum Servera"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date_start:0
 #: wizard_field:hr_timesheet.si_so,sign_out,date:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni Datum"
 
 #. module: hr_timesheet
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "août"
-msgstr ""
+msgstr "\"août\""
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analitički Dnevnik"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Sat"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet
 msgid "Employee Timesheet"
-msgstr ""
+msgstr "Kontrolna kartica Djelatnika"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "Statistika obavljenog Posla"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form
 msgid "Working Hours"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Linije Kontrolne kartice"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr ""
+msgstr "Ukupna cijena"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juillet"
-msgstr ""
+msgstr "\"juillet\""
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 #: model:ir.ui.menu,name:hr_timesheet.next_id_48
 msgid "Timesheet"
-msgstr ""
+msgstr "Kontrolna Kartica"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "janvier"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "juin"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_my
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_my
 msgid "Print My Timesheet"
-msgstr ""
+msgstr "Tiskaj moju Kontrolnu Karticu"
 
 #. module: hr_timesheet
 #: wizard_field:hr.analytical.timesheet,init,user_id:0
 #: wizard_field:hr.analytical.timesheet.my,init,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "Sign in"
-msgstr ""
+msgstr "Prijava"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form
 msgid "Working Hours of The Day"
-msgstr ""
+msgstr "Radni sati u danu"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(local time on the server side)"
-msgstr ""
+msgstr "(Lokalno vrijeme na serveru)"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total cost"
-msgstr ""
+msgstr "Ukupni trošak"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_day
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: hr_timesheet
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "avril"
-msgstr ""
+msgstr "Travanj"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic line"
-msgstr ""
+msgstr "Analitička linija"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
+"Greška: Jedinica skladištenja  (JS) mora biti u različitoj kategoriji od "
+"Jedinice Mjere (JM)"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet_users,init:0
 msgid "Choose Users"
-msgstr ""
+msgstr "Odaberite Korisnike"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "novembre"
-msgstr ""
+msgstr "Studeni"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "Sign in / Sign out"
-msgstr ""
+msgstr "Prijava / Odjava"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "Posao obavljen u zadnjem razdoblju"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr ""
+msgstr "Ključni datumi"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,state:0
 #: wizard_field:hr_timesheet.si_so,sign_out,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Tekuće stanje"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "octobre"
-msgstr ""
+msgstr "Listopad"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr ""
+msgstr "Analitičke statistike"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "décembre"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,info:0
 msgid "Work Description"
-msgstr ""
+msgstr "Opis Posla"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,name:0
 #: wizard_field:hr_timesheet.si_so,sign_out,name:0
 msgid "Employee's name"
-msgstr ""
+msgstr "Ime Djelatnika"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Consultancy - Senior Developer"
-msgstr ""
+msgstr "Savjetovanje - Stariji Programer"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form
 msgid "My Working Hours"
-msgstr ""
+msgstr "Moji radni sati"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet line"
-msgstr ""
+msgstr "Niz Kontrolne kartice"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 msgid "Sum"
-msgstr ""
+msgstr "Zbroj"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my
 msgid "My Working Hours of The Day"
-msgstr ""
+msgstr "Moji radni sati u danu"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
 msgid "Human Resources (Timesheet encoding)"
-msgstr ""
+msgstr "Ljudski Resursi (Kodiranje Kontrolna Kartica)"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mars"
-msgstr ""
+msgstr "Travanj"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "mai"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
 msgid "Start Working"
-msgstr ""
+msgstr "Započnite s radom"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
 msgid "Change Work"
-msgstr ""
+msgstr "Promijenite posao"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "février"
-msgstr ""
+msgstr "Veljača"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "Satistike po mjesecu"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -384,49 +390,49 @@ msgstr ""
 #: wizard_field:hr.analytical.timesheet.my,init,month:0
 #: wizard_field:hr.analytical.timesheet_users,init,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički Konto"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći Podaci"
 
 #. module: hr_timesheet
 #: model:process.process,name:hr_timesheet.process_process_timesheetprocess0
 msgid "Timesheet Process"
-msgstr ""
+msgstr "Proces Kontrolne kartice"
 
 #. module: hr_timesheet
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Nepravila EAN kod"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr ""
+msgstr "Statistike po Korisniku"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Niz Kontrolne kartice"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis summary"
-msgstr ""
+msgstr "Zbirna Analiza"
 
 #. module: hr_timesheet
 #: wizard_field:hr.analytical.timesheet,init,year:0
 #: wizard_field:hr.analytical.timesheet.my,init,year:0
 #: wizard_field:hr.analytical.timesheet_users,init,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,end:0
@@ -435,39 +441,39 @@ msgstr ""
 #: wizard_button:hr_timesheet.si_so,sign_in,end:0
 #: wizard_button:hr_timesheet.si_so,sign_out,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 #: wizard_field:hr.analytical.timesheet_users,init,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. module: hr_timesheet
 #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "To be invoiced"
-msgstr ""
+msgstr "Treba izdati račun"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr ""
+msgstr "Kontrolna kartica Djelatnika"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
 #: selection:hr.analytical.timesheet.my,init,month:0
 #: selection:hr.analytical.timesheet_users,init,month:0
 msgid "septembre"
-msgstr ""
+msgstr "Rujan"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Kontrolne Kartice"
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 6ba221731f2..2309fa6b3d2 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.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-06-06 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index 3dd8d161c5f..a8c0440a053 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -39,6 +39,9 @@ class timesheet_report(osv.osv):
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'nbr': fields.integer('#Nbr',readonly=True),
+        'total_diff': fields.float('#Total Diff',readonly=True),
+        'total_timesheet': fields.float('#Total Timesheet',readonly=True),
+        'total_attendance': fields.float('#Total Attendance',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
         'department_id':fields.many2one('hr.department','Department',readonly=True),
         'date_from': fields.date('Date from',readonly=True,),
@@ -67,10 +70,25 @@ class timesheet_report(osv.osv):
                         to_char(htss.date_current,'MM') as month,
                         to_char(htss.date_current, 'YYYY-MM-DD') as day,
                         count(*) as nbr,
-                        sum(aal.unit_amount) as quantity,
-                        sum(aal.amount) as cost,
+                        aal.unit_amount as quantity,
+                        aal.amount as cost,
                         aal.account_id,
                         aal.product_id,
+                        (SELECT   sum(day.total_difference)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
+                        (SELECT sum(day.total_timesheet)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
+                        (SELECT sum(day.total_attendance)
+                            FROM hr_timesheet_sheet_sheet AS sheet 
+                            LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
+                            ON (sheet.id = day.sheet_id 
+                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
                         aal.to_invoice,
                         aal.general_account_id,
                         htss.user_id,
@@ -87,6 +105,8 @@ class timesheet_report(osv.osv):
                         aal.account_id,
                         htss.date_from,
                         htss.date_to,
+                        aal.unit_amount,
+                        aal.amount,
                         htss.date_current,
                         aal.to_invoice,
                         aal.product_id,
@@ -94,8 +114,9 @@ class timesheet_report(osv.osv):
                         htss.name,
                         htss.company_id,
                         htss.state,
+                        htss.id,
                         htss.department_id,
                         htss.user_id
             )
         """)
-timesheet_report()
\ No newline at end of file
+timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 0cba7ad179b..51e6b5d295c 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -24,8 +24,6 @@
                     <field name="user_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>
                     <field name="date_to" invisible="1"/>
-					<field name="quantity" sum="#Quantity"/>
-					<field name="cost" sum="#Cost"/>
                     <field name="state" invisible="1"/>
                     <field name="department_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
@@ -36,6 +34,11 @@
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
+                    <field name="quantity" sum="#Quantity"/>
+                    <field name="cost" sum="#Cost"/>
+                    <field name="total_diff" sum="#Total Diff"/>
+                    <field name="total_timesheet" sum="#Total Timesheet"/>
+                    <field name="total_attendance" sum="#Total Attendance"/>
                 </tree>
             </field>
         </record>
@@ -65,52 +68,46 @@
 	                    <filter icon="terp-camera_test"
 	                    		string="Confirmed"
 	                    		domain="[('state','=','confirm')]"/>
+	                    <filter icon="terp-dialog-close"
+		                    		string="Done"
+		                    		domain="[('state','=','done')]"/>
 	                    <separator orientation="vertical"/>
-	                    <field name="product_id"/>
-	  					<field name="user_id" widget="selection">
-	                        <filter icon="terp-personal-"
-	                        		string="Non Assigned timesheets to users"
-	                        		help="Non Assigned timesheets to users"
-	                        		domain="[('user_id','=',False)]"/>
-	                    </field>
-	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+	                    <field name="account_id"/>
+                      <field name="user_id" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By...">
-	                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <group expand="1" string="Group By...">
+	                    <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+	                    <separator orientation="vertical"/>
 	                    <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
+	                    <separator orientation="vertical"/>
 	                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
 	                    <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
 	                    <separator orientation="vertical"/>
-	                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
 	                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
 	                    <separator orientation="vertical"/>
+	                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+	                    <separator orientation="vertical"/>
 	                    <filter string="Day" icon="terp-go-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':'year'}"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." groups="base.group_extended">
-	                	<filter icon="terp-document-new"
-	                    		string="New"
-	                    		domain="[('state','=','new')]"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="date_from"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="account_id"/>
-	                    <field name="department_id" widget="selection"/>
-	                    <newline/>
-	                    <filter icon="terp-dialog-close"
-		                    		string="Done"
-		                    		domain="[('state','=','done')]"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="date_to"/>
-	                    <separator orientation="vertical"/>
 	                    <field name="general_account_id"/>
 	                    <field name="to_invoice" widget="selection"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="product_id"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="department_id" widget="selection"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+	                    <newline/>
+	                    <field name="date_to"/>
+	                    <field name="date_from"/>
 	                </group>
                 </search>
             </field>
@@ -121,7 +118,7 @@
             <field name="res_model">timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="search_view_id" ref="view_timesheet_report_search"/>
         </record>
         <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" parent="hr.menu_hr_reporting"/>
diff --git a/addons/idea/i18n/hr.po b/addons/idea/i18n/hr.po
index 97112788aea..34c35557cc1 100644
--- a/addons/idea/i18n/hr.po
+++ b/addons/idea/i18n/hr.po
@@ -1,19 +1,19 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# * idea
+# * hr_attendance
 # Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"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-10 06:56+0000\n"
-"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
-"Language-Team: Vinteh\n"
+"PO-Revision-Date: 2010-06-07 19:29+0000\n"
+"Last-Translator: Drazen Bosak <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-11 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -174,7 +174,7 @@ msgstr "idea.vote"
 #: field:idea.comment,user_id:0
 #: field:idea.vote,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: idea
 #: view:idea.idea:0
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index f221278c9f0..2638031c7b9 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.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-06-06 03:34+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index d754d6a50ad..4fffbdf1689 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -32,11 +32,12 @@ class mrp_production_order(osv.osv):
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'day': fields.char('Day',size=64,readonly=True),
         'origin': fields.char('Source Document', size=64),
-        'nbr': fields.integer('# of Orders', readonly=True),
+        'nbr': fields.integer('# of Lines', readonly=True),
         'products_to_consume': fields.integer('Products to Consume', readonly=True),
         'consumed_products': fields.integer('Consumed Products', readonly=True),
         'date': fields.date('Date', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
+        'product_id2': fields.many2one('product.product', 'Product Consumed', readonly=True),
         'product_qty': fields.float('Product Qty', readonly=True),
         'state': fields.selection([('draft','Draft'),
                                    ('picking_except', 'Picking Exception'),
@@ -74,11 +75,12 @@ class mrp_production_order(osv.osv):
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
                      to_char(s.create_date, 'YYYY-MM-DD') as day,
-                     l.product_id as product_id,
+                     s.product_id as product_id,
+                     l.product_id as product_id2,
                      l.product_uom,
                      sum(l.product_qty * u.factor) as product_qty,
                      s.company_id as company_id,
-                     count(*) as nbr,
+                     (select 1) as nbr,
                      (select sum(sm.product_qty) from stock_move as sm
                         left join mrp_production_move_ids as mv on (sm.id=mv.move_id)
                         left join mrp_production_product_line as ll on (ll.production_id=mv.production_id)
@@ -111,6 +113,7 @@ class mrp_production_order(osv.osv):
                      to_char(s.create_date, 'YYYY-MM-DD'),
                      to_date(to_char(s.create_date, 'MM-dd-YYYY'),'MM-dd-YYYY'),
                      l.product_id,
+                     s.product_id,
                      l.product_uom,
                      s.id,
                      l.id,
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 55957619e31..61aff34bf91 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -11,19 +11,20 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Production">
-					<field name="date_planned"/>
-					<field name="bom_id" invisible="1"/>
-					<field name="product_id" invisible="1"/>
-					<field name="product_qty" sum='Product Qty'/>
-					<field name="nbr" string="#Production Orders" sum='#Production Orders'/>
-					<field name="state" invisible="1"/>
-					<field name="picking_id" invisible="1"/>
-                    <field name="priority" invisible="1"/>
-                    <field name="year" invisible="1" />
-					<field name="month" invisible="1"/>
-					<field name="location_src_id" invisible="1"/>
-					<field name="location_dest_id" invisible="1"/>
-					<field name="company_id" groups="base.group_multi_company" invisible="1"/>
+                      <field name="date_planned"/>
+                      <field name="bom_id" invisible="1"/>
+                      <field name="product_id" invisible="1"/>
+                      <field name="product_qty" sum='Product Qty'/>
+                      <field name="nbr" string="#Line Orders" sum='#Line Orders'/>
+                      <field name="state" invisible="1"/>
+                      <field name="picking_id" invisible="1"/>
+                      <field name="priority" invisible="1"/>
+                      <field name="day" invisible="1" />
+                      <field name="month" invisible="1" />
+                      <field name="year" invisible="1" />
+                      <field name="location_src_id" invisible="1"/>
+                      <field name="location_dest_id" invisible="1"/>
+                      <field name="company_id" groups="base.group_multi_company" invisible="1"/>
 				</tree>
             </field>
         </record>
@@ -81,7 +82,7 @@
                     	<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     	<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
-                    	<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    	<filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     	<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                    </group>
                     <newline/>
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
index 1f974318ee3..bb18326af07 100644
--- a/addons/mrp_procurement/mrp_procurement.py
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -262,8 +262,9 @@ class mrp_procurement(osv.osv):
         user = self.pool.get('res.users').browse(cr, uid, uid)
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
-                if procurement.product_id.seller_ids:
-                    partner = procurement.product_id.seller_ids[0].name
+                partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
+                if partner_list:
+                    partner = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].name or False
                     if user.company_id and user.company_id.partner_id:
                         if partner.id == user.company_id.partner_id.id:
                             return True
@@ -288,7 +289,9 @@ class mrp_procurement(osv.osv):
             if not procurement.product_id.seller_ids:
                 cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
                 return False
-            partner = procurement.product_id.seller_ids[0].name
+            partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id and partner_id.sequence])
+            partner = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].name or False
+
             if user.company_id and user.company_id.partner_id:
                 if partner.id == user.company_id.partner_id.id:
                     return False
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index b3cd672494d..3ddf32b0cdd 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/product/product.py b/addons/product/product.py
index aaa369cdfcf..eddbd992874 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -245,7 +245,8 @@ class product_template(osv.osv):
         result = {}
         for product in self.browse(cr, uid, ids, context):
             if product.seller_ids:
-                result[product.id] = product.seller_ids[0].delay
+                partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  product.seller_ids if partner_id and partner_id.sequence])
+                result[product.id] = partner_list and partner_list[0] and partner_list[0][1] and partner_list[0][1].delay or False
             else:
                 result[product.id] = 1
         return result
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 11ed4bfba65..9f13467c4cb 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -426,7 +426,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier Information">
                     <field name="name"/>
-                    <field name="sequence" invisible="1"/>
+                    <field name="sequence"/>
                     <field name="product_name" groups="base.group_extended"/>
                     <field name="product_code" groups="base.group_extended"/>
                     <field name="delay"/>
@@ -451,7 +451,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
-                    <field name="sequence" string="Seq" invisible="1"/>
+                    <field name="sequence" string="Seq"/>
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="qty"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 1cd452d736e..b115b576859 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -31,7 +31,6 @@ 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),
@@ -48,7 +47,7 @@ class report_project_task_user(osv.osv):
                                        help="Number of Days to close the task"),
         'opening_days': fields.float('Days to Open', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to Open the task"),
-        'delay_endings_days': fields.float('Overpass Delay', digits=(16,2), readonly=True, group_operator="avg"),
+        'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
         'priority' : fields.selection([('4','Very Low'),
                                        ('3','Low'),
@@ -74,53 +73,61 @@ class report_project_task_user(osv.osv):
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'report_project_task_user')
         cr.execute("""
-            create or replace view report_project_task_user as (
-                select
-                    min(t.id) as id,
+            create view report_project_task_user as
+              select
+                    (select 1 ) AS nbr,
+                    t.id as id,
                     to_char(date_start, 'YYYY') as year,
                     to_char(date_start, 'MM') as month,
                     to_char(date_start, 'YYYY-MM-DD') as day,
-                    count(distinct t.id) as nbr,
                     date_trunc('day',t.date_start) as date_start,
                     date_trunc('day',t.date_end) as date_end,
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
-                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
+--                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
+                    (extract('epoch' from (t.date_end-t.date_start)))/(3600*24)  as no_of_days,
                     t.user_id,
-                    sum(progress) as progress,
+                    progress as progress,
                     t.project_id,
                     t.state,
+                    t.effective_hours as hours_effective,
                     t.priority,
                     t.name as name,
                     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,
-                    avg(extract('epoch' from (t.date_end-t.create_date)))/(3600*24)  as closing_days,
-                    avg(extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
-                    avg(extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24)  as delay_endings_days,
-                    sum(w.hours) as hours_effective,
-                    ((sum(planned_hours)-sum(w.hours))/count(distinct t.id))::decimal(16,2) as hours_delay
-                from project_task t
-                    left join project_task_work w on (t.id=w.task_id)
-                group by
-                    to_char(date_start, 'YYYY'),
-                    to_char(date_start, 'MM'),
-                    t.priority,
+                    remaining_hours as remaining_hours,
+                    total_hours as total_hours,
+                    t.delay_hours as hours_delay,
+                    planned_hours as hours_planned,
+                    (extract('epoch' from (t.date_end-t.create_date)))/(3600*24)  as closing_days,
+                    (extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
+                    (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24)  as delay_endings_days
+              from project_task t
+
+                group by 
+                    t.id,
+                    remaining_hours,
+                    t.effective_hours,
+                    progress,
+                    total_hours,
+                    planned_hours,
+                    hours_delay,
+                    year,
+                    month,
+                    day,
+                    create_date,
+                    date_start,
+                    date_end,
+                    date_deadline,
                     t.user_id,
-                    w.user_id,
+                    t.project_id,
                     t.state,
-                    date_trunc('day',t.date_end),
-                    to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'),
+                    t.priority,
+                    name,
                     t.company_id,
                     t.partner_id,
-                    t.type,
-                    t.name,
-                    t.project_id,
-                    t.date_start
-            )
+                    t.type
+
         """)
 report_project_task_user()
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 26488eae254..9b685001664 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -12,7 +12,6 @@
                 	<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"/>
@@ -31,8 +30,8 @@
                     <field name="hours_effective" sum='Effective Hours'/>
                     <field name="hours_delay" sum='Avg. Plan.-Eff.'/>
                     <field name="opening_days" sum='Days to Open'/>
-                    <field name="delay_endings_days" sum='OverPass delay'/>
                     <field name="closing_days" sum='Days to Close'/>
+                    <field name="delay_endings_days" sum='OverPass delay'/>
                     <field name="progress" sum='Progress' widget='progressbar'/>
                 </tree>
             </field>
@@ -87,9 +86,14 @@
                     			icon="terp-dialog-close"
                     			name="done"
                     			domain="[('state','=','done')]"/>
-	  					<separator orientation="vertical"/>
-	  					<field name="partner_id" />
-	                    <field name="user_id" widget="selection">
+                      <separator orientation="vertical"/>
+	                    <field name="project_id">
+	                        <filter icon="terp-folder-blue"
+	                        		string="My Projects"
+	                        		help="My Projects"
+	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
+                          </field>
+                          <field name="user_id" widget="selection">
 	                        <filter icon="terp-personal"
 	                        		string="My Task"
 	                        		help = "My tasks"
@@ -98,22 +102,16 @@
 	                        		string="Non Assigned Tasks to users"
 	                        		help="Non Assigned Tasks to users"
 	                        		domain="[('user_id','=',False)]"/>
-	                    </field>
-	                    <field name="project_id">
-	                        <filter icon="terp-folder-blue"
-	                        		string="My Projects"
-	                        		help="My Projects"
-	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
-	                    </field>
+                          </field>
+                      <field name="partner_id" />
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="10" col="12">
-                        <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'}"/>
+                    <group expand="1" string="Group By..." colspan="10" col="12">
+                        <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
+                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <separator orientation="vertical"/>
                        <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-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
@@ -126,7 +124,6 @@
                     <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"/>
@@ -145,7 +142,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ecc42a00be2..92f671aa82e 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -76,6 +76,7 @@ class project_issue(osv.osv, crm.crm_case):
                         date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
                         ans = date_open - date_create
                         date_until = issue.date_open
+                        #Calculating no. of working hours to open the issue
                         hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
                                 mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
                                 mx.DateTime.strptime(issue.date_open, '%Y-%m-%d %H:%M:%S'))
@@ -85,6 +86,7 @@ class project_issue(osv.osv, crm.crm_case):
                         date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
                         date_until = issue.date_closed
                         ans = date_close - date_create
+                        #Calculating no. of working hours to close the issue
                         hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
                                 mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
                                 mx.DateTime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S'))
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 70a08e2c7b4..92f170eb556 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -9,7 +9,6 @@ AVAILABLE_STATES = [
     ('done', 'Closed'),
     ('pending','Pending')
 ]
-
 class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
@@ -51,9 +50,9 @@ class project_issue_report(osv.osv):
 
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+        'user_id2':fields.many2one('res.users', 'Assigned To', 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"),
         'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
@@ -65,23 +64,30 @@ class project_issue_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),
+        'opening_date': fields.date('Opening Date', readonly=True),
+        'creation_date': fields.date('Creation Date', readonly=True),
+        'date_closed': fields.date('Closed Date', readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'nbr': fields.integer('# of Issues', readonly=True),
+        'working_hours_open': fields.float('# Working Open Hours', readonly=True),
+        'working_hours_close': fields.float('# Working Closing Hours', readonly=True),
+        'delay_open': fields.float('Avg opening Delay', digits=(16,2), readonly=True, group_operator="avg",
+                                       help="Number of Days to close the project issue"),
         'delay_close': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
         'company_id' : fields.many2one('res.company', 'Company'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
-        'type_id': fields.many2one('crm.case.resource.type', 'Type', domain="[('object_id.model', '=', 'project.issue')]"),
-        'date_closed': fields.datetime('Close Date', readonly=True),
+        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'user_id2losed': fields.date('Close Date', readonly=True),
         'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
         'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" )
     }
+
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'project_issue_report')
         cr.execute("""
@@ -91,51 +97,60 @@ class project_issue_report(osv.osv):
                     to_char(c.create_date, 'YYYY') as name,
                     to_char(c.create_date, 'MM') as month,
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
+                    to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     c.state,
                     c.user_id,
+                    c.working_hours_open,
+                    c.working_hours_close,
                     c.section_id,
                     c.categ_id,
                     c.stage_id,
-                    to_char(c.date_closed, 'YYYY/mm/dd') as date_closed,
-                    u.company_id as company_id,
+                    to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
+                    c.company_id as company_id,
                     c.priority as priority,
                     c.project_id as project_id,
                     c.type_id as type_id,
-                    count(*) as nbr,
+                    (select 1) as nbr,
                     c.assigned_to,
                     c.partner_id,
                     c.canal_id,
                     c.task_id,
                     date_trunc('day',c.create_date) as create_date,
+                    avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as  delay_open,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close
                 from
                     project_issue c
-                left join
-                    res_users u on (c.id = u.id)
+                where c.categ_id in (select res_id from ir_model_data where name='bug_categ')
                 group by
                     to_char(c.create_date, 'YYYY'),
                     to_char(c.create_date, 'MM'),
                     to_char(c.create_date, 'YYYY-MM-DD'),
                     c.state,
+                    to_char(c.date_open, 'YYYY-MM-DD'),
+                    to_char(c.date_closed, 'YYYY-mm-dd'),
                     c.user_id,
                     c.section_id,
                     c.categ_id,
                     c.stage_id,
-                    c.date_closed,
-                    u.company_id,
+                    c.company_id,
                     c.priority,
+                    c.working_hours_open,
+                    c.working_hours_close,
                     c.project_id,
+                    to_char(c.date_closed, 'YYYY-MM-DD'),
                     c.type_id,
+                    c.working_hours_open,
+                    c.working_hours_close,
                     date_trunc('day',c.create_date),
                     c.assigned_to,
                     c.partner_id,
                     c.canal_id,
                     c.task_id
-            )""")
-
+            )""") 
 
 project_issue_report()
 
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index adc1b3c662f..b4d0af02185 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -12,10 +12,9 @@
                     <field name="month" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
-                    <field name="type_id" string="Type" invisible="1"/>
+                    <field name="type_id" string="Version" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                    <field name="delay_close" avg='Avg Closing Delay'/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
@@ -24,10 +23,13 @@
                     <field name="task_id" invisible="1"/>
                     <field name="assigned_to" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
-                    <field name="create_date" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="nbr" string="#Project Issue" sum='#Number of Project Issue'/>
+                    <field name="delay_open" avg='Avg Opening Delay'/>
+                    <field name="delay_close" avg='Avg Closing Delay'/>
+                    <field name="working_hours_open" sum='Open Working Hours'/>
+                    <field name="working_hours_close" sum='Close Working hours'/>
                   </tree>
             </field>
         </record>
@@ -51,29 +53,25 @@
             <field name="arch" type="xml">
 				<search string="Search">
                   <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-go-year"
+                   		<filter string="365 Days" 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-go-month" name="This Month"
+                       <filter string="30 Days" 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="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-document-new"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-camera_test"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					   <filter icon="terp-gtk-media-pause"
+                        <filter  icon="terp-camera_test"
+                    		string="Current"
+                    		domain="[('state','in',('draft','open'))]"/>
+                       <filter icon="terp-gtk-media-pause"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
+                       <filter icon="terp-dialog-close"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
 
                    		<separator orientation="vertical" />
                    		<field name="section_id"
@@ -87,45 +85,37 @@
                    				help="My section" />
 
                    		</field>
-                   		<field name="company_id" widget="selection">
-                           <filter icon="terp-go-home"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
-                        </field>
+                  			<field name="project_id"/>
                       	<field name="user_id"  select="1" widget="selection"/>
                    </group>
                    <newline/>
-                   <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-go-home"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
+                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
+                        <separator orientation="vertical" />
+                        <filter name="User" string="Responsible" icon="terp-personal" 
+                        domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Assigned to" name="Responsible" icon="terp-personal"
+                        domain="[]" context="{'group_by':'assigned_to'}" />
+                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <separator orientation="vertical" />
                         <filter string="Section" icon="terp-sale"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
-
+                        <filter string="Category" icon="terp-stock_symbol-selection"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                         	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-
-						<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-	            		<separator orientation="vertical"/>
-	            		<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-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-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="Company" icon="terp-go-home"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
 
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-sale"
@@ -140,36 +130,21 @@
                   </group>
                    <newline/>
                    <group  expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                         <filter icon="terp-dialog-close"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="terp-gtk-stop"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                    	<group>
+                    		<field name="partner_id"  />
+                    		<field name="assigned_to" widget="selection"/>
                     		<separator orientation="vertical"/>
-                  			<field name="project_id" widget="selection" />
                     		<field name="priority" />
                     		<separator orientation="vertical"/>
                     		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="task_id"/>
-                    		<separator orientation="vertical"/>
-                    		<field name="assigned_to" widget="selection">
-                    			<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')]"/>
                     		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
                     		<separator orientation="vertical"/>
-                    		<field name="partner_id"  />
-                    		<field name="canal_id" widget="selection"/>
-                            <separator orientation="vertical"/>
+                   		<field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    		<newline/>
+                            <field name="creation_date"/>
+                            <field name="opening_date"/>
                             <field name="date_closed" string="Date Closed"/>
                         </group>
-
-                   </group>
                </search>
             </field>
         </record>
@@ -179,7 +154,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
   			<field name="view_mode">graph,tree</field>
-  			<field name="context">{"search_default_This Month":1,"search_default_User":1,"search_default_user_id":uid,'group_by_no_leaf':1,'group_by':[]}</field>
+  			<field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_project_issue_report_tree"/>
             <field name="search_view_id" ref="view_project_issue_report_filter"/>
         </record>
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index af8ed99ffbe..2e46481a6e1 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.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-06-05 03:35+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 443a279e3f2..2cfd4247bcf 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -726,22 +726,24 @@ class mrp_procurement(osv.osv):
         po_obj = self.pool.get('purchase.order')
         for procurement in self.browse(cr, uid, ids):
             res_id = procurement.move_id.id
-            partner = procurement.product_id.seller_ids[0].name
-            partner_id = partner.id
+            partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
+            partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
+            partner = partner_rec.name or False
+            partner_id = partner_rec.id or False
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             pricelist_id = partner.property_product_pricelist_purchase.id
 
             uom_id = procurement.product_id.uom_po_id.id
 
             qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
-            if procurement.product_id.seller_ids[0].qty:
-                qty = max(qty,procurement.product_id.seller_ids[0].qty)
+            if partner_rec.qty:
+                qty = max(qty,partner_rec.qty)
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
 
             newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
             newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-            newdate = newdate - procurement.product_id.seller_ids[0].delay
+            newdate = newdate - partner_rec.delay
 
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang': partner.lang, 'partner_id': partner_id})
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index cf177319ea5..71f2638d628 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -31,7 +31,7 @@ class purchase_report(osv.osv):
     _description = "Purchases Orders"
     _auto = False
     _columns = {
-        'date': fields.date('Date', readonly=True),
+        'date': fields.date('Date order', readonly=True),
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'state': fields.selection([
@@ -61,7 +61,11 @@ class purchase_report(osv.osv):
         'expected_date':fields.date('Expected Date', readonly=True),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'shipped_qty':fields.integer('Received Qty', readonly=True),
+        'invoiced_qty':fields.integer('Invoiced Qty', readonly=True),
         'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+        'delay':fields.float('Days to Close', digits=(16,2), readonly=True),
+        'delay_pass':fields.float('Overpassed expected', digits=(16,2), readonly=True),
         'quantity': fields.float('# of Products', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
         'price_average': fields.float('Average Price', readonly=True),
@@ -94,9 +98,13 @@ class purchase_report(osv.osv):
                     s.create_uid as user_id,
                     s.company_id as company_id,
                     s.invoice_method,
+                    s.shipped::integer as shipped_qty,
+                    l.invoiced::integer as invoiced_qty,
                     l.product_id,
                     s.location_id as location_id,
                     sum(l.product_qty*u.factor) as quantity,
+                    extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
+                    extract(epoch from age(s.minimum_planned_date,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
                     count(*) as nbr,
                     sum(l.product_qty*l.price_unit) as price_total,
                     (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average
@@ -107,9 +115,12 @@ class purchase_report(osv.osv):
                 group by
                     s.company_id,
                     s.create_uid,
+                    s.shipped,
+                    l.invoiced,
                     s.partner_id,
                     s.location_id,
                     s.date_approve,
+                    s.minimum_planned_date,
                     date_trunc('day',s.minimum_planned_date),
                     s.partner_address_id,
                     s.pricelist_id,
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
deleted file mode 100644
index 8fb7836468d..00000000000
--- a/addons/purchase/report/purchase_report_view.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_purchase_order_report_graph">
-            <field name="name">product.month.graph</field>
-            <field name="model">purchase.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Purchase Orders Statistics" type="bar">
-                    <field name="product_id"/>
-                    <field name="quantity" operator="+"/>
-                    <field name="price_total" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="view_purchase_order_tree" model="ir.ui.view">
-            <field name="name">purchase.order.tree</field>
-            <field name="model">purchase.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Purchase Orders Statistics">
-                	<field name="date" invisible="1"/>
-                	<field name="date_approve" invisible="1"/>
-                	<field name="expected_date" invisible="1"/>
-                	<field name="user_id" invisible="1"/>
-                	<field name="partner_id" invisible="1"/>
-                    <field name="product_id" invisible="1"/>
-                    <field name="quantity" invisible="1"/>
-                    <field name="nbr" sum="# of Lines"/>
-                    <field name="price_average" avg="Average Price"/>
-                	<field name="price_total" sum="Total Price"/>
-                	<field name="day" invisible="1"/>
-                    <field name="name" invisible="1"/>
-                    <field name="month" invisible="1"/>
-                    <field name="warehouse_id" invisible="1"/>
-                    <field name="partner_address_id" invisible="1"/>
-                    <field name="dest_address_id" invisible="1"/>
-                    <field name="pricelist_id" invisible="1"/>
-                    <field name="validator" invisible="1"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="location_id" invisible="1"/>
-                    <field name="fiscal_position" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_purchase_order_search" model="ir.ui.view">
-        <field name="name">report.purchase.order.search</field>
-        <field name="model">purchase.report</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Purchase Orders">
-            <group colspan="10" col="12">
-            	<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-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="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-document-new"
-                    	string="Quotations"
-                    	domain="[('state','=','draft')]"/>
-                <filter icon="terp-gtk-media-pause"
-                		string="Waiting Schedule"
-                		domain="[('state','=','waiting_date')]"/>
-                <filter icon="terp-camera_test"
-                		string="Manual in progress"
-                		domain="[('state','=','manual')]"/>
-
-                <separator orientation="vertical"/>
-                <field name="partner_id" string="Supplier"/>
-                <field name="product_id"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-personal-"
-                    		string="Purchase Non User"
-                    		help="Purchase Non User"
-                    		domain="[('user_id','=',False)]"/>
-                </field>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-				</group>
-				<newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
-                    <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-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-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-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-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-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"/>
-                    <field name="partner_address_id"/>
-                    <field name="invoice_method"/>
-                    <field name="warehouse_id" widget="selection"/>
-                    <field name="validator" widget="selection"/>
-
-                    <newline/>
-                    <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"/>
-                    <field name="dest_address_id"/>
-                    <field name="fiscal_position" widget="selection"/>
-                    <field name="location_id" widget="selection"/>
-                    <field name="pricelist_id" widget="selection"/>
-
- 					<newline/>
-					<field name="date"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record id="action_purchase_order_report_all" model="ir.actions.act_window">
-        <field name="name">Purchase Orders</field>
-        <field name="res_model">purchase.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="search_view_id" ref="view_purchase_order_search"/>
-        <field name="context">{'search_default_month':1,'search_default_Responsible':1,'group_by_no_leaf':1,'group_by':[]}</field>
-    </record>
-
-    <menuitem id="base.next_id_73" name="Reporting" parent="base.menu_purchase_root" sequence="8"/>
-    <menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
-
-	<record model="ir.ui.view" id="view_purchase_order_qty_amount_graph">
-            <field name="name">purchase.order.qty.amount.graph</field>
-            <field name="model">purchase.order.qty.amount</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Total Qty and Amount by month" type="bar">
-                    <field name="month"/>
-                    <field name="total_qty" operator="+"/>
-                    <field name="total_amount" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_purchase_order_qty_amount_tree">
-            <field name="name">purchase.order.qty.amount.tree</field>
-            <field name="model">purchase.order.qty.amount</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Total Qty and Amount by month" >
-                    <field name="month"/>
-                    <field name="total_qty" />
-                    <field name="total_amount"/>
-                </tree>
-            </field>
-        </record>
-
-	    <record id="action_purchase_order_qty_amount_all" model="ir.actions.act_window">
-	        <field name="name">Total Qty and Amount by month</field>
-	        <field name="res_model">purchase.order.qty.amount</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	    </record>
-
-	    <record model="ir.ui.view" id="view_purchase_order_by_user_graph">
-            <field name="name">purchase.order.by.user.graph</field>
-            <field name="model">purchase.order.by.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Total Orders by User per month" type="bar">
-                    <field name="name" />
-                    <field name="month" group="True" />
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_purchase_order_by_user_tree">
-            <field name="name">purchase.order.by.user.tree</field>
-            <field name="model">purchase.order.by.user</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Total Orders by User per month" >
-                	<field name="name"/>
-                    <field name="month"/>
-                    <field name="nbr" />
-                </tree>
-            </field>
-        </record>
-
-	    <record id="action_purchase_order_by_user_all" model="ir.actions.act_window">
-	        <field name="name">Total Orders by User per month</field>
-	        <field name="res_model">purchase.order.by.user</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	    </record>
-    </data>
-</openerp>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index e886ba302b9..3f74e857035 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -82,15 +82,15 @@ class purchase_requisition_partner(osv.osv_memory):
             purchase_order_line={}
             for tender in tender_obj.browse(cr, uid, record_ids):
                 for line in tender.line_ids:                
-                    
+                    partner_list = sorted([(partner.sequence, partner) for partner in  line.product_id.seller_ids if partner])
+                    partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
                     uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False            
                     newdate = DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
                     newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-                    newdate = newdate -(line.product_id.seller_ids and line.product_id.seller_ids[0].delay or DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
-                    
-
-                    partner = line.product_id.seller_ids and line.product_id.seller_ids[0].name or supplier_data
-                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id 
+                    delay = partner_rec and partner_rec.delay or False
+                    newdate = newdate -(delay or DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
+                    partner = partner_rec and partner_rec.name or supplier_data
+                    pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False 
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
                     product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
         
diff --git a/addons/report_account/i18n/hr.po b/addons/report_account/i18n/hr.po
index 80572ec3975..55cdcb73b85 100644
--- a/addons/report_account/i18n/hr.po
+++ b/addons/report_account/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_analytic/i18n/hr.po b/addons/report_analytic/i18n/hr.po
index 927bf538d9a..2eb92737c78 100644
--- a/addons/report_analytic/i18n/hr.po
+++ b/addons/report_analytic/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_analytic_planning/i18n/hr.po b/addons/report_analytic_planning/i18n/hr.po
index 8b91cf0c0a6..8fad3d2c47d 100644
--- a/addons/report_analytic_planning/i18n/hr.po
+++ b/addons/report_analytic_planning/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_document/i18n/hr.po b/addons/report_document/i18n/hr.po
index 68c557c8f48..5670e89f04f 100644
--- a/addons/report_document/i18n/hr.po
+++ b/addons/report_document/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index 8acb596f530..b89b14d5461 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_project/i18n/hr.po b/addons/report_project/i18n/hr.po
index 9993f03eb9e..185c661427d 100644
--- a/addons/report_project/i18n/hr.po
+++ b/addons/report_project/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_purchase/i18n/hr.po b/addons/report_purchase/i18n/hr.po
index 52a3fbf6ada..164b32e6849 100644
--- a/addons/report_purchase/i18n/hr.po
+++ b/addons/report_purchase/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_sale/i18n/hr.po b/addons/report_sale/i18n/hr.po
index 61af04b6fad..e9e89fc8e0c 100644
--- a/addons/report_sale/i18n/hr.po
+++ b/addons/report_sale/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/report_task/i18n/es.po b/addons/report_task/i18n/es.po
index 17a1ae549dd..419b48300af 100644
--- a/addons/report_task/i18n/es.po
+++ b/addons/report_task/i18n/es.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-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 90b6341eea9..3514576e132 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.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-06-05 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index c17d591e485..071135f332d 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index d9be5f49274..68f50068ec0 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -71,7 +71,8 @@ class sale_report(osv.osv):
         cr.execute("""
             create or replace view sale_report as (
             select el.*,
-            (select count(1) from sale_order_line where order_id = s.id) as nbr,
+                   -- (select count(1) from sale_order_line where order_id = s.id) as nbr,
+                    (select 1) as nbr,
                      s.date_order as date,
                      s.date_confirm as date_confirm,
                      to_char(s.date_order, 'YYYY') as year,
@@ -101,7 +102,7 @@ class sale_report(osv.osv):
                  sale_order_line l
                  left join product_uom u on (u.id=l.product_uom)
                  left join product_template pt on (pt.id=l.product_id)
-    group by l.id, l.order_id, l.product_id, u.name, pt.categ_id) el
+        group by l.id, l.order_id, l.product_id, u.name, pt.categ_id) el
     where s.id = el.order_id
             )
         """)
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 75dd9d55642..f6090638891 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -19,7 +19,7 @@
                 <field name="product_id" invisible="1"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
-                <field name="product_uom_qty" sum="# of Qty"/>
+                <field name="product_uom_qty" avg="# of Qty"/>
                 <field name="shipped_qty_1"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_average" avg="Average Price"/>
@@ -85,19 +85,19 @@
 	                </field>
 				</group>
 				<newline/>
-                <group expand="0" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
-                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Pricelist" icon="terp-dolar" context="{'group_by':'pricelist_id'}"/>
-                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
                    <filter string="Day" icon="terp-go-month" context="{'group_by':'day'}"/>
                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
@@ -109,7 +109,6 @@
                     <field name="date_confirm"/>
                     <separator orientation="vertical"/>
                     <field name="shop_id" widget="selection"/>
-                    <field name="state"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 2e5036d7030..9118f4fc765 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index 8e1ce7fb070..adb16bbb9f7 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 00b7b616aa5..aa7bb42cf8b 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -258,7 +258,7 @@ class split_in_production_lot(osv.osv_memory):
                     quantity_rest -= quantity
                     uos_qty = quantity / move_qty * move.product_uos_qty
                     uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
-                    if quantity_rest <= 0:
+                    if quantity_rest < 0:
                         quantity_rest = quantity
                         break
                     default_val = {
@@ -266,8 +266,11 @@ class split_in_production_lot(osv.osv_memory):
                         'product_uos_qty': uos_qty, 
                         'state': move.state
                     }
-                    current_move = move_obj.copy(cr, uid, move.id, default_val)
-                    new_move.append(current_move)
+                    if quantity_rest > 0:
+                        current_move = move_obj.copy(cr, uid, move.id, default_val)
+                        new_move.append(current_move)
+                    if quantity_rest == 0:
+                        current_move = move.id
                     prodlot_id = False
                     if line.use_exist and line.name:
                         prodlot_id = prodlot_obj.search(cr, uid, [('prefix','=',line.name),('product_id','=',data.product_id.id)])
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index d6b54e0ce1a..39cb6d5b773 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/thunderbird/i18n/hr.po b/addons/thunderbird/i18n/hr.po
index 7911a4acbe5..4ac0603558f 100644
--- a/addons/thunderbird/i18n/hr.po
+++ b/addons/thunderbird/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index cd9463a0d2c..e126c187a9c 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.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-06-07 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"