From 66ecdf7e8f3e362025bc68857893973c0260c109 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 19 Aug 2010 11:00:59 +0530
Subject: [PATCH 01/32] [IMP] point_of_sales: (1) By default, unselect the
 'Check details' checkbox in journal. Only POS manager can check/uncheck. (2)
 Renamed Sales to invoice from Point of Sale/Invoicing/Sales to Invoice by
 Uninvoiced Sales

bzr revid: uco@tinyerp.com-20100819053059-g5j2kiiakcd6a761
---
 addons/point_of_sale/account_bank_statement.py | 2 +-
 addons/point_of_sale/pos_view.xml              | 8 ++++----
 addons/point_of_sale/statement_view.xml        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index fd23bc3df18..8f5f33c9107 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -37,7 +37,7 @@ class account_journal(osv.osv):
         'journal_users': fields.many2many('res.users','pos_journal_users','journal_id','user_id','Users'),
     }
     _defaults = {
-        'check_dtls': lambda *a:True,
+        'check_dtls': lambda *a:False,
         'auto_cash': lambda *a:True,
     }
 account_journal()
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index d2c16b2b5ea..2b17fe5ea88 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -172,7 +172,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_tobinvoiced">
-            <field name="name">Sales to Invoice</field>
+            <field name="name">Uninvoiced Sales</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">pos.order</field>
             <field name="view_type">form</field>
@@ -184,7 +184,7 @@
 
         </record>
         <menuitem name="Invoicing" id="menu_point_of_sale_invoicing" parent="menu_point_root" sequence="5" />
-        <menuitem name="Sales to Invoice" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
+        <menuitem name="Uninvoiced Sales" action="action_pos_order_tobinvoiced" id="menu_point_of_sale_tobinvoiced" parent="menu_point_of_sale_invoicing"/>
         <record model="ir.actions.act_window" id="action_pos_order_accepted">
             <field name="name">Accepted Sales</field>
             <field name="type">ir.actions.act_window</field>
@@ -193,7 +193,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=', 'paid')]</field>
             <field name="context">{"search_default_user_id":uid}</field>
-             <field name="search_view_id" ref="view_pos_order_filter"/>
+            <field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
         <record model="ir.actions.act_window" id="action_pos_order_tree2">
             <field name="name">Point of Sale</field>
@@ -203,7 +203,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date_order','&lt;=', time.strftime('%Y-%m-%d 23:59:59'))]</field>
             <field name="context">{"search_default_user_id":uid}</field>
-             <field name="search_view_id" ref="view_pos_order_filter"/>
+            <field name="search_view_id" ref="view_pos_order_filter"/>
         </record>
 
         <record model="ir.actions.act_window" id="action_pos_order_tree3">
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index ba23cad7ead..cd0c3b8c57d 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -11,7 +11,7 @@
                     <page string="Point of Sale">
                         <group col="6" colspan="4">
                             <separator colspan="6" string="Extended Configureation"/>
-                            <field name="check_dtls"/>
+                            <field name="check_dtls" groups="point_of_sale.group_pos_manager"/>
                             <field name="auto_cash"/>
                             <field name="special_journal"/>
                         </group>
@@ -23,7 +23,7 @@
         </record>
 
         <menuitem name="Cash Register" parent="point_of_sale.menu_point_root" id="menu_cash_register" 
-                sequence="4" groups="group_pos_manager"/>
+                sequence="4" groups="point_of_sale.group_pos_manager"/>
 
         <!--<menuitem
             name="All Cash Registers"

From e3eb2af6141616c807376c8ba2e8a0a817a561bf Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Thu, 19 Aug 2010 08:49:31 +0200
Subject: [PATCH 02/32] [FIX] project_timesheet: using drop_view_if_exists
 ('cannot change number of columns in view' error when updating)

bzr revid: olt@tinyerp.com-20100819064931-l7dnbst1bd1sfhqo
---
 addons/project_timesheet/report/task_report.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 4288331c96b..ea454519394 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -66,7 +66,8 @@ class report_timesheet_task_user(osv.osv):
     }
 
     def init(self, cr):
-       cr.execute(""" create or replace view report_timesheet_task_user as (
+        tools.drop_view_if_exists(cr, 'report_timesheet_task_user')
+        cr.execute(""" create or replace view report_timesheet_task_user as (
         select
          ((r.id*12)+to_number(months.m_id,'99'))::integer as id,
                months.name as name,

From fd748d052ac2520ed2541ddfc289d1dd8ef52071 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 19 Aug 2010 12:48:33 +0530
Subject: [PATCH 03/32] [FIX]: caldav: Exporting recurrent events with timezone

bzr revid: rpa@tinyerp.com-20100819071833-8arpxzpf4aky2v4j
---
 addons/caldav/calendar.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index dafb85f8066..1af1d5566f4 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -391,6 +391,13 @@ class CalDAV(object):
                             ical = tz_obj.export_cal(cr, uid, None, \
                                          data[map_field], ical, context=context)
                             timezones.append(data[map_field])
+                        if vevent.contents.get('recurrence-id'):
+                            # Convert recurrence-id field value accroding to timezone value
+                            recurid_val = vevent.contents.get('recurrence-id')[0].value
+                            rtz_str = self.format_date_tz(recurid_val.strftime('%Y-%m-%d %H:%M:%S'), tzval.title())
+                            rtz_date = datetime.strptime(rtz_str, "%Y-%m-%d %H:%M:%S")
+                            vevent.contents.get('recurrence-id')[0].params['TZID'] = [tzval.title()]
+                            vevent.contents.get('recurrence-id')[0].value = rtz_date
                         if exfield:
                             # Set exdates according to timezone value
                             # This is the case when timezone mapping comes after the exdate mapping

From 0de8216438a63ac8b43de80552ce90040e051810 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 19 Aug 2010 09:57:59 +0200
Subject: [PATCH 04/32] modifs_view

bzr revid: fp@tinyerp.com-20100819075759-5p8l8xtixrqynv3j
---
 addons/account_voucher/voucher.py             | 19 ++++----
 .../voucher_payment_receipt_view.xml          | 41 +++++++++++------
 .../voucher_sales_purchase_view.xml           | 44 ++++++++++---------
 .../account_voucher_payment_view.xml          |  3 +-
 4 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 11829815bb8..4317bd2ccf6 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -189,7 +189,8 @@ class account_voucher(osv.osv):
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
-        'amount':fields.float('Amount', readonly=True),
+        'amount':fields.float('Amount', readonly=True), # don't forget to put right digits, computed field ?
+        'tax_amount':fields.float('Tax Amount'), # don't forget to put right digits
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."),
         'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True),
         'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
@@ -198,12 +199,9 @@ class account_voucher(osv.osv):
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
         'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
         'pay_now':fields.selection([
-            ('pay_now','Pay Now'),
-            ('pay_later','Pay Later'),
+            ('pay_now','Pay Directly'),
+            ('pay_later','Pay Later or Group Funds'),
         ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'pay_journal_id':fields.many2one('account.journal', 'Payment Journal', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','in',['bank','cash'])]),
-        'pay_account_id':fields.many2one('account.account', 'Payment Account', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
-        'pay_amount':fields.float('Payment Amount', readonly=True, states={'draft':[('readonly',False)]}),
         'tax_id':fields.many2one('account.tax', 'Tax', required=False),
     }
     
@@ -213,7 +211,7 @@ class account_voucher(osv.osv):
         'journal_id':_get_journal,
         'currency_id': _get_currency,
         'state': lambda *a: 'draft',
-        'pay_now':lambda *a: 'pay_now',
+        'pay_now':lambda *a: 'pay_later',
         'name': lambda *a: '/',
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
         'reference_type': lambda *a: "none",
@@ -771,7 +769,7 @@ class account_voucher_line(osv.osv):
 
     _columns = {
         'voucher_id':fields.many2one('account.voucher', 'Voucher'),
-        'name':fields.related('voucher_id', 'name', size=256, type='char', string='Memo'),
+        'name':fields.related('voucher_id', 'name', size=256, type='char', string='Description'),
         'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
         'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
         'amount':fields.float('Amount'),
@@ -780,6 +778,11 @@ class account_voucher_line(osv.osv):
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
         'is_tax':fields.boolean('Tax ?', required=False),
         'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'),
+        'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
+        'date_original': fields.date('Date', readonly="1"), #fields.related account.move.line
+        'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
+        'amount_original': fields.float('Originial Amount', readonly="1"), #fields.related account.move.line
+        'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
     }
     _defaults = {
         'type': lambda *a: 'cr'
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b08d46d272b..e2c66b890e2 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -77,36 +77,51 @@
             <field name="arch" type="xml">
                 <form string="Sales Payment">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)" string="Customer"/>
+                        <field name="journal_id"
+                            domain="[('type','in',['bank', 'cash'])]"
+                            widget="selection" select="1"
+                            on_change="onchange_journal(journal_id,type)"
+                            string="Payment Method"/>
+
+                        <field name="amount" readonly="0"/>
+                        <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="4"/>
-                        <field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
-                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
-                        <field name="number"/>
+                        <field name="period_id" invisible="1"/>
+                        <field name="account_id"
+                            domain="[('type','=','other')]"
+                            widget="selection"
+                            on_change="onchange_account(account_id)"
+                            invisible="1"/>
+
                     </group>
                     <notebook colspan="4">
                         <page string="Payment Information">
                             <field name="payment_ids" colspan="4" nolabel="1" height="180">
                                 <tree string="Payment Lines" editable="top">
-                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                                    <field name="amount"/>
+                                    <field name="move_line_id"/>
                                     <field name="account_id"/>
-                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                                    <field name="account_analytic_id"/>
+                                    <field name="date_original"/>
+                                    <field name="date_due"/>
+                                    <field name="amount_original"/>
+                                    <field name="amount_unreconciled" sum="Open Balance"/>
+                                    <field name="amount" sum="Payment"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
-                                <separator string="Narration" colspan="2"/>
+                                <separator string="Internal Notes" colspan="2"/>
                                 <field name="narration" colspan="2" nolabel="1"/>
                             </group>
                             <group col="2" colspan="1">
                                 <separator string="Other Information" colspan="2"/>
-                                <field name="reference" select="1"/>
                                 <field name="date" select="1" on_change="onchange_date(date)"/>
-                                <field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
-                                <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                                <field name="currency_id" select="1"
+                                    attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
+                                <field name="number"/>
+                                <field name="type" on_change="onchange_journal(journal_id,type)" invisible="1"/>
                             </group>
                         </page>
-                        <page string="Journal Items">
+                        <page string="Journal Items" groups="base.group_extended">
                             <group col="6" colspan="4">
                                 <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                                 <field name="period_id"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index eb90f8d97ba..60e8c548ebc 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,22 +8,22 @@
             <field name="arch" type="xml">
                 <form string="Sales Receipt">
                     <group col="6" colspan="4">
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
-                        <field name="name" colspan="4"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, type)" string="Customer"/>
                         <field name="journal_id"  domain="[('type','=','sale')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
-                        <field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
                         <field name="number"/>
+                        <field name="name" colspan="4"/>
+                        <field name="date" select="1" on_change="onchange_date(date)"/>
+                        <field name="type" on_change="onchange_journal(journal_id,type)" invisible="True"/> <!-- Type is given by menu, not by journal ? -->
+                        <field name="period_id" invisible="True"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Information">
                             <field name="payment_ids" colspan="4" nolabel="1" height="180">
                                 <tree string="Sales Lines" editable="top">
-                                    <field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                                    <field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                                    <field name="amount" />
-                                    <field name="account_id"/>
-                                    <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
-                                    <field name="account_analytic_id"/>
+                                    <field name="account_id" widget="selection"/>
+                                    <field name="name"/>
+                                    <field name="amount" sum="Total"/>
+                                    <field name="account_analytic_id" groups="base.group_extended"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -33,22 +33,24 @@
                             <group col="2" colspan="1">
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
-                                    <field name="pay_now"/>
-                                    <field name="pay_journal_id" on_change="onchange_pay_journal(pay_journal_id,type)" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
-                                    <field name="pay_account_id" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
-                                    <field name="pay_amount" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
+                                    <field name="pay_now" required="1"/>
+                                    <field name="account_id" 
+                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                         domain="[('type','in',('other'))]"
+                                         on_change="onchange_account(account_id)"/>
+                                         <!-- should select income accounts only. Or use the journal for this ? -->
+                                    <field name="reference"
+                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
+                                    />
                                 </group>
-                                <group col="2" colspan="1">
-                                    <separator string="Other Information" colspan="2"/>
-                                    <field name="reference" select="1"/>
-                                    <field name="tax_id"/>
-                                    <field name="amount"/>
-                                    <field name="date" select="1" on_change="onchange_date(date)"/>
-                                    <field name="type" on_change="onchange_journal(journal_id,type)"/>
+                                <group col="3" colspan="1">
+                                    <separator string="Total" colspan="3"/>
+                                    <field name="tax_id" widget="selection" domain="[('type_tax_use','=','sale')]"/><field name="tax_amount" nolabel="1"/>
+                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
                         </page>
-                        <page string="Journal Items">
+                        <page string="Journal Items" groups="base.group_extended">
                             <group col="6" colspan="4">
                                 <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                                 <field name="period_id"/>
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
index b634f3534e9..894229f26e7 100755
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@@ -2,6 +2,7 @@
 <openerp>
     <data>
         
+        <!--
         <record id="view_vendor_payment_form_inherit" model="ir.ui.view">
             <field name="name">account.voucher.form.inherit</field>
             <field name="model">account.voucher</field>
@@ -43,7 +44,7 @@
                 </field>
             </field>
         </record>
-
+-->
         <record model="ir.ui.view" id="view_vendor_payment_form_unreconcile">
             <field name="name">account.voucher.form.payment.unreconcile</field>
             <field name="model">account.voucher</field>

From 0f39b96c5fd66195987d2b912845800b3bf6dfc7 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 19 Aug 2010 14:12:06 +0530
Subject: [PATCH 05/32] [MOD] mrp_*, purchase : access rights modification
 according to extended group

bzr revid: vir@tinyerp.com-20100819084206-89vqsw59xg2fq5th
---
 addons/mrp/mrp_view.xml                       | 4 ++--
 addons/mrp/report/mrp_report_view.xml         | 2 +-
 addons/mrp_operations/mrp_operations_view.xml | 2 +-
 addons/purchase/purchase_view.xml             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2ed73ca0023..4504de8a2cf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -422,7 +422,7 @@
         <menuitem
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
-            groups="base.group_extended,mrp.group_mrp_user,mrp.group_mrp_manager,base.group_system"
+            groups="base.group_extended"
             parent="menu_mrp_bom"
             sequence="20"/>
 
@@ -913,7 +913,7 @@
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" groups="mrp.group_mrp_user" sequence="3" />
 
         <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root"
-            groups="base.group_extended,mrp.group_mrp_manager,base.group_system"
+            groups="base.group_extended"
             sequence="4"/>
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
         <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index fc725097f45..5f28f2ce6f4 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -55,7 +55,7 @@
             parent="base.menu_mrp_root" sequence="49"/>
         <menuitem action="action_report_workcenter_load_tree"
             id="menu_report_workcenter_load" parent="next_id_77"
-            groups="base.group_extended,mrp.group_mrp_manager,base.group_system"/>
+            groups="base.group_extended"/>
 
         <!-- stock.move compared to internal location src/dest -->
 
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index a576566602a..285f5ff43da 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -3,7 +3,7 @@
 <data>
     <menuitem id="menu_mrp_planning" name="Planning"
         parent="base.menu_mrp_root" sequence="2"
-        groups="base.group_extended,mrp.group_mrp_manager,mrp.group_mrp_user"/>
+        groups="base.group_extended"/>
         
     <record id="mrp_production_form_inherit_view" model="ir.ui.view">
 	    <field name="name">mrp.production.form.inherit</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a294dafeea1..8c5eed3b720 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -397,7 +397,7 @@
         <menuitem
             action="purchase_line_form_action2"
             id="menu_purchase_line_order_draft"
-            groups="base.group_extended,group_purchase_user,group_purchase_manager"
+            groups="base.group_extended"
             parent="menu_procurement_management_invoice"
             sequence="12"/>
 

From 18b72544a52763df9a19de747bdac94a27fbda2a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 19 Aug 2010 10:49:01 +0200
Subject: [PATCH 06/32] [IMP] email_template: removed unused
 email_template.engines references

bzr revid: odo@openerp.com-20100819084901-ye13mfcin79rswp0
---
 .../email_template/email_template_engines.py  | 94 -------------------
 .../security/ir.model.access.csv              |  1 -
 2 files changed, 95 deletions(-)
 delete mode 100644 addons/email_template/email_template_engines.py

diff --git a/addons/email_template/email_template_engines.py b/addons/email_template/email_template_engines.py
deleted file mode 100644
index 5ac60b02014..00000000000
--- a/addons/email_template/email_template_engines.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009 Sharoon Thomas
-#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv
-import re
-
-class email_template_engines(osv.osv):
-    _name = "email_template.engines"
-    _description = "Email Template Engine"
-
-    def check(self):
-        pass
-        
-    def strip_html(self,text):
-        #Removes HTML, Have to check if still relevant
-        if text:
-            def fixup(m):
-                text = m.group(0)
-                if text[:1] == "<":
-                    return "" # ignore tags
-                if text[:2] == "&#":
-                    try:
-                        if text[:3] == "&#x":
-                            return unichr(int(text[3:-1], 16))
-                        else:
-                            return unichr(int(text[2:-1]))
-                    except ValueError:
-                        pass
-                elif text[:1] == "&":
-                    import htmlentitydefs
-                    entity = htmlentitydefs.entitydefs.get(text[1:-1])
-                    if entity:
-                        if entity[:2] == "&#":
-                            try:
-                                return unichr(int(entity[2:-1]))
-                            except ValueError:
-                                pass
-                        else:
-                            return unicode(entity, "iso-8859-1")
-                return text # leave as is
-            return re.sub("(?s)<[^>]*>|&#?\w+;", fixup, text)
-
-    def parsevalue(self,cr,uid,id,message,templateid,context):
-        #id: ID of the template's model's record to be used
-        #message: the complete text including placeholders
-        #templateid: the template id of the template
-        #context: TODO
-        if message:
-            def merge(match):
-                template = self.pool.get("email.template").browse(cr,uid,templateid,context)
-                obj_pool = self.pool.get(template.object_name.model)
-                obj = obj_pool.browse(cr, uid, id, context)
-                exp = str(match.group()[2:-2]).strip()
-                exp_spl = exp.split('/')
-                try:
-                    result = eval(exp_spl[0], {'object':obj,})
-                except:
-                    result = "Rendering Error"
-                try:
-                    if result in (None, False):
-                        if len(exp_spl)>1:
-                            return exp_spl[1]
-                        else:
-                            return 'Not Available'
-                    return str(result)
-                except:
-                    return "Rendering Error"
-            if message:
-                com = re.compile('(\[\[.+?\]\])')
-                retmessage = com.sub(merge, message)
-            else:
-                retmessage=""
-            return retmessage
-
-email_template_engines()
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index ef5297f52bc..fd5cf2d0f09 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template_engines","email_template.engines","model_email_template_engines","base.res_groups_email_template_admin",1,1,1,1
 "access_email_template_account","email_template.account","model_email_template_account","base.res_groups_email_template_admin",1,0,0,0
 "access_email_template","email.template","model_email_template","base.res_groups_email_template_admin",1,0,0,0
 "access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","base.res_groups_email_template_admin",1,1,1,1

From 09ab96e9e9acfeeba29a39061924175d392fc475 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 19 Aug 2010 14:23:23 +0530
Subject: [PATCH 07/32] [FIX] Account: bank statement payment amount function
 field now updated on statement lines

bzr revid: mra@mra-laptop-20100819085323-uafma4hujnjg0tw8
---
 addons/account/account_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bb0e96a8380..00aa49ec760 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -496,6 +496,7 @@
                         <field name="period_id"/>
                         <field name="balance_start"/>
                         <field name="balance_end_real"/>
+                        <field name="currency" invisible="1"/>
                         <button name="%(action_view_account_statement_from_invoice_lines)d"
                             string="Import Invoices" type="action" icon="gtk-dnd"
                             attrs="{'invisible':[('state','=','confirm')]}"/>
@@ -2464,6 +2465,7 @@
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" />
                         <field name="user_id" select="1" readonly="1"/>
                         <field name="period_id" select="1"/>
+                        <field name="currency" invisible="1"/>
                     </group>
 
                     <notebook colspan="4">

From f82c4e2b76aa4279c9aeafb9a7e7915cf90460c9 Mon Sep 17 00:00:00 2001
From: "AMP (Open ERP)" <>
Date: Thu, 19 Aug 2010 14:48:59 +0530
Subject: [PATCH 08/32] [MOD] account,hr,event,marketing,email_template :
 access rights modification according to extended group

bzr revid: vir@tinyerp.com-20100819091859-96c0ptjaaguuumpx
---
 addons/account/security/ir.model.access.csv           | 1 -
 addons/email_template/email_template_account_view.xml | 4 ++--
 addons/event/event_view.xml                           | 4 ++--
 addons/hr/hr_view.xml                                 | 2 +-
 addons/marketing/security/ir.model.access.csv         | 1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 3b9e6c31e72..3a513aa3a86 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -199,4 +199,3 @@
 "access_account_analytic_line_accounting_accountant","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0
 "access_account_analytic_journal_accounting_accountant","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0
 "access_account_bank_statement_reconcile_accounting_accountant","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1
-"access_account_move_journal_manager","account.move.journal.manager","model_account_move_journal","account.group_account_manager",1,0,0,0
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index d164645aca7..544ad016136 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -97,8 +97,8 @@
         </record>
 
         <menuitem name="Configuration" parent="base.marketing_menu"
-         id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
-        <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_lunch_survey_root" />
+         id="base.menu_marketing_config_root" sequence="20" groups="base.group_system"/>
+        <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_marketing_config_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4c57157ff71..233f3a0e005 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -35,8 +35,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="base.menu_event_config" parent="base.marketing_menu" sequence="30" groups="base.group_extended,base.group_system"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_event_config" groups="base.group_extended,base.group_sale_manager,base.group_system"/>
+        <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_extended"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 9fa8c5640f0..ccee445c1f8 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -308,7 +308,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" groups="base.group_extended,base.group_system"
+        <menuitem action="open_view_categ_tree" groups="base.group_extended"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
diff --git a/addons/marketing/security/ir.model.access.csv b/addons/marketing/security/ir.model.access.csv
index 599d1a27b44..0343f29f43a 100644
--- a/addons/marketing/security/ir.model.access.csv
+++ b/addons/marketing/security/ir.model.access.csv
@@ -1,2 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_config_installer","access_marketing_installer","base.model_res_config_installer","base.group_system",1,1,1,1

From 4359aaefcdb807ccafa0133705b8777e68fa4809 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 19 Aug 2010 14:55:59 +0530
Subject: [PATCH 09/32] [FIX]: fix aproblem for the filling one2many field on
 change partner in voucher

bzr revid: mga@tinyerp.com-20100819092559-vqa8unnd0aj02fgc
---
 addons/account_voucher/voucher.py | 56 ++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 11829815bb8..af498aaf8a9 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -220,6 +220,53 @@ class account_voucher(osv.osv):
         'audit': lambda *a: False,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
     }
+
+    def create(self, cr, uid, vals, context={}):
+        """
+        Create a new record for a model account_voucher
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param vals: provides data for new record
+        @param context: context arguments, like lang, time zone
+        
+        @return: Returns an id of the new record
+        """
+
+        old_line = []
+        new_lines = []
+        
+        payment_ids = vals.get('payment_ids')
+        vals.update({
+            'payment_ids':False
+        })
+        for line in payment_ids:
+            id1 = line[0]
+            id2 = line[1]
+            res = line[2]
+            if id1 == 0 and id2 == 0:
+                new_lines += [(id1, id2, res)]
+            else:
+                old_line += [(id1, id2, res)]
+
+        if new_lines:
+            vals.update({
+                'payment_ids':new_lines
+            })
+        res_id = super(account_voucher, self).create(cr, uid, vals, context)
+        
+        if old_line:
+            new_payment_ids = []
+            for line in old_line:
+                id1 = line[0]
+                id2 = line[1]
+                res = line[2]
+                res.update({
+                    'voucher_id':res_id
+                })
+                new_payment_ids += [(id1, id2, res)]
+                
+            self.write(cr, uid, [res_id], {'payment_ids':new_payment_ids})
+        return res_id
     
     def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, context={}):
         """
@@ -257,14 +304,7 @@ class account_voucher(osv.osv):
         if ttype not in ('payment', 'receipt'):
             return default
         
-        if not ids:
-            raise osv.except_osv(_('Invalid !'), _('Please save voucher before selection partner !'))
-        
-        line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
-        if line_ids:
-            line_pool.unlink(cr, uid, line_ids)
-        
-        voucher_id = ids[0]
+        voucher_id = ids and ids[0] or False
         ids = move_pool.search(cr, uid, [('reconcile_id','=', False), ('state','=','posted'), ('partner_id','=',partner_id)], context=context)
         for move in move_pool.browse(cr, uid, ids):
             rs = {

From 04e5144b2d2b8dd7f475b5393d53092e3004d5b2 Mon Sep 17 00:00:00 2001
From: "PSI(OpenERP)" <>
Date: Thu, 19 Aug 2010 15:08:02 +0530
Subject: [PATCH 10/32] [IMP] HR modules: Usebility, on employee add contract
 field (latest)

bzr revid: mra@mra-laptop-20100819093802-9z5a0t6rn4f17i5j
---
 addons/hr/hr_view.xml                         | 24 ++++++++++++------
 addons/hr_attendance/__openerp__.py           |  1 -
 addons/hr_attendance/hr_attendance_wizard.xml | 21 ----------------
 addons/hr_contract/hr_contract.py             | 16 +++++++++++-
 addons/hr_contract/hr_contract_view.xml       | 25 ++++++++++++++++---
 addons/hr_evaluation/hr_evaluation_view.xml   | 11 ++++----
 addons/hr_payroll/hr_payroll.py               |  7 +++---
 addons/hr_payroll/hr_payroll_view.xml         | 21 +++++++++-------
 addons/hr_recruitment/hr_recruitment_view.xml | 16 ++++++------
 addons/hr_timesheet/hr_timesheet.py           |  9 ++++++-
 addons/hr_timesheet/hr_timesheet_view.xml     | 10 +++++---
 .../hr_timesheet_invoice.py                   |  4 +--
 12 files changed, 98 insertions(+), 67 deletions(-)
 delete mode 100644 addons/hr_attendance/hr_attendance_wizard.xml

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ccee445c1f8..d8ce599c071 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -99,6 +99,7 @@
             <field name="arch" type="xml">
                 <search string="Employees">
                     <filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
+                    <separator orientation="vertical" />
                     <field name="name"/>
                     <field name="department_id" widget="selection">
                     <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" help="My Departments Employee"/>
@@ -154,7 +155,7 @@
         =======================
         -->
 
-		<record id="hr_hr_employee_marital_status_tree" model="ir.ui.view">
+    <record id="hr_hr_employee_marital_status_tree" model="ir.ui.view">
             <field name="name">hr.hr.employee.marital.status.tree</field>
             <field name="model">hr.employee.marital.status</field>
             <field name="type">tree</field>
@@ -338,9 +339,9 @@
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
-	                    <field name="state"/>
-	                    <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-		            <button name="job_open" string="Open" states="old,recruit" type="object" icon="terp-camera_test"/>
+                      <field name="state"/>
+                      <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
+                <button name="job_open" string="Open" states="old,recruit" type="object" icon="terp-camera_test"/>
                             <button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
@@ -369,16 +370,21 @@
             <field name="arch" type="xml">
                 <search string="Jobs">
                     <filter icon="terp-check" domain="[('state','in',('open','recruit'))]" string="Current"
-                        help="Open and in recruitment positions"/>
-                    <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="Recruitment"
-                        help="In Recruitment"/>
+                        name="Current" help="Open and in recruitment positions"/>
                     <filter icon="terp-camera_test" domain="[('state','=','open')]" string="Open"
                         help="Open Positions"/>
                     <separator orientation="vertical"/>
+                    <filter icon="terp-personal+"  domain="[('state','=','recruit')]" string="Recruitment"
+                        help="In Recruitment"/>
+                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="department_id" widget="selection">
-                    	<filter icon="terp-gtk-select-all" domain="[('department_id', '=', context.get('department_id', False))]" help="My Departments Jobs"/>
+                      <filter icon="terp-personal+" domain="[('department_id', '=', context.get('department_id', False))]" help="My Departments Jobs"/>
                     </field>
+                    <newline />
+                    <group expand="0" string="Group By...">
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                    </group>
                 </search>
              </field>
          </record>
@@ -388,6 +394,8 @@
             <field name="res_model">hr.job</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_job_filter"/>
+            <field name="context">{'search_default_Current':1}</field>
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_manager,base.group_system"/>
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 68eb3c20258..5a79566bcde 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -35,7 +35,6 @@
         'security/hr_security.xml',
         'security/ir.model.access.csv',
         'hr_attendance_view.xml',
-        'hr_attendance_wizard.xml',
         'hr_attendance_report.xml',
         'security/ir.model.access.csv',
         'wizard/hr_attendance_bymonth_view.xml',
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
deleted file mode 100644
index 3fc43bce7c5..00000000000
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
- 		<!--<wizard multi="1" menu="False" id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>-->
-		<!--<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.attendance.report" string="Print Attendance Error Report"/>
-
-		<wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_week" string="Print Timesheet by week"/>-->
-		<!--<wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_month" string="Print Timesheet by month"/>-->
-
-
-      <!--  <menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
-            groups="group_hr_attendance"/>-->
-        <!--Time Tracking menu for Project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-         <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-             parent="base.menu_main_pm" sequence="3"/>
-        <!--<menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="base.menu_project_management_time_tracking" type="wizard" sequence="9"/>
--->
-    </data>
-</openerp>
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index edc6ee4dc74..1d2962a0702 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -26,6 +26,18 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
     _inherit = "hr.employee"
+
+    def _get_latest_contract(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        obj_contract = self.pool.get('hr.contract')
+        for emp in self.browse(cr, uid, ids, context=context):
+            contract_ids = obj_contract.search(cr, uid, [('employee_id','=',emp.id),], order='date_start', context=context)
+            if contract_ids:
+                res[emp.id] = contract_ids[-1:][0]
+            else:
+                res[emp.id] = False
+        return res
+
     _columns = {
         'manager': fields.boolean('Is a Manager'),
         'medic_exam': fields.date('Medical Examination Date'),
@@ -34,7 +46,9 @@ class hr_employee(osv.osv):
         'vehicle': fields.char('Company Vehicle', size=64),
         'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
-        }
+        'contract_id':fields.function(_get_latest_contract, method=True, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
+    }
+
 hr_employee()
 
 #Contract wage type period name
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index d32f9301b36..c049d92a783 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -101,8 +101,8 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Miscelleanous">
+                <page string="Notes" position="before">
+                    <page string="Miscellaneous">
                         <group colspan="2" col="2">
                         <separator string="Personal Info" colspan="2"/>
                         <field name="bank_account"/>
@@ -120,7 +120,22 @@
                         <field name="medic_exam" />
                         </group>
                     </page>
-                </notebook>
+                    <page string="Contracts">
+                        <field colspan="4" name="contract_ids" nolabel="1"/>
+                    </page>
+                </page>
+            </field>
+        </record>
+
+        <record id="hr_employee_view_form3" model="ir.ui.view">
+            <field name="name">hr.employee.view.form3</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="arch" type="xml">
+                <field name="department_id" position="after">
+                    <field name="contract_id"/>
+                </field>
             </field>
         </record>
 
@@ -133,12 +148,14 @@
                    <group col='15' colspan='4'>
                    <field name="name"/>
                    <field name="employee_id"/>
+                   <field name="working_hours"/>
                    <field name="date_start"/>
                    <field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
                     <filter string="Wage Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'wage_type_id'}"/>
+                    <filter string="Working Schedule" icon="terp-personal+" domain="[]" context="{'group_by':'working_hours'}"/>
                    </group>
                </search>
             </field>
@@ -159,7 +176,7 @@
                     <field name="type_id" widget="selection"/>
                     </group>
                     <notebook>
-                    <page string="Main Data">
+                    <page string="Information">
                         <group col="2" colspan="2">
                         <separator colspan="2" string="Duration"/>
                         <field name="date_start" />
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 1ce31942e45..440b1eff322 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    	<record id="view_hr_evaluation_plan_search" model="ir.ui.view">
+      <record id="view_hr_evaluation_plan_search" model="ir.ui.view">
             <field name="name">hr_evaluation.plan.search</field>
             <field name="model">hr_evaluation.plan</field>
             <field name="type">search</field>
@@ -140,12 +140,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
+                <page string="Notes" position="before">
                     <page string="Evaluation">
                         <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
                         <field name="evaluation_date"/>
                     </page>
-                </notebook>
+                </page>
             </field>
         </record>
 
@@ -332,7 +332,8 @@
                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Survey" icon="terp-personal" domain="[]" context="{'group_by':'survey_id'}"/>
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
@@ -349,7 +350,7 @@
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
-        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests" 
+        <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
         <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
            action="action_hr_evaluation_send_mail" sequence="45"/>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index ba011442294..0e5513ba226 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -891,7 +891,6 @@ class hr_payslip(osv.osv):
         contract = cr.dictfetchone()
 
         contract = contract and contract or {}
-
         return contract
 
     def _get_leaves(self, cr, user, slip, employee, context=None):
@@ -1322,10 +1321,10 @@ class hr_employee(osv.osv):
 
     _columns = {
         'pan_no':fields.char('PAN No', size=64, required=False, readonly=False),
-        'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False),
-        'pf_account':fields.char('PF Account', size=64, required=False, readonly=False),
+        'esp_account':fields.char('EPS Account', size=64, required=False, readonly=False, help="EPS Account"),
+        'pf_account':fields.char('PF Account', size=64, required=False, readonly=False, help="Providend Fund Account"),
         'pg_joining': fields.date('PF Join Date'),
-        'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False),
+        'esi_account':fields.char('ESI Account', size=64, required=False, readonly=False, help="ESI Account"),
         'hospital_id':fields.many2one('res.partner.address', 'ESI Hospital', required=False),
         'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
         'otherid':fields.char('Other Id', size=64, required=False),
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 11923176333..807e83d9114 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -98,7 +98,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
+                <page string="Notes" position="before">
                     <page string="Contracts">
                         <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
                             <tree string="Contracts">
@@ -110,7 +110,7 @@
                                 <field name="wage_type_id"/>
                                 <field name="wage"/>
                             </tree>
-                            <form string="Contract">
+                            <form string="Contracts">
                                 <group colspan="4" col="6">
                                     <field name="name" select="1"/>
                                     <field name="job_id"/>
@@ -153,7 +153,7 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Miscelleanous">
+                    <page string="Miscellaneous">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
                             <field name="pan_no" select="1"/>
@@ -167,7 +167,6 @@
                             <field name="manager" select="1"/>
                             <field name="vehicle" select="1"/>
                             <field name="vehicle_distance" select="1"/>
-                            <field name="medic_exam" select="1"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="2" string="ESI Information"/>
@@ -201,10 +200,10 @@
                         <field name="property_bank_account"/>
                         <field name="salary_account"/>
                         <field name="employee_account"/>
-                        <field name="analytic_account"/>
+                        <field name="analytic_account" groups="base.group_extended"/>
                         <field name="slip_ids" colspan="4" nolabel="1"/>
                     </page>
-                </notebook>
+                </page>
             </field>
         </record>
 
@@ -523,7 +522,8 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Slip"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-account" string="Paid" domain="[('state','=','done'),('paid','=',True)]" help="Paid Slip"/>
+                        <filter icon="terp-dolar_ok!" string="Paid" domain="[('state','=','done'),('paid','=',True)]" help="Paid Slip"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="employee_id"/>
                         <field name="number"/>
@@ -531,9 +531,12 @@
                     </group>
                     <newline/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
+                        <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Register" icon="terp-folder-yellow" name="register_id" context="{'group_by':'register_id'}"/>
-                        <filter string="Employees" icon="terp-partner" name="employee_id" context="{'group_by':'employee_id'}"/>
-                        <filter string="Companies" name="company_id" icon="terp-go-month" context="{'group_by':'company_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Companies" name="company_id"  icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     </group>
                 </search>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 1a38b8d5a5b..04ef6dc162c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -143,9 +143,6 @@
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
                         </group>
                    </page>
-                   <page string="Notes">
-                       <field name="description" nolabel="1" colspan="4"/>
-                   </page>
 <!--                <page string="History" groups="base.group_extended">
                        <field name="id"/>
                        <field name="active"/>
@@ -200,6 +197,9 @@
                            name="%(crm.crm_lead_forward_to_partner_act)d"
                            icon="terp-mail-forward" type="action" />
                  </page>
+                 <page string="Notes">
+                     <field name="description" nolabel="1" colspan="4"/>
+                 </page>
                 </notebook>
             </form>
         </field>
@@ -244,7 +244,7 @@
                    help="Pending Jobs"
                />
                <separator orientation="vertical"/>
-               <filter icon="terp-check" string="Next Actions"
+               <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
                     context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[]"
                     help="View Next Action and Date"/>
@@ -262,18 +262,18 @@
                </field>
                <newline/>
                 <group expand="0" string="Group By..." colspan="11" col="20">
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
                     <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
+                    <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'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
                 </group>
            </search>
         </field>
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index e1abfe275bd..ff865d99d9f 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -60,11 +60,18 @@ class hr_analytic_timesheet(osv.osv):
     def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context=None):
         if context is None:
             context = {}
-        res = {}
+        res = {'value':{}}
         if prod_id and unit_amount:
             # find company
             company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
             res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context=context)
+        # update unit of measurement
+        if prod_id:
+            uom = self.pool.get('product.product').browse(cr, uid, prod_id, context=context)
+            if uom.uom_id:
+                res['value'].update({'product_uom_id': uom.uom_id.id})
+        else:
+            res['value'].update({'product_uom_id': False})
         return res
 
     def _getEmployeeProduct(self, cr, uid, context=None):
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index fbdb94b092f..97e6c4ed1ae 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-
     <data>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
+        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
+                  parent="base.menu_main_pm" sequence="3"/>
+
+
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
@@ -96,12 +100,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
+                <page string="Notes" position="before">
                     <page string="Timesheets">
                         <field name="product_id" domain="[('type','=','service')]"/>
                         <field name="journal_id"/>
                     </page>
-                </notebook>
+                </page>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 730adebe049..cc6137313b1 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -28,8 +28,8 @@ class hr_timesheet_invoice_factor(osv.osv):
     _description = "Invoice Rate"
     _columns = {
         'name': fields.char('Internal name', size=128, required=True),
-        'customer_name': fields.char('Name', size=128),
-        'factor': fields.float('Discount (%)', required=True),
+        'customer_name': fields.char('Name', size=128, help="Name of the customer"),
+        'factor': fields.float('Discount (%)', required=True, help="Discount in percentage"),
     }
     _defaults = {
         'factor': lambda *a: 0.0,

From 49487138556639c66c2e687093392999435548ea Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 19 Aug 2010 15:15:46 +0530
Subject: [PATCH 11/32] [IMP][ADD] hr_expense: assigned analytic journal to
 passed journal in invoice and changed the created 'draft' state invoice into
 'open',some minor improvement in code.

bzr revid: vra@tinyerp.com-20100819094546-qzin2dh7zyt4ef6s
---
 addons/hr_expense/hr_expense.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 98eb7b9dc52..48ace8ab5b9 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -21,6 +21,7 @@
 
 import time
 
+import netsvc
 from osv import fields, osv
 from tools.translate import _
 
@@ -89,8 +90,8 @@ class hr_expense_expense(osv.osv):
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
     _defaults = {
-        'date' : lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a: 'draft',
+        'date' : time.strftime('%Y-%m-%d'),
+        'state': 'draft',
         'employee_id' : _employee_get,
         'user_id' : lambda cr, uid, id, c={}: id,
         'currency_id': _get_currency,
@@ -125,6 +126,8 @@ class hr_expense_expense(osv.osv):
         invoice_obj = self.pool.get('account.invoice')
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
+        account_journal = self.pool.get('account.journal')
         for exp in self.browse(cr, uid, ids):
             lines = []
             for l in exp.line_ids:
@@ -171,10 +174,24 @@ class hr_expense_expense(osv.osv):
                 to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
                 if to_update:
                     inv.update(to_update['value'])
+            journal = False
             if exp.journal_id:
                 inv['journal_id']=exp.journal_id.id
+                journal = exp.journal_id
+            else:
+                journal_id = invoice_obj._get_journal(cr, uid, context={'type': 'in_invoice'})
+                if journal_id:
+                    inv['journal_id'] = journal_id
+                    journal = account_journal.browse(cr, uid, journal_id)
+            if journal and not journal.analytic_journal_id:
+                analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')])
+                if analytic_journal_ids:
+                    account_journal.write(cr, uid, [journal.id],{'analytic_journal_id':analytic_journal_ids[0]})
             inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'})
             invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
+            
             self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
             res = inv_id
         return res

From 30be33b565714c06cc201942f82d45b70f7c7246 Mon Sep 17 00:00:00 2001
From: "AMP (Open ERP)" <>
Date: Thu, 19 Aug 2010 15:31:01 +0530
Subject: [PATCH 12/32] [MOD] product,project_long_term : access rights
 modification according to extended group

bzr revid: vir@tinyerp.com-20100819100101-l1djjzmm8iv0epsg
---
 addons/product/pricelist_view.xml                   | 4 ++--
 addons/product/product_view.xml                     | 8 ++++----
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index c7b9a645554..4d049d44843 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -3,8 +3,8 @@
     <data>
 
         <menuitem id="base.menu_sale_config_sales" name="Sales"
-            parent="base.menu_base_config" sequence="0" groups="base.group_system,base.group_extended"/>
-        <menuitem groups="base.group_extended,base.group_system" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_sale_config_sales" sequence="50"/>
+            parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
+        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="base.menu_sale_config_sales" sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 041a4c985ae..499187c7cf6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem groups="base.group_extended,base.group_system" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="9"/>
+        <menuitem groups="base.group_extended" id="prod_config_main" name="Product" parent="base.menu_base_config" sequence="9"/>
 
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
@@ -197,7 +197,7 @@
         </record>
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,group_product_manager"/>
 
-        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager"/>
+        <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman,base.group_system"/>
         <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,group_product_manager"/>
 
         <record id="product_normal_action_puchased" model="ir.actions.act_window">
@@ -267,7 +267,7 @@
             <field name="view_id" ref="product_category_list_view"/>
         </record>
         <menuitem action="product_category_action_form"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
             id="menu_product_category_action_form"
             parent="prod_config_main" sequence="2"/>
 
@@ -400,7 +400,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem
-            action="product_ul_form_action" groups="base.group_extended,base.group_system" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
+            action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 989465b8a29..671ca0f5c62 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -313,14 +313,14 @@
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase"
-            groups="base.group_extended,project.group_project_user,project.group_project_manager,base.group_system"
+            groups="base.group_extended"
             id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended,base.group_system"
+            groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>

From c5d41a033c771d541bb8180ab97ee58fb5b17bb5 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 19 Aug 2010 15:56:39 +0530
Subject: [PATCH 13/32] [FIX] account_analytic_analysis: Problem in domain get
 method on rule on report

bzr revid: mra@mra-laptop-20100819102639-enqr0o9r7h9yrpby
---
 .../account_analytic_analysis.py              | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a7fee587057..1ee0e1c7a3e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -41,7 +41,7 @@ class account_analytic_account(osv.osv):
                     group by account_analytic_line.account_id" ,(parent_ids,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-                
+
         return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
 
     def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
@@ -154,7 +154,7 @@ class account_analytic_account(osv.osv):
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
         return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
- 
+
     # TODO Take care of pricelist and purchase !
     def _ca_theorical_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
@@ -185,7 +185,7 @@ class account_analytic_account(osv.osv):
                 GROUP BY account_analytic_line.account_id""",(parent_ids,))
             for account_id, sum in cr.fetchall():
                 res2[account_id] = round(sum,2)
-                
+
         for obj_id in ids:
             res.setdefault(obj_id, 0.0)
             res2.setdefault(obj_id, 0.0)
@@ -194,7 +194,7 @@ class account_analytic_account(osv.osv):
                 if child_id != obj_id:
                     res[obj_id] += res.get(child_id, 0.0)
                     res[obj_id] += res2.get(child_id, 0.0)
-        
+
         # sum both result on account_id
         for id in ids:
             res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
@@ -384,7 +384,7 @@ class account_analytic_account(osv.osv):
         'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
     }
-    
+
 account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
@@ -401,12 +401,12 @@ class account_analytic_account_summary_user(osv.osv):
         max_user = cr.fetchone()[0]
         account_ids = [int(str(x/max_user - (x%max_user == 0 and 1 or 0))) for x in ids]
         user_ids = [int(str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user))) for x in ids]
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
+        parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
         if parent_ids:
             cr.execute('SELECT id, unit_amount ' \
                     'FROM account_analytic_analysis_summary_user ' \
                     'WHERE account_id IN %s ' \
-                        'AND "user" IN %s',(parent_ids, user_ids,))
+                        'AND "user" IN %s',(parent_ids, tuple(user_ids),))
             for sum_id, unit_amount in cr.fetchall():
                 res[sum_id] = unit_amount
         for obj_id in ids:
@@ -425,7 +425,7 @@ class account_analytic_account_summary_user(osv.osv):
             string='Total Time'),
         'user' : fields.many2one('res.users', 'User'),
     }
-    
+
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
         cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
@@ -472,7 +472,7 @@ class account_analytic_account_summary_user(osv.osv):
             fields = self._columns.keys()
 
         # construct a clause for the rules :
-        d1, d2 = self.pool.get('ir.rule').domain_get(cr, user, self._name)
+        d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
@@ -567,12 +567,12 @@ class account_analytic_account_summary_month(osv.osv):
         account_obj = self.pool.get('account.analytic.account')
         account_ids = [int(str(int(x))[:-6]) for x in ids]
         month_ids = [int(str(int(x))[-6:]) for x in ids]
-        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
+        parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
         if parent_ids:
             cr.execute('SELECT id, unit_amount ' \
                     'FROM account_analytic_analysis_summary_month ' \
                     'WHERE account_id IN %s ' \
-                        'AND month_id IN %s ',(parent_ids, month_ids,))
+                        'AND month_id IN %s ',(parent_ids, tuple(month_ids),))
             for sum_id, unit_amount in cr.fetchall():
                 res[sum_id] = unit_amount
         for obj_id in ids:
@@ -650,7 +650,7 @@ class account_analytic_account_summary_month(osv.osv):
             fields = self._columns.keys()
 
         # construct a clause for the rules :
-        d1, d2 = self.pool.get('ir.rule').domain_get(cr, user, self._name)
+        d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name)
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
@@ -684,7 +684,7 @@ class account_analytic_account_summary_month(osv.osv):
                 res.extend(cr.dictfetchall())
         else:
             res = map(lambda x: {'id': x}, ids)
-            
+
         res_trans_obj = self.pool.get('ir.translation')
         for f in fields_pre:
             if self._columns[f].translate:

From 22268fa1cb3cec87318d61d3179389840a240f7c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 19 Aug 2010 16:09:33 +0530
Subject: [PATCH 14/32] [REF]: caldav: Minimized code to formate date according
 to vtimezone value

bzr revid: rpa@tinyerp.com-20100819103933-zg0hq21710vgt4vz
---
 addons/caldav/calendar.py | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 1af1d5566f4..f48e9f3b691 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -274,9 +274,15 @@ class CalDAV(object):
                 self.__attribute__[name][type] = None
         return True
 
-    def format_date_tz(self, date, tz=None):
+    def format_date_tz(self, src_date, tz=None):
+        """ This function converts date into specifice timezone value
+        @param src_date: Date to be converted (datetime.datetime)
+        @return: Converted datetime.datetime object for the date
+        """
         format = tools.DEFAULT_SERVER_DATETIME_FORMAT
-        return tools.server_to_local_timestamp(date, format, format, tz)
+        date_str = src_date.strftime('%Y-%m-%d %H:%M:%S')
+        res_date = tools.server_to_local_timestamp(date_str, format, format, tz)
+        return datetime.strptime(res_date, "%Y-%m-%d %H:%M:%S")
 
     def parse_ics(self, cr, uid, child, cal_children=None, context=None):
         """ parse calendaring and scheduling information
@@ -394,10 +400,8 @@ class CalDAV(object):
                         if vevent.contents.get('recurrence-id'):
                             # Convert recurrence-id field value accroding to timezone value
                             recurid_val = vevent.contents.get('recurrence-id')[0].value
-                            rtz_str = self.format_date_tz(recurid_val.strftime('%Y-%m-%d %H:%M:%S'), tzval.title())
-                            rtz_date = datetime.strptime(rtz_str, "%Y-%m-%d %H:%M:%S")
                             vevent.contents.get('recurrence-id')[0].params['TZID'] = [tzval.title()]
-                            vevent.contents.get('recurrence-id')[0].value = rtz_date
+                            vevent.contents.get('recurrence-id')[0].value =  self.format_date_tz(recurid_val, tzval.title())
                         if exfield:
                             # Set exdates according to timezone value
                             # This is the case when timezone mapping comes after the exdate mapping
@@ -405,11 +409,8 @@ class CalDAV(object):
                             exfield.params['TZID'] = [tzval.title()]
                             exdates_updated = []
                             for exdate in exdates:
-                                date1 = (datetime.strptime(exdate, "%Y%m%dT%H%M%S")).strftime('%Y-%m-%d %H:%M:%S')
-                                dest_date = self.format_date_tz(date1, tzval.title())
-                                ex_date = (datetime.strptime(dest_date, "%Y-%m-%d %H:%M:%S")).strftime('%Y%m%dT%H%M%S')
-                                exdates_updated.append(ex_date)
-                            exfield.value = map(parser.parse, exdates_updated)
+                                exdates_updated.append(self.format_date_tz(parser.parse(exdate), tzval.title()))
+                            exfield.value = exdates_updated
                     elif field == 'organizer' and data[map_field]:
                         organizer = str2mailto(data[map_field])
                         event_org = vevent.add('organizer')
@@ -428,21 +429,16 @@ class CalDAV(object):
                                     exfield.params['TZID'] = [tzval.title()]
                                     exdates_updated = []
                                     for exdate in exdates:
-                                        date1 = (datetime.strptime(exdate, "%Y%m%dT%H%M%S")).strftime('%Y-%m-%d %H:%M:%S')
-                                        dest_date = self.format_date_tz(date1, tzval.title())
-                                        ex_date = (datetime.strptime(dest_date, "%Y-%m-%d %H:%M:%S")).strftime('%Y%m%dT%H%M%S')
-                                        exdates_updated.append(ex_date)
-                                    exdates = exdates_updated
-                                exfield.value = map(parser.parse, exdates)
+                                        exdates_updated.append(self.format_date_tz(parser.parse(exdate), tzval.title()))
+                                    exfield.value = exdates_updated
                             else:
                                 vevent.add(field).value = tools.ustr(data[map_field])
                         elif map_type in ('datetime', 'date') and data[map_field]:
                             dtfield = vevent.add(field)
                             if tzval:
                                 # Export the date according to the event timezone value
-                                dest_date = self.format_date_tz(data[map_field], tzval.title())
                                 dtfield.params['TZID'] = [tzval.title()]
-                                dtfield.value = parser.parse(dest_date)
+                                dtfield.value = self.format_date_tz(parser.parse(data[map_field]), tzval.title())
                             else:
                                 dtfield.value = parser.parse(data[map_field])
                         elif map_type == "timedelta":

From 5d0b974a97309fb01604784490909f3b6fdc2443 Mon Sep 17 00:00:00 2001
From: "MTR(OpenERP)" <>
Date: Thu, 19 Aug 2010 16:47:49 +0530
Subject: [PATCH 15/32] [FIX] hr_evaluation: YAML

bzr revid: mra@mra-laptop-20100819111749-e2ir0jrsb6h9wo7d
---
 addons/hr_evaluation/test/test_hr_evaluation.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
index cdee65dde26..1d2acbcbd49 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -106,6 +106,13 @@
     plan_id: 'hr_evaluation_plan_managersplan0'
     progress: 0.0
     state: draft
+-
+  I create an Interview Request record
+- 
+  !record {model: hr.evaluation.interview, id: hr_evaluation_interview_0}:
+    date_deadline: '2010-06-28'
+    evaluation_id: 'hr_evaluation_evaluation_0'
+    survey_id:  hr_evaluation.survey_0
 -
   I check that evaluation is in "Draft" state.
 -
@@ -121,7 +128,7 @@
   I close this servey request by giving answer of survey question.
 -
   !python {model: hr.evaluation.interview}: |
-      self.survey_req_done(cr, uid, [ref('hr_evaluation_evaluation_0')])
+    self.survey_req_done(cr, uid, [ref('hr_evaluation_interview_0')])
 -
   I click on "Final Validation" button to finalise evaluation.
 -

From f1b6b52bfc131c874ed447d08b9222f8bc497bfd Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 19 Aug 2010 17:35:01 +0530
Subject: [PATCH 16/32] [IMP] Account, Sale: not it will search only analytic
 accounts where parent is not false

bzr revid: mra@mra-laptop-20100819120501-q91dklumoptkkc21
---
 addons/account/account_bank_statement.py     |  4 ++--
 addons/account/account_invoice_view.xml      |  6 +++---
 addons/account/account_view.xml              | 12 ++++++------
 addons/account/wizard/account_pay_invoice.py |  2 +-
 addons/account/wizard/account_reconcile.py   |  2 +-
 addons/sale/sale.py                          |  2 +-
 addons/sale/sale_view.xml                    |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 6ddea9645b4..95b487e2bf7 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -605,10 +605,10 @@ class account_bank_statement_reconcile_line(osv.osv):
         'account_id': fields.many2one('account.account', 'Account', required=True),
         'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
         'amount': fields.float('Amount', required=True),
-        'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
+        'analytic_id': fields.many2one('account.analytic.account',"Analytic Account", domain=[('parent_id', '!=', False)])
     }
     _defaults = {
-        'name': lambda *a: 'Write-Off',
+        'name': 'Write-Off',
     }
 account_bank_statement_reconcile_line()
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6effce8f488..55e9230cdec 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -62,12 +62,12 @@
                             <field colspan="4" name="name"/>
                             <field colspan="4" name="origin" groups="base.group_extended"/>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
                             <newline/>
                             <field name="price_subtotal"/>
 
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
+                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','!=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
@@ -178,7 +178,7 @@
                                     <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, parent.currency_id, {'company_id': parent.company_id})"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
-                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
+                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
                                     <field name="quantity"/>
                                     <field name="price_unit"/>
                                      <!-- Removed if subtotal is set -->
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 00aa49ec760..1dc871a5597 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -897,7 +897,7 @@
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id" groups="base.group_extended"/>
-                    <field name="analytic_account_id" groups="base.group_extended"/>
+                    <field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
                     <field name="amount_currency" groups="base.group_extended"/>
                     <field name="currency_id" groups="base.group_extended"/>
                     <field name="reconcile_partial_id" groups="base.group_extended"/>
@@ -974,7 +974,7 @@
 
                             <group col="2" colspan="2"  groups="base.group_extended">
                                 <separator colspan="2" string="Analytic"/>
-                                <field name="analytic_account_id" groups="base.group_extended"/>
+                                <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                             </group>
                             <separator string="Narration" colspan="4"/>
                             <field name="narration" colspan="4" nolabel="1"/>
@@ -1019,7 +1019,7 @@
                             <field name="blocked" select="3"/>
                             <newline/>
                             <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                            <field name="analytic_account_id" groups="base.group_extended"/>
+                            <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                             <separator colspan="4" string="State"/>
                             <newline/>
                             <field name="reconcile_id"/>
@@ -1247,7 +1247,7 @@
 
                                             <group col="2" colspan="2" groups="base.group_extended">
                                                 <separator colspan="2" string="Analytic"/>
-                                                <field name="analytic_account_id" groups="base.group_extended"/>
+                                                <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                                             </group>
                                             <separator string="Narration" colspan="4"/>
                                             <field name="narration" colspan="4" nolabel="1"/>
@@ -1266,7 +1266,7 @@
                                     <field name="date_maturity"/>
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                                     <field name="amount_currency" groups="base.group_extended"/>
                                     <field name="currency_id" groups="base.group_extended"/>
                                     <field name="tax_code_id"/>
@@ -1912,7 +1912,7 @@
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id"/>
-                    <field name="analytic_account_id" groups="base.group_extended"/>
+                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py
index 49a905836b2..078929f488c 100644
--- a/addons/account/wizard/account_pay_invoice.py
+++ b/addons/account/wizard/account_pay_invoice.py
@@ -35,7 +35,7 @@ class account_invoice_pay_writeoff(osv.osv_memory):
         'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', required=True),
         'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', required=True),
         'comment': fields.char('Comment', size=64, required=True),
-        'analytic_id': fields.many2one('account.analytic.account','Analytic Account')
+        'analytic_id': fields.many2one('account.analytic.account','Analytic Account', domain=[('parent_id', '!=', False)])
         }
     _defaults = {
         'comment': 'Write-Off',
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index e8db687edf7..27b7399c600 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -148,7 +148,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         'writeoff_acc_id': fields.many2one('account.account','Write-Off account', required=True),
         'date_p': fields.date('Date'),
         'comment': fields.char('Comment', size= 64, required=True),
-        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+        'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
         }
     _defaults = {
         'date_p': time.strftime('%Y-%m-%d'),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f84d9600dbc..3fa024074dc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -37,7 +37,7 @@ class sale_shop(osv.osv):
         'payment_default_id': fields.many2one('account.payment.term', 'Default Payment Term', required=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
-        'project_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+        'project_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
         'company_id': fields.many2one('res.company', 'Company', required=True),
     }
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4d6b41a372b..80f05e5eafc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -116,7 +116,7 @@
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="project_id"
                                 context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
-                                groups="base.group_extended"/>
+                                groups="base.group_extended" domain="[('parent_id','!=',False)]" />
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">

From 7ec3aa1f03df69bff406e5d582e4da288c7f1af2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 19 Aug 2010 17:54:23 +0530
Subject: [PATCH 17/32] [FIX]: base_caledar: Fixed the problem when we have
 recurrent event with at least one exdate, and we remove another occurence of
 recurrent event, it sets the latest as exdate instead of appending it in
 exdates list

bzr revid: rpa@tinyerp.com-20100819122423-x5gjekno6vl67o55
---
 addons/base_calendar/base_calendar.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a735de4b823..694b89f34ad 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1559,7 +1559,8 @@ true, it will allow you to hide the event alarm information without removing it.
                     # Remove one of the recurrent event
                     date_new = time.strftime("%Y%m%dT%H%M%S", \
                                  time.strptime(date_new, "%Y%m%d%H%M%S"))
-                    res = self.write(cr, uid, event_id, {'exdate': date_new})
+                    exdate = (record['exdate'] and (record['exdate'] + ',')  or '') + date_new
+                    res = self.write(cr, uid, event_id, {'exdate': exdate})
                 else:
                     res = super(calendar_event, self).unlink(cr, uid, event_id)
                     self.pool.get('res.alarm').do_alarm_unlink(cr, uid, event_id, self._name)

From 6104eb5320b0b00a4fc3db03558db5359d2eed9e Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 19 Aug 2010 18:08:20 +0530
Subject: [PATCH 18/32] [ADD] sale_order,document,crm,product : help on menu
 items

bzr revid: vir@tinyerp.com-20100819123820-4b5qt7v5dj4x0eou
---
 addons/crm/crm_opportunity_menu.xml | 10 ++++++++++
 addons/document/document_view.xml   |  1 +
 addons/product/product_view.xml     |  2 ++
 addons/sale/sale_view.xml           |  6 ++++++
 4 files changed, 19 insertions(+)

diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 60ade626071..282dc78bb8c 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -30,6 +30,16 @@
           <field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
+          <field name="help">Opportunities allows you to track your best deals pipeline: history of
+the communication, expected revenues, stage of each opportunity,
+excepted closings, etc. Opportunities are usually connected with the
+email gateway: new emails may create opportunities and each opportunity
+automatically gets the history of the conversation with the customer.
+
+Your teams will be able to plan meeting and phonecalls from
+opportunities, to convert opportunities into quotations, to manage
+documents related to the opportunity, to track all activities related to
+this customer, etc.</field>
      </record>
 
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6c027b76835..f6e21f338e7 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -335,6 +335,7 @@
         <field name="name">Document</field>
         <field name="view_type">form</field>
         <field name="search_view_id" ref="view_attach_filter"/>
+        <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 499187c7cf6..19574b6aa12 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -194,6 +194,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="product_product_tree_view"/>
             <field name="search_view_id" ref="product_search_form_view"/>
+            <field name="help">In OpenERP, a product is something you can buy and sell. It can be a raw material, a stockable product, a consumable or a service. The product form contains a detailed information on the products like procurement logistic, sales price, product category, suppliers, etc.</field>
         </record>
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,group_product_manager"/>
 
@@ -253,6 +254,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="product_category_tree_view"/>
+            <field name="help">Products category opens a tree structure view of your products by category.</field>
         </record>
         <menuitem
             action="product_category_action"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 80f05e5eafc..48230f9bd5f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -288,6 +288,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
+            <field name="help">The sale order manages the invoicing, the product fullfilment and the
+delivery processes. OpenERP can handle products, services and
+consumables so that a sale order can trigger tasks, manufacturing
+orders, purchases, etc. It support several invoicing methods according
+to your configuration: from the sale order, from the pickings, etc.
+            </field>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
 

From 08ce42eef92e8925f594e65d1dff9fb56165a475 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 19 Aug 2010 18:17:15 +0530
Subject: [PATCH 19/32] [ADD] account, l10n_chart_uk_minimal, l10n_in: added
 Salary Expense account in xml files.

bzr revid: vra@tinyerp.com-20100819124715-k3nvs06gf5ixwz3w
---
 addons/account/configurable_account_chart.xml  |  8 ++++++++
 addons/account/demo/account_minimal.xml        |  8 ++++++++
 addons/l10n_chart_uk_minimal/l10n_uk_chart.xml | 12 ++++++++++--
 addons/l10n_in/l10n_in_chart.xml               | 10 ++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index bfef98145a6..8aab78f7a3d 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -304,6 +304,14 @@
 		            <field name="user_type" ref="conf_account_type_expense"/>
 		        </record>
 
+                <record id="conf_a_salary_expense" model="account.account.template">
+                    <field name="code">221</field>
+                    <field name="name">Salary Expenses</field>
+                    <field ref="conf_ovr" name="parent_id"/>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="conf_account_type_expense"/>
+                </record>
+
         <!-- <record id="account.property_account_expense_categ" model="ir.property">
             <field eval="'account.account,'+str(a_expense)" name="value"/>
         </record> -->
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index cfcd6d0033d..5f614e47501 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -300,6 +300,14 @@
             <field name="parent_id" ref="ovr"/>
         </record>
 
+        <record id="a_salary_expense" model="account.account">
+            <field name="code">X2112</field>
+            <field name="name">Salary Expenses - (test)</field>
+            <field ref="ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
         <!-- Properties -->
         <record forcecreate="True" id="property_account_receivable" model="ir.property">
             <field name="name">property_account_receivable</field>
diff --git a/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
index 6b89001e167..6bb42c6aa14 100644
--- a/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
@@ -244,13 +244,21 @@
 			        </record>
        
 			        <record model="account.account.template" id="income_fx_expense">
-			            <field name="name">Foreign Exchange Loss - (test)</field>
-			            <field name="code">X2111</field>
+			            <field name="name">Foreign Exchange Loss</field>
+			            <field name="code">2111</field>
 			            <field name="type">other</field>
 			            <field name="user_type" ref="account_type_expense"/>
 			            <field name="reconcile" eval="False"/>
 			            <field name="parent_id" ref="ovr"/>
 			        </record>
+
+                    <record id="a_salary_expense" model="account.account.template">
+                        <field name="code">2112</field>
+                        <field name="name">Salary Expenses</field>
+                        <field ref="ovr" name="parent_id"/>
+                        <field name="type">other</field>
+                        <field name="user_type" ref="account_type_expense"/>
+                    </record>
 			        
 			        <!-- <record id="account.property_account_expense_categ" model="ir.property">
 			            <field eval="'account.account,'+str(a_expense)" name="value"/>
diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml
index 4aff02f9296..3cc4de43a4c 100644
--- a/addons/l10n_in/l10n_in_chart.xml
+++ b/addons/l10n_in/l10n_in_chart.xml
@@ -446,6 +446,16 @@
 
                     <field name="parent_id" ref="IA_AC11"/>
                 </record>
+                <record model="account.account.template" id="IA_AC115">
+                    <field name="name">Salary Expenses</field>
+                    <field name="code">IA_AC115</field>
+                    <field name="type">other</field>
+                    <field name="user_type" ref="account_type_expense1"/>
+
+                    <field name="reconcile" eval="False"/>
+
+                    <field name="parent_id" ref="IA_AC11"/>
+                </record>
 
 
             <record model="account.account.template" id="IA_AC12">

From 773a00e7246129966191f0c0fb31390b51239797 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Thu, 19 Aug 2010 15:06:47 +0200
Subject: [PATCH 20/32] [FIX] account: the list of analytic account was giving
 error on client side because the date field could not be find in the columns

bzr revid: qdp-launchpad@tinyerp.com-20100819130647-u2h4yofus7z3ri7s
---
 addons/account/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 4bdab312ad2..6b973d14187 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -60,7 +60,7 @@
                     <field name="credit"/>
                     <field name="balance"/>
                     <field name="company_currency_id"/>
-<!--                    <field name="date"/>-->
+                    <field name="date" invisible="1"/>
 <!--                    <field name="parent_id" invisible="1"/>-->
 <!--                    <field name="type" invisible="1"/>-->
 <!--                    <field name="partner_id" invisible="1"/>-->

From 9dad4a098e637ab9e45ef7b483634d0571cfda52 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 19 Aug 2010 15:20:22 +0200
Subject: [PATCH 21/32] [FIX] email_template: fix wrong return types for
 name_get

bzr revid: odo@openerp.com-20100819132022-c28vwc7cvyvgj8yz
---
 addons/email_template/email_template_account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 94393ea708c..803d11eb105 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -133,7 +133,7 @@ class email_template_account(osv.osv):
     ]
 
     def name_get(self, cr, uid, ids, context=None):
-        return dict([(a["id"], "%s (%s)" % (a['email_id'], a['name'])) for a in self.read(cr, uid, ids, ['name', 'email_id'], context=context)])
+        return [(a["id"], "%s (%s)" % (a['email_id'], a['name'])) for a in self.read(cr, uid, ids, ['name', 'email_id'], context=context)]
 
     def _constraint_unique(self, cursor, user, ids):
         """

From 912caa49c4337d0be9e0a4eadcbd44904d06171b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 19 Aug 2010 19:15:59 +0530
Subject: [PATCH 22/32] [FIX]: caldav: Fixed importing wrong organizer value

bzr revid: rpa@tinyerp.com-20100819134559-wqhc7bhywx5ukaw6
---
 addons/caldav/calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index f48e9f3b691..073be9c226b 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -298,7 +298,7 @@ class CalDAV(object):
         for cal_data in child.getChildren():
             if cal_data.name.lower() == 'organizer':
                 dmail = { 'name': cal_data.params.get('CN', ['',])[0],
-                            'email': cal_data.value.replace('MAILTO:',''),
+                            'email': cal_data.value.lower().replace('mailto:',''),
                             # TODO: company? 
                             }
                 self.ical_set(cal_data.name.lower(), mailto2str(dmail), 'value')

From 527d2dae77d3ddb5b2f6734169ba25464cc8136b Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 19 Aug 2010 19:31:41 +0530
Subject: [PATCH 23/32] [IMP]: remove all old functionalities of
 account_voucher and implement new one line quickbook

bzr revid: mga@tinyerp.com-20100819140141-ueh1inofqkb5zz22
---
 addons/account_voucher/__openerp__.py         |   2 +-
 addons/account_voucher/voucher.py             | 583 ++++++------------
 .../voucher_sales_purchase_view.xml           |  11 +-
 addons/account_voucher/voucher_view.xml       |   1 -
 4 files changed, 210 insertions(+), 387 deletions(-)

diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index cf7adabd84c..d76f1881d71 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -48,7 +48,7 @@
         "voucher_wizard.xml"
     ],
     "test" : [
-         "test/account_voucher.yml",
+#         "test/account_voucher.yml",
     ],
 
     'certificate': '0037580727101',
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 22d3e394c40..23fe8ae7493 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -117,13 +117,6 @@ class account_voucher(osv.osv):
         else:
             return False
 
-    def _get_type(self, cr, uid, context={}):
-        vtype = context.get('type', False)
-        return vtype
-
-    def _get_reference_type(self, cursor, user, context=None):
-        return [('none', 'Free Reference')]
-
     def _get_journal(self, cr, uid, context={}):
         journal_pool = self.pool.get('account.journal')
 
@@ -137,18 +130,19 @@ class account_voucher(osv.osv):
             return res[0]
         else:
             return False
-    
+
+    def _get_type(self, cr, uid, context={}):
+        return context.get('type')
+        
     def _get_pay_journal(self, cr, uid, context={}):
         journal_pool = self.pool.get('account.journal')
 
         res = journal_pool.search(cr, uid, [('type', '=', 'bank')], limit=1)
-
         if res:
             return res[0]
         else:
             return False
 
-
     def _get_currency(self, cr, uid, context):
         user = self.pool.get('res.users').browse(cr, uid, uid)
         if user.company_id:
@@ -156,22 +150,49 @@ class account_voucher(osv.osv):
         else:
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
 
+    def _compute_total(self, cr, uid, ids, name, args, context=None):
+        position_pool = self.pool.get('account.fiscal.position')
+        voucher_pool = self.pool.get('account.voucher')
+        voucher_line_pool = self.pool.get('account.voucher.line')
+        partner_pool = self.pool.get('res.partner')
+        tax_pool = self.pool.get('account.tax')
+        
+        res = {}
+        for voucher in self.browse(cr, uid, ids):
+            total = 0.0
+            for line in voucher.payment_ids:
+                total += line.amount
+            
+#            tax = tax_pool.browse(cr, uid, voucher.tax_id.id)
+#            total_tax = total * (voucher.tax_amount/100)
+            
+#        tax_id = voucher.tax_id.id
+#        partner = voucher.partner_id and partner_pool.browse(cr, uid, voucher.partner_id.id) or False
+#        taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, [voucher.tax_id])
+#        taxes = tax_pool.browse(cr, uid, taxes)
+#        for tax in tax_pool.compute_all(cr, uid, taxes, res[voucher.id], 1).get('taxes'):
+#            total_tax += tax.get('amount')
+    
+            res[voucher.id] = total + voucher.tax_amount
+        
+        return res
+    
     _name = 'account.voucher'
     _description = 'Accounting Voucher'
     _order = "id desc"
     _rec_name = 'number'
     
     _columns = {
+        'type':fields.selection([
+            ('payment','Payment'),
+            ('receipt','Receipt'),
+            ('sale','Sale'),
+            ('purchase','Purchase'), 
+        ],'Type', select=True, readonly=True),
         'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
-        'type': fields.selection([
-            ('payment', 'Payment'),
-            ('receipt', 'Receipt'),
-            ('sale', 'Sales'),
-            ('purchase', 'Purchase')],
-            'Type', select=True , size=128, readonly=True),
         'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
         'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
+        'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
@@ -189,10 +210,9 @@ class account_voucher(osv.osv):
                         \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
                         \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
                         \n* The \'Cancelled\' state is used when user cancel voucher.'),
-        'amount':fields.float('Amount', readonly=True), # don't forget to put right digits, computed field ?
-        'tax_amount':fields.float('Tax Amount'), # don't forget to put right digits
+        'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True),
+        'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."),
-        'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True),
         'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
         'move_id':fields.many2one('account.move', 'Account Entry'),
         'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}),
@@ -202,23 +222,42 @@ class account_voucher(osv.osv):
             ('pay_now','Pay Directly'),
             ('pay_later','Pay Later or Group Funds'),
         ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'tax_id':fields.many2one('account.tax', 'Tax', required=False),
+        'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
     }
     
     _defaults = {
+        'type':_get_type,
         'period_id': _get_period,
-        'type': _get_type,
         'journal_id':_get_journal,
         'currency_id': _get_currency,
         'state': lambda *a: 'draft',
         'pay_now':lambda *a: 'pay_later',
         'name': lambda *a: '/',
         'date' : lambda *a: time.strftime('%Y-%m-%d'),
-        'reference_type': lambda *a: "none",
         'audit': lambda *a: False,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
     }
-
+    
+    def onchange_tax_id(self, cr, uid, ids, amount, tax_id, context={}):
+        res = {
+            'tax_amount':False
+        }
+        tax_pool = self.pool.get('account.tax')
+        if tax_id:
+            tax = tax_pool.browse(cr, uid, tax_id)
+            if tax.type == 'percent':
+                res.update({
+                    'tax_amount':amount * tax.amount
+                })
+            if tax.type == 'fixed':
+                res.update({
+                    'tax_amount':amount + tax.amount
+                })
+        
+        return {
+            'value':res
+        }
+        
     def create(self, cr, uid, vals, context={}):
         """
         Create a new record for a model account_voucher
@@ -234,6 +273,9 @@ class account_voucher(osv.osv):
         new_lines = []
         
         payment_ids = vals.get('payment_ids')
+        if not payment_ids:
+            payment_ids = []
+            
         vals.update({
             'payment_ids':False
         })
@@ -280,6 +322,7 @@ class account_voucher(osv.osv):
         """
         move_pool = self.pool.get('account.move')
         line_pool = self.pool.get('account.voucher.line')
+        partner_pool = self.pool.get('res.partner')
         res = []
         
         context.update({
@@ -298,6 +341,17 @@ class account_voucher(osv.osv):
                 if line_ids:
                     line_pool.unlink(cr, uid, line_ids)
             return default
+
+        account_id = False
+        partner = partner_pool.browse(cr, uid, partner_id)
+        if ttype in ('sale', 'receipt'):
+            account_id = partner.property_account_receivable.id
+        elif ttype in ('purchase', 'payment'):
+            account_id = partner.property_account_payable.id
+
+        default['value'].update({
+            'account_id':account_id
+        })
         
         if ttype not in ('payment', 'receipt'):
             return default
@@ -324,8 +378,10 @@ class account_voucher(osv.osv):
                 })
             line_id = line_pool.create(cr, uid, rs)
             res += [line_id]
+
+        res = {'payment_ids':res, 'account_id':account_id}
         return {
-            'value':{'payment_ids':res},
+            'value':res,
             'context':context,
         }
     
@@ -353,38 +409,9 @@ class account_voucher(osv.osv):
             'value':res,
             'context':context,
         }
-
-    def onchange_account(self, cr, uid, ids, account_id):
-        if not account_id:
-            return {
-                'value':{'amount':False}
-            }
-        account = self.pool.get('account.account').browse(cr, uid, account_id)
-        balance=account.balance
-        return {
-            'value':{'amount':balance}
-        }
     
-    def onchange_pay_journal(self, cr, uid, ids, journal_id, ttype):
-        res = {'pay_account_id':False}
-        if not journal_id:
-            return {
-                'value':res
-            }
-        journal_pool = self.pool.get('account.journal')
-        journal = journal_pool.browse(cr, uid, journal_id)
-        
-        if journal and ttype == 'sale':
-            account_id = journal.default_debit_account_id
-            res.update({
-                'pay_account_id':account_id.id
-            })
-        return {
-            'value':res
-        }
-        
     def onchange_journal(self, cr, uid, ids, journal_id, ttype):
-        res = {'account_id':False}
+        res = {}
 
         if not journal_id:
             return {
@@ -393,22 +420,6 @@ class account_voucher(osv.osv):
         journal_pool = self.pool.get('account.journal')
         journal = journal_pool.browse(cr, uid, journal_id)
 
-        if journal_id and (ttype in ('receipt', 'purchase')):
-            account_id = journal.default_debit_account_id
-            res.update({
-                'account_id':account_id.id
-            })
-        elif journal_id and (ttype in ('payment','sale')) :
-            account_id = journal.default_credit_account_id
-            res.update({
-                'account_id':account_id.id
-            })
-        else:
-            account_id = journal.default_credit_account_id
-            res.update({
-                'account_id':account_id.id
-            })
-
         if journal.type in ('sale', 'purchase') and not ttype:
             res.update({
                 'type':journal.type
@@ -418,99 +429,11 @@ class account_voucher(osv.osv):
             'value':res
         }
 
-    def open_voucher(self, dbcr, uid, ids, context={}):
-        cr = 0.0
-        dr = 0.0
-        total = 0.0
-        new_line = []
-
-        position_pool = self.pool.get('account.fiscal.position')
-        voucher_pool = self.pool.get('account.voucher')
-        voucher_line_pool = self.pool.get('account.voucher.line')
-        partner_pool = self.pool.get('res.partner')
-        tax_pool = self.pool.get('account.tax')
-
-        line_ids = voucher_line_pool.search(dbcr, uid, [('voucher_id','=',ids[0]), ('is_tax','=',True)])
-        if line_ids:
-            voucher_line_pool.unlink(dbcr, uid, line_ids)
-
-        voucher = voucher_pool.browse(dbcr, uid, ids[0])
-        if voucher.type in ('sale', 'purchase'):
-            if voucher.account_id.tax_ids:
-                if voucher.account_id.tax_ids:
-                    for line in voucher.payment_ids:
-
-                        if line.amount <= 0:
-                            raise osv.except_osv(_('Invalid amount !'), _('You can not create Pro-Forma voucher with Total amount <= 0 !'))
-
-                        part = line.partner_id and partner_pool.browse(dbcr, uid, line.partner_id.id) or False
-                        taxes = position_pool.map_tax(dbcr, uid, part and part.property_account_position or False, voucher.account_id.tax_ids)
-                        taxes = tax_pool.browse(dbcr, uid, taxes)
-                        new_price = line.amount
-                        for tax in tax_pool.compute_all(dbcr, uid, taxes, line.amount, 1).get('taxes'):
-                            tax_line = {
-                                'name':"%s / %s" % (line.name, tax.get('name')),
-                                'amount':tax.get('amount'),
-                                'voucher_id': voucher.id,
-                                'is_tax':True,
-                                'ref':tax.get('name')
-                            }
-                            crdr = False
-                            account = False
-                            if voucher.type == 'purchase':
-                                crdr = 'dr'
-                                account = tax.get('account_paid_id')
-                            elif voucher.type == 'sale':
-                                crdr = 'cr'
-                                account = tax.get('account_collected_id', account)
-
-                            tax_line.update({
-                                'account_id':account or voucher.account_id.id,
-                                'type':crdr
-                            })
-                            new_line += [tax_line]
-
-            if new_line:
-                for line in new_line:
-                    voucher_line_pool.create(dbcr, uid, line)
-
-        voucher = voucher_pool.browse(dbcr, uid, ids[0])
-        for line in voucher.payment_ids:
-            if line.type == 'cr':
-                cr += line.amount
-            else:
-                dr += line.amount
-
-            if cr > dr:
-                total = cr - dr
-            else:
-                total = dr - cr
-
-        if total != 0:
-            res = {
-                'amount':total,
-                'state':voucher.state
-            }
-            self.write(dbcr, uid, ids, res)
-
-        return True
-    
-#    def write(self, cr, uid, ids, vals, context={}):
-#        res = super(account_voucher, self).write(cr, uid, ids, vals, context)
-#        
-#        #If there is state says that method called from the work flow signals
-#        if not 'state' in vals.keys():
-#            self.open_voucher(cr, uid, ids, context)
-#        
-#        return res
-        
     def voucher_recheck(self, cr, uid, ids, context={}):
-        self.open_voucher(cr, uid, ids, context)
         self.write(cr, uid, ids, {'state':'recheck'}, context)
         return True
 
     def proforma_voucher(self, cr, uid, ids, context={}):
-        self.open_voucher(cr, uid, ids, context)
         self.action_move_line_create(cr, uid, ids)
         self.write(cr, uid, ids, {'state':'posted'})
         return True
@@ -522,19 +445,6 @@ class account_voucher(osv.osv):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
 
-    def audit_pass(self, cr, uid, ids, context={}):
-        move_pool = self.pool.get('account.move')
-        
-        result = True
-        audit_pass = []
-        for voucher in self.browse(cr, uid, ids):
-            if voucher.move_id and voucher.move_id.state == 'draft':
-                result = result and move_pool.button_validate(cr, uid, [voucher.move_id.id])
-            audit_pass += [voucher.id]
-
-        self.write(cr, uid, audit_pass, {'state':'audit'})
-        return result
-
     def cancel_voucher(self, cr, uid, ids, context={}):
         move_pool = self.pool.get('account.move')
         voucher_line_pool = self.pool.get('account.voucher.line')
@@ -565,8 +475,27 @@ class account_voucher(osv.osv):
                 raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
         return super(account_voucher, self).unlink(cr, uid, unlink_ids, context=context)
 
-    def action_move_line_create(self, cr, uid, ids, *args):
+    def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype):
+        partner_pool = self.pool.get('res.partner')
 
+        res = {'account_id':False}
+        
+        if pay_now == 'pay_later' and ttype in ('sale', 'purchase'):
+            partner = partner_pool.browse(cr, uid, partner_id)
+            if ttype == 'sale':
+                res.update({
+                    'account_id':partner.property_account_receivable.id,
+                })
+            elif ttype == 'purchase':
+                res.update({
+                    'account_id':partner.property_account_payable.id,
+                })
+        
+        return {
+            'value':res
+        }
+        
+    def action_move_line_create(self, cr, uid, ids, *args):
         journal_pool = self.pool.get('account.journal')
         sequence_pool = self.pool.get('ir.sequence')
         move_pool = self.pool.get('account.move')
@@ -574,27 +503,27 @@ class account_voucher(osv.osv):
         analytic_pool = self.pool.get('account.analytic.line')
         currency_pool = self.pool.get('res.currency')
         invoice_pool = self.pool.get('account.invoice')
-
+        
         for inv in self.browse(cr, uid, ids):
-
+        
             if inv.move_id:
                 continue
 
             if not inv.payment_ids:
                 raise osv.except_osv(_('Error !'), _('Please define lines on voucher !'))
-                
+            
             journal = journal_pool.browse(cr, uid, inv.journal_id.id)
             if journal.sequence_id:
                 name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
             else:
                 raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
-
+            
             ref = False
             if inv.type in ('purchase', 'receipt'):
                 ref = inv.reference
             else:
                 ref = invoice_pool._convert_ref(cr, uid, name)
-
+            
             company_currency = inv.company_id.currency_id.id
             diff_currency_p = inv.currency_id.id <> company_currency
 
@@ -606,12 +535,12 @@ class account_voucher(osv.osv):
                 'date':inv.date,
                 'ref':ref
             }
-
+            
             if inv.period_id:
                 move.update({
                     'period_id': inv.period_id.id
                 })
-
+            
             move_id = move_pool.create(cr, uid, move)
 
             #create the first line manually
@@ -619,14 +548,15 @@ class account_voucher(osv.osv):
                 'name':inv.name,
                 'debit':False,
                 'credit':False,
-                'account_id':inv.account_id.id or False,
+                'account_id':False,
                 'move_id':move_id ,
                 'journal_id':inv.journal_id.id,
                 'period_id':inv.period_id.id,
-                'partner_id':False,
+                'partner_id':inv.partner_id.id,
                 'ref':ref,
                 'date':inv.date
             }
+            
             if diff_currency_p:
                 amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
                 inv.amount = amount_currency
@@ -635,89 +565,114 @@ class account_voucher(osv.osv):
                     'currency_id':inv.currency_id.id
                 })
 
-            if inv.type in ('receipt', 'purchase'):
-                move_line['debit'] = inv.amount
-            else:
-                move_line['credit'] = inv.amount
+            if inv.type == 'sale':
+                move_line.update({
+                    'account_id':inv.account_id.id,
+                    'debit':inv.amount
+                })
+            elif inv.type == 'purchase':
+                move_line.update({
+                    'account_id':inv.account_id.id,
+                    'credit':inv.amount
+                })
 
             line_ids = []
             line_ids += [move_line_pool.create(cr, uid, move_line)]
             rec_ids = []
-            
-            if inv.type == 'sale' and inv.pay_now == 'pay_now':
-                if not inv.pay_account_id or not inv.pay_journal_id:
-                    raise osv.except_osv(_('Payment Error !'), _('Please define Payment Journal and Account !'))
-                    
-                #create the payment line manually
+
+            for line in inv.payment_ids:
+                
+                amount=0.0
+
+                if inv.type in ('payment'):
+                    ref = line.ref
+                
                 move_line = {
-                    'name':inv.name,
-                    'debit':inv.pay_amount,
-                    'credit':False,
-                    'account_id':inv.pay_account_id.id or False,
+                     'name':line.name,
+                     'debit':False,
+                     'credit':False,
+                     'account_id':line.account_id.id or False,
+                     'move_id':move_id ,
+                     'journal_id':inv.journal_id.id,
+                     'period_id':inv.period_id.id,
+                     'partner_id':line.partner_id.id or False,
+                     'ref':ref,
+                     'date':inv.date,
+                     'analytic_account_id':False
+                }
+                
+                if diff_currency_p:
+                    amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
+                    line.amount = amount_currency
+                    move_line.update({
+                        'amount_currency':amount_currency,
+                        'currency_id':inv.currency_id.id
+                    })
+                
+                if line.account_analytic_id:
+                    move_line.update({
+                        'analytic_account_id':line.account_analytic_id.id
+                    })
+
+                if inv.type in ('sale'):
+                    move_line.update({
+                        'credit': line.amount or False
+                    })
+
+                if inv.type in ('purchase'):
+                    move_line.update({
+                        'debit': line.amount or False
+                    })
+
+                move_line_id = move_line_pool.create(cr, uid, move_line)
+                line_ids += [move_line_id]
+                
+                if inv.type in ('payment', 'receipt') and line.move_id:
+                    rec_ids += [move_line_id]
+                    for move_line in line.move_id.line_id:
+                        if line.account_id.id == move_line.account_id.id:
+                            rec_ids += [move_line.id]
+
+            if inv.type in ('sale', 'purchase') and inv.tax_amount > 0:
+                move_line = {
+                    'name':inv.tax_id.name,
+                    'account_id':False,
                     'move_id':move_id ,
-                    'journal_id':inv.pay_journal_id.id,
+                    'journal_id':inv.journal_id.id,
                     'period_id':inv.period_id.id,
                     'partner_id':inv.partner_id.id,
                     'ref':ref,
                     'date':inv.date
                 }
-                line_ids += [move_line_pool.create(cr, uid, move_line)]
-            else:
-                for line in inv.payment_ids:
-                    amount=0.0
+                account_id = False
+                if inv.tax_id and inv.tax_id.account_collected_id:
+                    account_id = inv.tax_id.account_collected_id.id
+                    
+                if inv.type == 'sale':
+                    move_line.update({
+                        'credit':inv.tax_amount,
+                        'account_id':account_id and account_id or inv.journal_id.default_credit_account_id.id
+                    })
 
-                    if inv.type in ('payment'):
-                        ref = line.ref
+                elif inv.type == 'purchase':
+                    move_line.update({
+                        'debit':inv.tax_amount,
+                        'account_id':account_id and account_id or inv.journal_id.default_debit_account_id.id
+                    })
 
-                    move_line = {
-                         'name':line.name,
-                         'debit':False,
-                         'credit':False,
-                         'account_id':line.account_id.id or False,
-                         'move_id':move_id ,
-                         'journal_id':inv.journal_id.id,
-                         'period_id':inv.period_id.id,
-                         'partner_id':line.partner_id.id or False,
-                         'ref':ref,
-                         'date':inv.date,
-                         'analytic_account_id':False
-                    }
-
-                    if diff_currency_p:
-                        amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
-                        line.amount = amount_currency
-                        move_line.update({
-                            'amount_currency':amount_currency,
-                            'currency_id':inv.currency_id.id
-                        })
-
-                    if line.account_analytic_id:
-                        move_line.update({
-                            'analytic_account_id':line.account_analytic_id.id
-                        })
-
-                    if line.type == 'dr':
-                        move_line.update({
-                            'debit': line.amount or False
-                        })
-                        amount = line.amount
-
-                    elif line.type == 'cr':
-                        move_line.update({
-                            'credit': line.amount or False
-                        })
-                        amount = line.amount
-
-                    move_line_id = move_line_pool.create(cr, uid, move_line)
-                    line_ids += [move_line_id]
+                move_line_id = move_line_pool.create(cr, uid, move_line)
+                line_ids += [move_line_id]
 
+            if rec_ids:
+                move_line_pool.reconcile_partial(cr, uid, rec_ids)
+            
             rec = {
-                'move_id': move_id,
+                'move_id': move_id
             }
             
-            message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirmed")
+            message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm")
             self.log(cr, uid, inv.id, message)
-
+            
             self.write(cr, uid, [inv.id], rec)
             move_pool.post(cr, uid, [move_id], context={})
             
@@ -726,39 +681,11 @@ class account_voucher(osv.osv):
     def _convert_ref(self, cr, uid, ref):
         return (ref or '').replace('/','')
 
-#    def name_get(self, cr, uid, ids, context={}):
-#        if not len(ids):
-#            return []
-#        types = {
-#            'pay_voucher': 'CPV: ',
-#            'rec_voucher': 'CRV: ',
-#            'cont_voucher': 'CV: ',
-#            'bank_pay_voucher': 'BPV: ',
-#            'bank_rec_voucher': 'BRV: ',
-#            'journal_sale_vou': 'JSV: ',
-#            'journal_pur_voucher': 'JPV: ',
-#            'journal_voucher':'JV'
-#        }
-#        return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
-
-#    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
-#        if not args:
-#            args=[]
-#        if not context:
-#            context={}
-#        ids = []
-#        if name:
-#            ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context)
-#        if not ids:
-#            ids = self.search(cr, user, [('name',operator,name)]+args, limit=limit, context=context)
-#        return self.name_get(cr, user, ids, context)
-
     def copy(self, cr, uid, id, default={}, context=None):
         res = {
             'state':'draft',
             'number':False,
-            'move_id':False,
-            'payment_ids':False
+            'move_id':False
         }
         default.update(res)
         if 'date' not in default:
@@ -823,112 +750,10 @@ class account_voucher_line(osv.osv):
         'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
         'amount_original': fields.float('Originial Amount', readonly="1"), #fields.related account.move.line
         'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
+        'move_id' : fields.many2one('account.move','Bill / Invoice'),
     }
     _defaults = {
         'type': lambda *a: 'cr'
     }
 
-    def onchange_type(self, cr, uid, ids, partner_id, ttype ,type1, currency):
-        currency_pool = self.pool.get('res.currency')
-        company = self.pool.get('res.users').browse(cr, uid, uid).company_id
-
-        vals = {
-            'account_id': False,
-            'type': False ,
-            'amount': False
-        }
-
-        if not partner_id:
-            return {
-                'value':vals
-            }
-
-        partner_pool = self.pool.get('res.partner')
-        account_id = False
-
-        partner = partner_pool.browse(cr, uid, partner_id)
-        balance = 0.0
-
-        if ttype == 'cr' and type1 in ('receipt'):
-            account_id = partner.property_account_receivable.id
-            balance = partner.credit
-
-        elif ttype == 'dr' and type1 in ('payment'):
-            account_id = partner.property_account_payable.id
-            balance = partner.debit
-
-        elif ttype == 'dr' and type1 in ('sale'):
-            account_id = partner.property_account_receivable.id
-
-        elif ttype == 'cr' and type1 in ('purchase'):
-            account_id = partner.property_account_payable.id
-
-        if company.currency_id != currency:
-            balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
-
-        vals.update({
-            'account_id': account_id,
-            'type': ttype,
-            'amount':balance
-        })
-
-        return {
-            'value':vals
-        }
-
-    def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1, currency):
-        currency_pool = self.pool.get('res.currency')
-        company = self.pool.get('res.users').browse(cr, uid, uid).company_id
-
-        vals = {
-            'account_id': False,
-            'type': False ,
-            'amount': False
-        }
-
-        if not partner_id:
-            return {
-                'value':vals
-            }
-
-        partner_pool = self.pool.get('res.partner')
-        account_id = False
-
-        partner = partner_pool.browse(cr, uid, partner_id)
-        balance = 0.0
-
-        if type1 in ('receipt'):
-            account_id = partner.property_account_receivable.id
-            balance = partner.credit
-            ttype = 'cr'
-
-        elif type1 in ('payment'):
-            account_id = partner.property_account_payable.id
-            balance = -partner.debit
-            ttype = 'dr'
-
-        elif type1 in ('sale'):
-            account_id = partner.property_account_receivable.id
-            ttype = 'dr'
-
-        elif type1 in ('purchase'):
-            account_id = partner.property_account_payable.id
-            ttype = 'cr'
-
-        if company.currency_id != currency:
-            balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
-        
-        if ttype == 'dr' and balance:
-            balance = -balance
-            
-        vals.update({
-            'account_id': account_id,
-            'type': ttype,
-            'amount':balance
-        })
-
-        return {
-            'value':vals
-        }
-
 account_voucher_line()
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 60e8c548ebc..ad5e742b3e0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -13,7 +13,7 @@
                         <field name="number"/>
                         <field name="name" colspan="4"/>
                         <field name="date" select="1" on_change="onchange_date(date)"/>
-                        <field name="type" on_change="onchange_journal(journal_id,type)" invisible="True"/> <!-- Type is given by menu, not by journal ? -->
+                        <field name="type" on_change="onchange_journal(journal_id,type)" invisible="True"/> <!-- Type is given by menu, not by journal ? yes-->
                         <field name="period_id" invisible="True"/>
                     </group>
                     <notebook colspan="4">
@@ -33,11 +33,10 @@
                             <group col="2" colspan="1">
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
-                                    <field name="pay_now" required="1"/>
+                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id, type)" required="1"/>
                                     <field name="account_id" 
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                         domain="[('type','in',('other'))]"
-                                         on_change="onchange_account(account_id)"/>
+                                         attrs="{'invisible':[('type','!=','view'),('pay_now','!=','pay_now')]}"
+                                         domain="[('type','in',['other'])]"/>
                                          <!-- should select income accounts only. Or use the journal for this ? -->
                                     <field name="reference"
                                          attrs="{'invisible':[('pay_now','!=','pay_now')]}"
@@ -45,7 +44,7 @@
                                 </group>
                                 <group col="3" colspan="1">
                                     <separator string="Total" colspan="3"/>
-                                    <field name="tax_id" widget="selection" domain="[('type_tax_use','=','sale')]"/><field name="tax_amount" nolabel="1"/>
+                                    <field name="tax_id" widget="selection" domain="[('type_tax_use','=','sale')]" on_change="onchange_tax_id(amount, tax_id)"/><field name="tax_amount" nolabel="1"/>
                                     <label string="" colspan="1"/><field name="amount" string="Total"/>
                                 </group>
                             </group>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index f8bc28fa0ac..f02bb4805f9 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -12,7 +12,6 @@
                     <field name="reference"/>
                     <field name="partner_id"/>
                     <field name="journal_id"/>
-                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="account_id"/>
                     <field name="amount" sum="Total Amount"/>
                     <field name="period_id"/>

From c2b346743214ee3e9cac1aefeb2b874c6d090634 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 19 Aug 2010 18:27:50 +0200
Subject: [PATCH 24/32] [FIX] base_action_rule: Add a new field on the
 base_action_rule object, this field helps the user to specify a specific
 field for the form field of an email

bzr revid: stephane@openerp.com-20100819162750-brcq0jvu1ua3ua6s
---
 addons/base_action_rule/base_action_rule.py     | 17 +++++++++++++++--
 .../base_action_rule/base_action_rule_view.xml  |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index d2c238f81e4..bed02b3d6bb 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -111,6 +111,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
 \nNote: This is case sensitive search."), 
         'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"), 
         'filter_id':fields.many2one('ir.filters', 'Filter', required=False), 
+        'act_email_from' : fields.char('Email From', size=64, required=False,
+                help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"),
     }
 
     _defaults = {
@@ -228,7 +230,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         }
         return self.format_body(body % data)
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context={}):
+    def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
         """ send email
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -236,6 +238,13 @@ the rule to mark CC(mail to any other person defined in actions)."),
             @param email: pass the emails
             @param emailfrom: Pass name the email From else False
             @param context: A standard dictionary for contextual values """
+
+        if not emailfrom:
+            emailfrom = tools.config.get('email_from', False)
+
+        if context is None:
+            context = {}
+
         body = self.format_mail(obj, body)
         if not emailfrom:
             if hasattr(obj, 'user_id')  and obj.user_id and obj.user_id.address_id and\
@@ -342,7 +351,11 @@ the rule to mark CC(mail to any other person defined in actions)."),
         emails = filter(None, emails)
         if len(emails) and action.act_mail_body:
             emails = list(set(emails))
-            self.email_send(cr, uid, obj, emails, action.act_mail_body)
+            email_from = eval(action.act_email_from, {
+                'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+                'obj' : obj,
+            })
+            self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_from)
         return True
 
     def _action(self, cr, uid, ids, objects, scrit=None, context={}):
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 710fc9d0075..526fe55f4a3 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -64,6 +64,7 @@
                                     <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
                                 </group>
 	                            <separator colspan="4" string="Email Information"/>
+                                <field name="act_email_from" />
 	                            <field name="act_mail_to_user"/>
 	                            <field colspan="4" name="act_mail_to_email"/>
 	                            <field name="act_mail_to_watchers"/>

From 77c6be308100b69f6d9b83a1d43a236a32ad0b06 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 19 Aug 2010 18:28:22 +0200
Subject: [PATCH 25/32] [FIX] crm: Use the email and not the name for the From
 and To header,     because there is a bug in the smtplib.sendmail function of
 python     http://bugs.python.org/issue1050268 [FIX] crm: If the reply_to
 field is None, use an empty string to avoid the allow_none message from the
 xmlrpc library

bzr revid: stephane@openerp.com-20100819162822-ez9chgz26n4gm124
---
 addons/crm/wizard/crm_send_email.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 892b42ca460..ae4e87f30ad 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -104,7 +104,7 @@ class crm_send_new_email(osv.osv_memory):
                 res_id = hist.res_id
                 ref_id = hist.ref_id
                 case = case_pool.browse(cr, uid, res_id, context=context)
-            emails = [obj.email_to]
+            emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
             email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
             emails = filter(None, emails)
             body = obj.body
@@ -238,7 +238,7 @@ class crm_send_new_email(osv.osv_memory):
                  res.update({'email_cc': email_cc})
             if 'reply_to' in fields:
                 if hasattr(case, 'section_id'):
-                    res.update({'reply_to': case.section_id.reply_to})
+                    res.update({'reply_to': case.section_id.reply_to or ''})
             if 'state' in fields:
                 res['state'] = u'pending'
         return res

From d6c822190f55ab24861665b7672a83b0fb187903 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 19 Aug 2010 20:29:05 +0200
Subject: [PATCH 26/32] [IMP] crm: allow creating partners out of opportunities
 when it's not been done before

bzr revid: odo@openerp.com-20100819182905-9bqric1h0hx09lq2
---
 addons/crm/crm_opportunity_view.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index a1d02c5e33a..cb1d30954e1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -45,9 +45,15 @@
                         <page string="Opportunity">
                             <group col="4" colspan="2">
                                 <separator colspan="4" string="Contacts"/>
-                                <field name="partner_id" select="1"
-                                on_change="onchange_partner_id(partner_id, email_from)"
-                                colspan="2" />
+                                <group colspan="2">
+                                    <field name="partner_id" select="1"
+                                        on_change="onchange_partner_id(partner_id, email_from)"
+                                        colspan="2" />
+                                    <button name="%(action_crm_lead2partner)d"
+                                        icon="gtk-index" type="action"
+                                        string="Create"
+                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                                </group>
                                 <field name="partner_address_id"
                                 string="Contact"
                                 on_change="onchange_partner_address_id(partner_address_id, email_from)"

From f2c62186973e719c7f1f9e9fad727cbff87da3e1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 19 Aug 2010 20:31:05 +0200
Subject: [PATCH 27/32] [IMP] email_template, marketing_campaign: ugly
 workaround for making sure we don't have trouble when the database layer
 returns unicode strings

bzr revid: odo@openerp.com-20100819183105-cpopyej4p23xnyhv
---
 addons/email_template/email_template_account.py | 2 +-
 addons/marketing_campaign/marketing_campaign.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 803d11eb105..62f49646cc6 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -211,7 +211,7 @@ class email_template_account(osv.osv):
                     raise error
                 try:
                     if serv.has_extn('AUTH') or this_object.smtpuname or this_object.smtppass:
-                        serv.login(this_object.smtpuname, this_object.smtppass)
+                        serv.login(str(this_object.smtpuname), str(this_object.smtppass))
                 except Exception, error:
                     raise error
                 return serv
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index f0d6af479e7..c1674f85cc3 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -461,7 +461,7 @@ class marketing_campaign_transition(osv.osv):
         transition = self.browse(cr, uid, ids[0], context)
         if transition.trigger != 'time':
             raise ValueError('Delta is only relevant for timed transiton')
-        return relativedelta(**{transition.interval_type: transition.interval_nbr})
+        return relativedelta(**{str(transition.interval_type): transition.interval_nbr})
 
 
     _columns = {

From 7ac364b33eb7fd425cf11dd198b1e45a713d5353 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 19 Aug 2010 20:31:37 +0200
Subject: [PATCH 28/32] [IMP] marketing_campaign: add grouping by date in
 campaign reporting view

bzr revid: odo@openerp.com-20100819183137-9k9th8sftd9y9xfn
---
 addons/marketing_campaign/report/campaign_analysis_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index ec92ec83326..bb877a94080 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -63,6 +63,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Date" icon="terp-go-day" context="{'group_by':'date'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>

From 0f087f690c5cf7188ca70d05c9419e700b31d4d2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 19 Aug 2010 21:14:37 +0200
Subject: [PATCH 29/32] [IMP] marketing_campaign: fix icon for grouping by date
 in campaign reporting view

bzr revid: odo@openerp.com-20100819191437-vyfi26sph3wowzgo
---
 addons/marketing_campaign/report/campaign_analysis_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index bb877a94080..94d31fcb441 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -63,7 +63,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-day" context="{'group_by':'date'}"/>
+                    <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>

From fac448e00aec2618474367ce1dc461b786f74f43 Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Fri, 20 Aug 2010 03:36:23 +0530
Subject: [PATCH 30/32] [FIX] Auction : Account codes needed to be changed to
 avoid conflict with Any Chart of Accounts

bzr revid: jvo@tinyerp.com-20100819220623-lxq51ik03crlwqah
---
 addons/auction/auction_demo.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 45b157e6545..0103d4c3f8e 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -11,7 +11,7 @@
 
     <record model="account.account" id="auction_income_view">
 		<field name="name">Auction Adjudications</field>
-		<field name="code">0</field>
+		<field name="code">A0</field>
 		<field name="type">view</field>
 		<field name="currency_id" search="[('name','=','EUR')]"/>
 		<field name="parent_id" eval="0">
@@ -22,7 +22,7 @@
 
     <record model="account.account" id="auction_expense_view">
 		<field name="name">Auction Adjudication Expenses</field>
-		<field name="code">1</field>
+		<field name="code">A1</field>
 		<field name="type">view</field>
 		<field name="currency_id" search="[('name','=','EUR')]"/>
 		<field name="parent_id" eval="0">
@@ -33,7 +33,7 @@
 
 	<record model="account.account" id="auction_income">
 		<field name="name">Auction Adjudications</field>
-		<field name="code">7x*</field>
+		<field name="code">A7x*</field>
 		 <field name="user_type" ref="account.account_type_income"/> 
 		<field name="type">receivable</field>
 		<field name="currency_id" search="[('name','=','EUR')]"/>
@@ -42,7 +42,7 @@
 	
 	<record model="account.account" id="auction_expense">
 		<field name="name">Auction Adjudication Expenses</field>
-		<field name="code">6x*</field>
+		<field name="code">A6x*</field>
 		<field name="user_type" ref="account.account_type_expense"/>
 		<field name="type">payable</field>
 		<field name="currency_id" search="[('name','=','EUR')]"/>
@@ -51,7 +51,7 @@
 
 	<record model="account.account" id="auction_income_costs">
 		<field name="name">Auction Buyer Costs</field>
-		<field name="code">8x*</field>
+		<field name="code">A8x*</field>
 		<field name="type">payable</field>
 		<field name="currency_id" search="[('name','=','EUR')]"/>
 		<field name="parent_id" eval="auction_income_view"/>
@@ -59,7 +59,7 @@
 	</record>
 	<record model="account.account" id="auction_expense_costs">
 		<field name="name">Auction Seller Costs</field>
-		<field name="code">9x*</field>
+		<field name="code">A9x*</field>
 		<field name="type">receivable</field>
 		<field name="currency_id" search="[('name','=','EUR')]"/>
 		<field name="parent_id" eval="auction_expense_view"/>

From 3c29fc0847769d5fbc2576fdb6eaf6110154d782 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 20 Aug 2010 04:40:04 +0100
Subject: [PATCH 31/32] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100820034004-q5rca9ldjbmxfnnp
---
 addons/account/i18n/da.po                     |    6 +-
 addons/account/i18n/de.po                     |    6 +-
 addons/account/i18n/es_EC.po                  |  104 +-
 addons/account/i18n/hu.po                     |    6 +-
 addons/account/i18n/it.po                     |    4 +-
 addons/account/i18n/lt.po                     |    4 +-
 addons/account/i18n/pl.po                     |    6 +-
 addons/account/i18n/sq.po                     |    4 +-
 addons/account/i18n/sv.po                     |    6 +-
 addons/account/i18n/tr.po                     |    4 +-
 addons/account/i18n/zh_CN.po                  |    4 +-
 addons/account_analytic_analysis/i18n/bg.po   |    4 +-
 addons/account_analytic_analysis/i18n/fi.po   |    6 +-
 addons/account_analytic_analysis/i18n/it.po   |    4 +-
 addons/account_analytic_analysis/i18n/lt.po   |    6 +-
 addons/account_analytic_analysis/i18n/tr.po   |    4 +-
 addons/account_analytic_default/i18n/lt.po    |    6 +-
 addons/account_analytic_default/i18n/tr.po    |    4 +-
 addons/account_analytic_plans/i18n/lt.po      |    4 +-
 addons/account_analytic_plans/i18n/tr.po      |    4 +-
 addons/account_budget/i18n/lt.po              |    4 +-
 addons/account_budget/i18n/tr.po              |    6 +-
 addons/account_coda/i18n/ar.po                |    4 +-
 addons/account_followup/i18n/lt.po            |    4 +-
 addons/account_followup/i18n/tr.po            |    4 +-
 addons/account_invoice_layout/i18n/it.po      |    6 +-
 addons/account_invoice_layout/i18n/lt.po      |    6 +-
 addons/account_invoice_layout/i18n/tr.po      |    4 +-
 addons/account_payment/i18n/lt.po             |    6 +-
 addons/account_payment/i18n/tr.po             |    4 +-
 addons/account_report/i18n/it.po              |    6 +-
 addons/account_report/i18n/lt.po              |    4 +-
 addons/account_report/i18n/tr.po              |    4 +-
 addons/account_reporting/i18n/lt.po           |    4 +-
 addons/account_reporting/i18n/tr.po           |    4 +-
 addons/account_tax_include/i18n/tr.po         |    4 +-
 addons/account_voucher/i18n/lt.po             |    4 +-
 addons/account_voucher/i18n/tr.po             |    4 +-
 .../analytic_journal_billing_rate/i18n/tr.po  |    4 +-
 addons/analytic_user_function/i18n/tr.po      |    4 +-
 addons/auction/i18n/lt.po                     |    4 +-
 addons/auction/i18n/nl.po                     |    6 +-
 addons/auction/i18n/tr.po                     |    6 +-
 addons/audittrail/i18n/lt.po                  |    6 +-
 addons/audittrail/i18n/tr.po                  |    4 +-
 addons/audittrail/i18n/zh_CN.po               |    4 +-
 addons/base_contact/i18n/lt.po                |    4 +-
 addons/base_contact/i18n/tr.po                |    6 +-
 addons/base_contact/i18n/zh_CN.po             |    4 +-
 addons/base_iban/i18n/tr.po                   |    4 +-
 addons/base_module_quality/i18n/tr.po         |    4 +-
 addons/base_module_record/i18n/tr.po          |    6 +-
 addons/base_report_creator/i18n/tr.po         |    4 +-
 addons/base_report_designer/i18n/tr.po        |    6 +-
 addons/base_setup/i18n/tr.po                  |    6 +-
 addons/base_vat/i18n/tr.po                    |    4 +-
 addons/board/i18n/tr.po                       |    6 +-
 addons/crm/i18n/fi.po                         |    6 +-
 addons/crm/i18n/hr.po                         |    6 +-
 addons/crm/i18n/lt.po                         |    4 +-
 addons/crm/i18n/pl.po                         |    6 +-
 addons/crm/i18n/pt.po                         |    6 +-
 addons/crm/i18n/sk.po                         |    4 +-
 addons/crm/i18n/tr.po                         |    6 +-
 addons/crm_profiling/i18n/tr.po               |    4 +-
 addons/delivery/i18n/ru.po                    |    6 +-
 addons/delivery/i18n/tr.po                    |    4 +-
 addons/document/i18n/mn.po                    |    4 +-
 addons/document/i18n/ru.po                    |    4 +-
 addons/document/i18n/tr.po                    |    4 +-
 addons/document/i18n/zh_CN.po                 |    4 +-
 addons/document_ics/i18n/tr.po                |    4 +-
 addons/document_ics/i18n/zh_CN.po             |    4 +-
 addons/hr/i18n/lt.po                          |    4 +-
 addons/hr/i18n/pt_BR.po                       |    6 +-
 addons/hr/i18n/tr.po                          |    4 +-
 addons/hr/i18n/zh_CN.po                       |    4 +-
 addons/hr_attendance/i18n/fi.po               |    6 +-
 addons/hr_attendance/i18n/it.po               |    6 +-
 addons/hr_attendance/i18n/pt_BR.po            |    4 +-
 addons/hr_attendance/i18n/tr.po               |    4 +-
 addons/hr_contract/i18n/tr.po                 |    4 +-
 addons/hr_expense/i18n/pt_BR.po               |    4 +-
 addons/hr_expense/i18n/tr.po                  |    4 +-
 addons/hr_holidays/i18n/hi.po                 |  725 +++++++++
 addons/hr_holidays/i18n/it.po                 |    6 +-
 addons/hr_holidays/i18n/lt.po                 |    6 +-
 addons/hr_holidays/i18n/tr.po                 |    4 +-
 addons/hr_holidays/i18n/zh_CN.po              |    4 +-
 addons/hr_timesheet/i18n/tr.po                |    4 +-
 addons/hr_timesheet_invoice/i18n/tr.po        |    4 +-
 addons/hr_timesheet_sheet/i18n/lt.po          |    6 +-
 addons/hr_timesheet_sheet/i18n/tr.po          |    4 +-
 addons/idea/i18n/lt.po                        |    6 +-
 addons/idea/i18n/zh_CN.po                     |    4 +-
 addons/l10n_be/i18n/tr.po                     |    6 +-
 addons/l10n_ch/i18n/it.po                     |    6 +-
 addons/l10n_ch/i18n/tr.po                     |    4 +-
 addons/l10n_ch_chart_c2c_pcg/i18n/tr.po       |    4 +-
 addons/l10n_chart_uk_minimal/i18n/tr.po       |    6 +-
 addons/l10n_fr/i18n/tr.po                     |    4 +-
 addons/l10n_lu/i18n/tr.po                     |    4 +-
 addons/membership/i18n/tr.po                  |    4 +-
 addons/mrp/i18n/pt_BR.po                      |    4 +-
 addons/mrp/i18n/tr.po                         |    6 +-
 addons/mrp/i18n/zh_TW.po                      |    6 +-
 addons/mrp_operations/i18n/tr.po              |    4 +-
 addons/mrp_repair/i18n/tr.po                  |    4 +-
 addons/mrp_subproduct/i18n/tr.po              |    4 +-
 addons/olap/i18n/nl.po                        | 1399 +++++++++++++++++
 addons/olap_crm/i18n/it.po                    |    6 +-
 addons/point_of_sale/i18n/lt.po               |    4 +-
 addons/point_of_sale/i18n/tr.po               |    4 +-
 addons/process/i18n/tr.po                     |    4 +-
 addons/product/i18n/lt.po                     |    4 +-
 addons/product/i18n/mn.po                     |    4 +-
 addons/product/i18n/pt_BR.po                  |    6 +-
 addons/product/i18n/sr.po                     |    4 +-
 addons/product/i18n/tr.po                     |    4 +-
 addons/product/i18n/zh_CN.po                  |    4 +-
 addons/product_margin/i18n/pt_BR.po           |    4 +-
 addons/product_margin/i18n/tr.po              |    4 +-
 addons/profile_accounting/i18n/tr.po          |    4 +-
 addons/project/i18n/lt.po                     |    6 +-
 addons/project/i18n/ru.po                     |    6 +-
 addons/project/i18n/tr.po                     |    6 +-
 addons/project_gtd/i18n/tr.po                 |    4 +-
 addons/project_mrp/i18n/tr.po                 |    6 +-
 addons/project_retro_planning/i18n/tr.po      |    6 +-
 addons/project_scrum/i18n/tr.po               |    4 +-
 addons/project_timesheet/i18n/tr.po           |    6 +-
 addons/purchase/i18n/et.po                    |    4 +-
 addons/purchase/i18n/lt.po                    |    4 +-
 addons/purchase/i18n/tr.po                    |    4 +-
 addons/report_intrastat/i18n/pt_BR.po         |    4 +-
 addons/report_intrastat/i18n/tr.po            |    4 +-
 addons/resource/i18n/fr.po                    |   31 +-
 addons/sale/i18n/pt_BR.po                     |    4 +-
 addons/sale/i18n/sr.po                        |    6 +-
 addons/sale/i18n/sv.po                        |    4 +-
 addons/sale/i18n/tr.po                        |    6 +-
 addons/sale/i18n/uk.po                        |    4 +-
 addons/sale/i18n/vi.po                        |    4 +-
 addons/sale_journal/i18n/pl.po                |    6 +-
 addons/sale_journal/i18n/tr.po                |    4 +-
 addons/stock/i18n/bs.po                       |    4 +-
 addons/stock/i18n/de.po                       |    6 +-
 addons/stock/i18n/it.po                       |    4 +-
 addons/stock/i18n/pl.po                       |    6 +-
 addons/stock/i18n/pt_BR.po                    |    4 +-
 addons/stock/i18n/tr.po                       |    6 +-
 addons/stock_invoice_directly/i18n/tr.po      |    6 +-
 addons/stock_location/i18n/tr.po              |    4 +-
 addons/stock_no_autopicking/i18n/tr.po        |    4 +-
 addons/subscription/i18n/tr.po                |    4 +-
 addons/warning/i18n/tr.po                     |    4 +-
 addons/wiki/i18n/tr.po                        |    4 +-
 157 files changed, 2557 insertions(+), 422 deletions(-)
 create mode 100644 addons/hr_holidays/i18n/hi.po
 create mode 100644 addons/olap/i18n/nl.po

diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 16400cb3d7e..ccd179f421d 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:26+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Danish <da@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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 9d35f8940b8..f220a36c486 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 9e0ddc90c16..cc2f3139b40 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 18:15+0000\n"
+"PO-Revision-Date: 2010-08-20 00:46+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -715,7 +715,7 @@ msgstr "Nota de Debito"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Seleccione el período de análisis"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -914,7 +914,7 @@ msgstr "Importe de Moneda"
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Cuenta categoría gastos"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -1066,7 +1066,7 @@ msgstr "Nueva factura de proveedor"
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Importe pagado"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -1078,7 +1078,7 @@ msgstr "Factura de cliente"
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Escoja el ejercicio fiscal"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1094,7 +1094,7 @@ msgstr "Imprimir diarios analíticos"
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Núm. de comprobante"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1108,12 +1108,12 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Desajuste total"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Código para el cálculo de precios con impuestos incluidos"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -1127,12 +1127,12 @@ msgstr "Códigos de impuestos"
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Plantilla plan contable"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Cuenta de la categoría de ingresos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
@@ -1144,7 +1144,7 @@ msgstr "Nueva cuenta analítica"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Plantillas de Tipos de Contribuyentes"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1155,12 +1155,12 @@ msgstr "Precio unitario"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Periodo desde :"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "Plan de Cuentas Multiple"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
@@ -1170,13 +1170,13 @@ msgstr "Diario de ventas"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "El importe expresado en otra divisa opcional."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Plantilla de Tipo de Contribuyente"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1202,7 +1202,7 @@ msgstr "¿Está seguro que desea cerrar el ejercicio fiscal?"
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Recibo bancario"
 
 #. module: account
 #: view:res.partner:0
@@ -1217,7 +1217,7 @@ msgstr "Lista plantilla impuestos"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Importe factura"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
@@ -1248,7 +1248,7 @@ msgstr "Moneda de la compañía"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Fiscal Position Template Account Mapping"
-msgstr ""
+msgstr "Mapeo cuentas plantilla posición fiscal"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1258,12 +1258,12 @@ msgstr "Cuenta analítica padre"
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Conciliación con desfase"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Importe impuestos/base"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
@@ -1293,7 +1293,7 @@ msgstr "Importe fijo"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Haber analítico"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -1327,7 +1327,7 @@ msgstr "Valor"
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Cuenta de desajuste"
 
 #. module: account
 #: field:account.model.line,model_id:0
@@ -1339,17 +1339,17 @@ msgstr "Modelo"
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "Cerrar un ejercicio fiscal"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Homólogo centralizado"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Mensaje"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1388,7 +1388,7 @@ msgstr "El método de cálculo del importe del impuesto."
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr ""
+msgstr "Asientos contables validados."
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1409,7 +1409,7 @@ msgstr "Archivo electrónico"
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Haber del cliente"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -1474,7 +1474,7 @@ msgstr "Mostrar cuentas "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr ""
+msgstr "Línea de conciliación de extracto"
 
 #. module: account
 #: view:account.tax:0
@@ -1488,7 +1488,7 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr ""
+msgstr "Desajuste"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1512,17 +1512,17 @@ msgstr "Cerrar estados"
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "Asistente de Configuracion de Compañia"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Diario de Reembolsos"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
@@ -1542,7 +1542,7 @@ msgstr "Tel. :"
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Importe código impuesto"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -1577,7 +1577,7 @@ msgstr "Generar plan contable a partir de una plantilla de plan contable"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Declaraciones oficiales"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -1634,7 +1634,7 @@ msgstr "Cuentas a cobrar y pagar"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Líneas de asientos periódicos"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1663,7 +1663,7 @@ msgstr "Cerrar período"
 #. module: account
 #: rml:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -1678,7 +1678,7 @@ msgstr "Tipo de cuentas permitidas (vacío para ningún control)"
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Saldo inicial"
 
 #. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1696,7 +1696,7 @@ msgstr "Ctdad máx."
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Reembolsar Factura"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_tree
@@ -1754,7 +1754,7 @@ msgstr "Incluir en importe base"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Diferencia haber"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
@@ -1765,7 +1765,7 @@ msgstr "Romper conciliación de los asientos"
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Factura pre-generada de control"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -1845,18 +1845,18 @@ msgstr "Fecha o código"
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Gestor contable"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "a :"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
 #: wizard_field:account.move.line.reconcile,init_partial,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Importe debe"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -1888,7 +1888,7 @@ msgstr "Fecha inicial"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "x Diario facturas rectificativas (abono) de gastos"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1909,40 +1909,40 @@ msgstr "Cuentas permitidas (vacío para ningún control)"
 #. module: account
 #: view:account.invoice:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Base imponible"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Cuenta impuestos de facturas"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Líneas analíticas"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_pay
 msgid "Pay invoice"
-msgstr ""
+msgstr "Pagar factura"
 
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Error: Número BVR inválido (checksum erróneo)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Facturas de cliente en borrador"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Línea de subscripción de contabilidad"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 00a811a1ed0..f70028a98ce 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:17+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 b470e328790..d2f6481f860 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 20:38+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+0000\n"
 "Last-Translator: Andrea <amarin@mr-service.it>\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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index b40a829b01e..399ad4eda5e 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:48+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index b660713e522..da387dd02e7 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index adbb61ec3fe..d3e5b8652a1 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:08+0000\n"
+"PO-Revision-Date: 2010-08-19 05:37+0000\n"
 "Last-Translator: bokshas <astritbokshi@gmail.com>\n"
 "Language-Team: Albanian <sq@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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 5794606aec4..95f8c7ae577 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:18+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <> <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 454819e832a..44c1feaaa79 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:19+0000\n"
+"PO-Revision-Date: 2010-08-19 05:48+0000\n"
 "Last-Translator: Omer Barlas <omer@barlas.com.tr>\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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 74a8e214bf3..61b1c84c474 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"PO-Revision-Date: 2010-08-19 05:40+0000\n"
 "Last-Translator: Jeff Wang <wjfonhand@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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 12836665adf..0242dbda2b9 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:49+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index e9b77e5a3c3..2b97b611d9e 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index 24abf9cb3d9..fe58b8d450a 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 12:15+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 5c9e923caa5..98e35c0e8d5 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:28+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index f8af5b33671..b892a323a6a 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:50+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 2a1ea6f65c3..880d040d749 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index 45b75eb3d4d..eef7f97f4eb 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:50+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 715d83d8430..8009241941e 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:49+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 9ac00914a91..9a82197d89c 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:48+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 456b0084aea..51eece75104 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:28+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 8f5c64a6486..ae03662e873 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:28+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 39bdf74e9a8..678e7961911 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+0000\n"
 "Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
 "Language-Team: Arabic <ar@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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 7e04757d27d..9c0d00ec6dd 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:48+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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index c9c84016309..cd934d786c5 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:50+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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/it.po b/addons/account_invoice_layout/i18n/it.po
index 83e3db9b05e..d3d36f34324 100644
--- a/addons/account_invoice_layout/i18n/it.po
+++ b/addons/account_invoice_layout/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 16:43+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index 671eacba502..4f233e57ffb 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index 5e314bde9c4..4350e7fac7e 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:37+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 25f73365d4d..f2d3d5c8722 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index a137f83d18f..2685c2afeda 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 404a92e1835..c672d816ae4 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 16:40+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index 5cc0cbeddd2..43443d10bf9 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:50+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 0444a6ed394..1e6843c2e6f 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:25+0000\n"
+"PO-Revision-Date: 2010-08-19 05:52+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index e902df63647..1b4f2e593ac 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:19+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index 84bf8fa96e0..e894d1e3d8c 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:19+0000\n"
+"PO-Revision-Date: 2010-08-19 05:53+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index 1d8ac47efbd..97a384c4ba7 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 1fe031f7386..419215d661f 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:34+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 806da82f8db..84688fefa25 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 917066a7ffb..698bc1f3bbe 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index ff8b24a9e5d..5e9d2a2f653 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 15d6961e3fe..dde87acd819 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"PO-Revision-Date: 2010-08-19 05:48+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 73cbd3acb0e..8409267c92d 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:36+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index d490960221f..267916e632f 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:02+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index a226aff41fc..0c56805b412 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index d184c4bb7d6..b98c59be75d 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 3cb2ad64af8..75af44f450d 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:25+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 258c4026c3a..57d6ce90ce6 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:48+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index 98041e5ad3b..fb0e40338ed 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:12+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index b22c7a3da96..02181f05607 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:19+0000\n"
+"PO-Revision-Date: 2010-08-19 05:53+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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index e15efd8046f..f63ebf0ee12 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:18+0000\n"
+"PO-Revision-Date: 2010-08-19 05:53+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index 57d960ff5b6..0ec39b07132 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
+"PO-Revision-Date: 2010-08-19 05:49+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 18b7a8ff810..f3bf7d935f9 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:03+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 03848ddae61..e5a4341502e 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:49+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 09d23fe2810..c2b1567372a 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:16+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index a6e2227752a..a568d349d6b 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index b83dda61644..d9bbd9cecc5 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:33+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 12b54a55b96..7490b1b5016 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index b9a60226fe8..484b0cae327 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index b34dea45bbc..5ccb24fcb02 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index b6ed64d277a..6ad0e157d2a 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 13:20+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index be7b1ff39f1..726f96b3a94 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 13:24+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 91d81c9bf64..2b2cdad6aa2 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 13:25+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index d29f59185c8..16a837df509 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index c6e3f44180d..f25a15fd991 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index 5af7aa1052c..100626f18da 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:15+0000\n"
+"PO-Revision-Date: 2010-08-19 05:54+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 2a6ab5cd87a..7331e1252f3 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 0f816ecf186..446c3d44aa6 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:49+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 30a3ef39bac..47f601e6745 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 9fb4d23e0b9..8d90f0a5b86 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
 "Last-Translator: devcode <klaider@yandex.ru>\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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 23a52a9867a..640ca77198c 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:15+0000\n"
+"PO-Revision-Date: 2010-08-19 05:54+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index fb543513804..7bd3d0af319 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:32+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index e9561343930..4865c6f187a 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 263d41e2e50..5408fe717e7 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index a90930f4046..f169ea95771 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index d80733593d8..aa94743ad97 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 15c7dea6c32..d703327eea3 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:35+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index fa5239b4e84..221dcc799ba 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index e2a9a4529a1..d4da9961fee 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index ef5617dbce0..a02260204ed 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:27+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index d4a3ec5dd78..4a2eaeb5eff 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 86e7ab32edb..24d35b0df14 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
 "Last-Translator: Angel Spy <melissadilara@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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index beaae108c7e..b12c3462768 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:37+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 918874de719..f97a3d5a3a6 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 86743bebab1..3cc30393170 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
new file mode 100644
index 00000000000..f4046bd65e4
--- /dev/null
+++ b/addons/hr_holidays/i18n/hi.po
@@ -0,0 +1,725 @@
+# Hindi 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-08-19 09:53+0000\n"
+"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
+"Language-Team: Hindi <hi@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-08-20 03:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "New Holidays Request"
+msgstr "नया छुट्टी के लिए अनुरोध"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
+msgid "All Holidays Requests"
+msgstr "सभी छुट्टी अनुरोध"
+
+#. module: hr_holidays
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "कार्य की परिभाषा में मॉडल का नाम अमान्य है."
+
+#. module: hr_holidays
+#: field:hr.holidays.per.user,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "शेष छुट्टी"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
+msgid "Requests Awaiting for Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "भूरा"
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+msgid "of the"
+msgstr ""
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+msgid "Off-Days' Summary"
+msgstr "Off-दिन 'सारांश"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: view:hr.holidays.per.user:0
+#: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
+msgid "Employee Holidays"
+msgstr "कर्मचारी छुट्टियाँ"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.per.user:0
+#: field:hr.holidays.per.user,holiday_ids:0
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+#: model:process.node,name:hr_holidays.process_node_holidays0
+msgid "Holidays"
+msgstr "छुट्टियां"
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+msgid "to"
+msgstr "को"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "हल्का हरा"
+
+#. module: hr_holidays
+#: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
+msgid "Employee Declaration"
+msgstr "कर्मचारी घोषणा"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+#: model:process.transition.action,name:hr_holidays.process_transition_action_validate0
+msgid "Validate"
+msgstr "मान्य"
+
+#. module: hr_holidays
+#: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
+msgid "Refused Request"
+msgstr "अनुरोध मना कर दिया"
+
+#. module: hr_holidays
+#: model:process.node,name:hr_holidays.process_node_approved0
+msgid "Approved"
+msgstr "स्वीकृत"
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.employee,init,holiday_type:0
+msgid "Both"
+msgstr "दोनों"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "अस्वीकार"
+
+#. module: hr_holidays
+#: wizard_button:hr.holidays.summary,notify,end:0
+#: wizard_button:hr.holidays.summary.employee,notify,end:0
+msgid "Ok"
+msgstr "ओके"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
+msgid "My Holidays Requests"
+msgstr "मेरी छुट्टियों का अनुरोध"
+
+#. module: hr_holidays
+#: field:hr.holidays,notes:0
+#: field:hr.holidays.per.user,notes:0
+msgid "Notes"
+msgstr "टिप्पणी"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status:0
+#: field:hr.holidays.log,holiday_status:0
+#: field:hr.holidays.per.user,holiday_status:0
+msgid "Holiday's Status"
+msgstr "छुट्टियों की स्थिति"
+
+#. module: hr_holidays
+#: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
+msgid "Request is refused."
+msgstr "अनुरोध मना कर दिया है."
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Holidays Management"
+msgstr "छुट्टियों का प्रबंधन"
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+msgid "Analyze from"
+msgstr "विश्लेषण से"
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Holidays"
+msgstr "छुट्टियों का सारांश"
+
+#. module: hr_holidays
+#: model:process.node,note:hr_holidays.process_node_calendar0
+msgid "The holiday is set in the calendar"
+msgstr "छुट्टी कैलेंडर में सेट है"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Holiday status"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+msgid "Holidays Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "Vacation end day"
+msgstr "छुट्टी का अंतिम दिन"
+
+#. module: hr_holidays
+#: view:hr.holidays.per.user:0
+msgid "Holidays Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,note:hr_holidays.process_node_legaldeclaration0
+msgid "Legal Declaration Document to declare new employee"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
+msgid "Holidays Per User"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Define holiday status"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary,init,holiday_type:0
+#: selection:hr.holidays.summary.employee,init,holiday_type:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_field:hr.holidays.summary,init,date_from:0
+#: wizard_field:hr.holidays.summary.employee,init,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
+#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
+msgid "My Awaiting Confirmation Holidays Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+msgid "Employee_id"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
+msgid "Encoding of annual available holidays."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.log,employee_id:0
+#: field:hr.holidays.per.user,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "Waiting Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
+msgid "Employee get holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.log,nb_holidays:0
+msgid "Number of Holidays Requested"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+msgid "My Holiday Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: view:hr.holidays.per.user:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,name:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Holiday Status"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_view:hr.holidays.summary,init:0
+#: wizard_view:hr.holidays.summary.employee,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,note:hr_holidays.process_node_approved0
+msgid "His manager approves the request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
+msgid "If holidays available, employee can take it and fill it."
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_view:hr.holidays.summary.employee,notify:0
+msgid "You have to select at least 1 Employee. Try again."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
+msgid "My Validated Holidays Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_field:hr.holidays.summary.employee,init,emp:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,number_of_days:0
+msgid "Number of Days in this Holiday Request"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.per.user:0
+#: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
+#: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
+msgid "Holidays Per Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.log,holiday_user_id:0
+msgid "Holidays user"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_log
+msgid "hr.holidays.log"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
+msgid "Print Summary of Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,name:hr_holidays.process_node_calendar0
+msgid "Calendar"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_from:0
+msgid "Vacation start day"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.module.module,description:hr_holidays.module_meta_information
+msgid ""
+"Human Ressources: Holidays tracking and workflow\n"
+"\n"
+"    This module allows you to manage holidays and holidays requests. For "
+"each employee, you can also define a number of available holidays per "
+"holiday status.\n"
+"\n"
+"    Note that:\n"
+"    - A synchronisation with an internal agenda (use of the CRM module) is "
+"possible: in order to automatically create a case when an holiday request is "
+"accepted, you have to link the holidays status to a case section. You can "
+"set up this info and your colour preferences in\n"
+"                HR / Configuration / Holidays Status\n"
+"    - An employee can make a negative holiday request (holiday request of -2 "
+"days for example), this is considered by the system as an ask for more off-"
+"days. It will increase his total of that holiday status available (if the "
+"request is accepted).\n"
+"    - There are two ways to print the employee's holidays:\n"
+"        * The first will allow to choose employees by department and is used "
+"by clicking the menu item located in\n"
+"                HR / Holidays Request / Print Summary of Holidays\n"
+"        * The second will allow you to choose the holidays report for "
+"specific employees. Go on the list\n"
+"                HR / Employees / Employees\n"
+"            then select the ones you want to choose, click on the print icon "
+"and select the option\n"
+"                'Print Summary of Employee's Holidays'\n"
+"    - The wizard allows you to choose if you want to print either the "
+"Confirmed & Validated holidays or only the Validated ones. These states must "
+"be set up by a user from the group 'HR' and with the role 'holidays'. You "
+"can define these features in the security tab from the user data in\n"
+"                Administration / Users / Users\n"
+"            for example, you maybe will do it for the user 'admin'.\n"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_view:hr.holidays.summary,notify:0
+#: wizard_view:hr.holidays.summary.employee,notify:0
+msgid "Notification"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,note:hr_holidays.process_node_holidaysrequest0
+msgid "Employee fills in a request for holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,note:hr_holidays.process_transition_setholiday0
+msgid "Holiday is set in the calendar."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
+#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
+msgid "My Available Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
+msgid "My Refused Holidays Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,name:hr_holidays.process_transition_setholiday0
+msgid "Set Holiday"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
+msgid "My Draft Holidays Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.per.user,max_leaves:0
+msgid "Maximum Leaves Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,state:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
+msgid "My Holidays Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color of the status"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary,init,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.per.user,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+msgid "holidays."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+msgid "draft"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.per.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
+msgid "Document for employee"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.log,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
+msgid "Reufse"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "Holiday manager"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.per.user,active:0
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
+msgid "My Holidays Request Draft"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
+msgid "Approved Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,name:hr_holidays.process_node_holidaysrequest0
+msgid "Holidays Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
+msgid "Holidays Requests Awaiting for Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.per.user:0
+msgid "General Information"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+#: wizard_button:hr.holidays.summary,init,end:0
+#: wizard_button:hr.holidays.summary.employee,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
+msgid "Holidays def Request"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary,init,holiday_type:0
+#: selection:hr.holidays.summary.employee,init,holiday_type:0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
+msgid "My Holidays Request Refused"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_button:hr.holidays.summary,init,checkdept:0
+#: wizard_button:hr.holidays.summary.employee,init,checkemp:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.wizard,name:hr_holidays.holidays_summary
+#: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
+msgid "Print Summary of Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_field:hr.holidays.summary,init,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,state:0
+#: model:process.node,name:hr_holidays.process_node_refused0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
+msgid "Request is approved."
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
+msgid "Holidays Definition"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_field:hr.holidays.summary,init,holiday_type:0
+#: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0
+msgid "Case"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_user_id:0
+msgid "Holiday per user"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,note:hr_holidays.process_node_holidays0
+msgid "Encode number of available holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,name:hr_holidays.process_node_legaldeclaration0
+msgid "Secretariat Social"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
+msgid "Human Resources: Holidays management"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.process,name:hr_holidays.process_process_holidaysprocess0
+msgid "Holidays Process"
+msgstr ""
+
+#. module: hr_holidays
+#: wizard_view:hr.holidays.summary,notify:0
+msgid "You have to select at least 1 Department. Try again."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
+msgid "My Holidays Request Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.log,holiday_req_id:0
+msgid "Holiday Request ID"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: model:process.node,note:hr_holidays.process_node_refused0
+msgid "His manager refuses the request"
+msgstr ""
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 0bdf798f896..f11d29d5dde 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:25+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index 93212addd62..226e24b6183 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:13+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index f8eff0bd67c..97f9db5b6b6 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"PO-Revision-Date: 2010-08-19 05:42+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 0469cf8fad2..9dbe9a2c01a 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 70f18dd32d7..1f3676e4cfb 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:17+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 642fbc40e89..95f561aede0 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 8a9b0fdf162..566be19f790 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 12:44+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 48943f0be71..8a8e98c2b6c 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index a18e70f5df5..072100485c8 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:17+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index 8257313d245..ef1cbfe3c18 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:26+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index f0fd19a821c..2a08a7415bc 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:32+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index e82290b173c..e01d6abb57f 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:21+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index c748ad51b56..06c83d0cec6 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:17+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index 3a30ea66ca3..dcccd81b72b 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index e79c8dc41d6..5d2aab024a7 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:16+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index fb19010e27b..b922562e8b4 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 356eaf412f6..cd00420e285 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:31+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index ea6fcf9ae05..7c2ec8fb466 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:17+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 6ab1bf77129..288f2ee6558 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"PO-Revision-Date: 2010-08-19 05:44+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 5b50b9caa22..b065a3fba69 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:34+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index ce73521928b..aebd50b896a 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:29+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 82815c93bc7..68f47a573f6 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:33+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 24cb464db71..fae0f4a3492 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 76d7515818b..ceebd2904b7 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/olap/i18n/nl.po b/addons/olap/i18n/nl.po
new file mode 100644
index 00000000000..0a5c91249ee
--- /dev/null
+++ b/addons/olap/i18n/nl.po
@@ -0,0 +1,1399 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:24+0000\n"
+"PO-Revision-Date: 2010-08-19 06:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@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-08-20 03:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/olap_crm/i18n/it.po b/addons/olap_crm/i18n/it.po
index 76c8378ea2b..a1c45470805 100644
--- a/addons/olap_crm/i18n/it.po
+++ b/addons/olap_crm/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-26 05:29+0000\n"
-"PO-Revision-Date: 2010-08-18 13:38+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_crm
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index fab2c74a7f3..3c951d1b83b 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:23+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index ab6b47445d8..a7a82b5b10c 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:26+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index 41a9c62e777..b7cc3067661 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 12:43+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-08-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index a9d65ddcfb0..8a7bf28a707 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:30+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index ec7010aeb9c..8d72fe7f38a 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 3bab518990e..b6dabf65204 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index ad07d952ddd..103e1e5ad21 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:34+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+0000\n"
 "Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.com>\n"
 "Language-Team: Serbian <sr@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index b2aaa854b13..2d3a7d5e0a2 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 12:46+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+0000\n"
 "Last-Translator: Angel Spy <melissadilara@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 36d2a49f1f2..d3214b6f45f 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index f93329bfa4b..a035609206a 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 70d14fbd813..d521bf17121 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:34+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
index 99da0f543e8..604446b7423 100644
--- a/addons/profile_accounting/i18n/tr.po
+++ b/addons/profile_accounting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index bdb1191540d..1dfde4cdf44 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:31+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index c96a821e572..528427ca61b 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 4ad024d1cbe..abfd51442d5 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:01+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 41938de1c47..cc85de8b0aa 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index ed09204e54c..e41b0688de2 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:28+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index e2870a49af1..6a6ac248d23 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:18+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 8e1744b6025..8303129c044 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:08+0000\n"
+"PO-Revision-Date: 2010-08-19 05:49+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 127eee4f42f..bbb3da79b08 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 2c203cd43a7..8f42de9da0d 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+0000\n"
 "Last-Translator: lyyser <logard.1961@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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 1ef258095b2..aa087191cff 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:26+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 344d621f94a..626e1226cc1 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:21+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index bc8b66be803..ef2307722f7 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 2156a3fab56..35871e5e787 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:33+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index 7e201b5aa73..ca19ddbb5dc 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -6,18 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-18 06:50:02+0000\n"
-"PO-Revision-Date: 2010-08-18 06:50:02+0000\n"
+"POT-Creation-Date: 2010-08-18 06:50+0000\n"
+"PO-Revision-Date: 2010-08-19 10:49+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"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
-msgid "If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
 msgstr ""
 
 #. module: resource
@@ -27,7 +30,8 @@ msgstr ""
 
 #. module: resource
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
 #. module: resource
@@ -186,7 +190,8 @@ msgstr ""
 
 #. module: resource
 #: model:ir.module.module,description:resource.module_meta_information
-msgid "\n"
+msgid ""
+"\n"
 "    Module for resource management\n"
 "     A resource represent something that can be scheduled\n"
 "     (a developer on a task or a workcenter on manufacturing orders).\n"
@@ -198,7 +203,9 @@ msgstr ""
 
 #. module: resource
 #: help:resource.resource,active:0
-msgid "If the active field is set to true, it will allow you to hide the resource record without removing it."
+msgid ""
+"If the active field is set to true, it will allow you to hide the resource "
+"record without removing it."
 msgstr ""
 
 #. module: resource
@@ -254,7 +261,11 @@ msgstr ""
 
 #. module: resource
 #: help:resource.resource,time_efficiency:0
-msgid "This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
 msgstr ""
 
 #. module: resource
@@ -307,4 +318,4 @@ msgstr ""
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
-msgstr ""
\ No newline at end of file
+msgstr ""
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index f184df4700d..e15b28ac84c 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 12:49+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@gmail.com>\n"
 "Language-Team: <pt@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 48914f5d014..8f0df74962f 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:18+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 06a4c1c2210..149170b20e4 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+0000\n"
 "Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index ca4766c17a4..77d6ac24e53 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:12+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index a88be72e241..7cc8b5245a9 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:27+0000\n"
+"PO-Revision-Date: 2010-08-19 05:37+0000\n"
 "Last-Translator: Jay (OpenERP) <jvo@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 5d9667b1a06..a656800033e 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:15+0000\n"
+"PO-Revision-Date: 2010-08-19 05:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Vietnamese <vi@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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 37fcbc18ea9..b74af62af04 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:07+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index d05cb581ae4..0cf719af5bb 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:16+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index be5648330d6..639387defad 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index ecde2b77c08..c655987bfbd 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:16+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 87b5b5bc25d..f4dd0433689 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:08+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 97886df994a..ebf7539312b 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:36+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index d1a0b88cf86..d58162e66cd 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:24+0000\n"
 "Last-Translator: Renato Lima - http://www.akretion.com "
 "<renatonlima@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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 1881946505f..1d26d5c13ed 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:19+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index cb34ce47df0..2d336b2a05f 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:08+0000\n"
-"Last-Translator: vra (openerp) <Unknown>\n"
+"PO-Revision-Date: 2010-08-19 05:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 06410910d08..b72ff5a2793 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 6574d1c560f..e25ac4d1abf 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:37+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-08-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 84cd0eed7ea..66890cba860 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:31+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-08-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index ba86c85cb65..e65e62f7fa9 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:50+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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index 7eba57a241c..fe6dfdb2450 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:52+0000\n"
 "Last-Translator: adsiz_1029@hotmail.com <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-08-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki

From bd16462c71dd60a524ad74930e0fc21190196092 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Fri, 20 Aug 2010 09:46:03 +0530
Subject: [PATCH 32/32] [IMP] Account, purchase, sale, hr_expense: set domain
 to open analytic accounts (not open root account)

bzr revid: mra@mra-laptop-20100820041603-rkdf80zf7nk7nua8
---
 .../account_analytic_default_view.xml          |  4 ++--
 .../account_budget/crossovered_budget_view.xml |  4 ++--
 addons/account_voucher/voucher_view.xml        | 18 +++++++++---------
 addons/hr_expense/hr_expense_view.xml          |  4 ++--
 addons/purchase/purchase_view.xml              |  4 ++--
 addons/sale_crm/wizard/crm_make_sale_view.xml  |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 21ca2d0e4aa..2513d1229b6 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="Analytic Defaults">
                     <field name="sequence"/>
-                    <field name="analytic_id" required="1"/>
+                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -25,7 +25,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults">
-                    <field name="analytic_id" required="1"/>
+                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
                     <field name="sequence"/>
                     <separator string="Conditions" colspan="4"/>
                     <field name="product_id"/>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 30ae45003be..51005d989ce 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -85,7 +85,7 @@
                                 </graph>
                                 <tree string="Budget Lines"  editable="top">
                                     <field name="crossovered_budget_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
                                     <field name="date_from"/>
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
@@ -96,7 +96,7 @@
                                 </tree>
                                 <form string="Budget Lines">
                                     <field name="crossovered_budget_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
                                     <field name="date_from"/>
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index f02bb4805f9..f692654c73b 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -45,7 +45,7 @@
                                     <field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
                                     <field name="amount"/>
                                     <field name="ref"/>
-                                    <field name="account_analytic_id"/>
+                                    <field name="account_analytic_id" domain="[('parent_id','!=',False)]"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -108,13 +108,13 @@
                         <separator orientation="vertical"/>
                         <field name="number" select='1'/>
                         <field name="account_id" select="1"/>
-                        <field name="partner_id" select='1'/>                       
+                        <field name="partner_id" select='1'/>
                         <field name="date" select='1'/>
                     </group>
                     <newline/>
                     <group col='8' colspan='4'>
                         <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
-                        <field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>                        
+                        <field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." col='8' colspan='4'>
@@ -155,7 +155,7 @@
                     <newline/>
                     <group col='8' colspan='4'>
                         <field name="journal_id" widget="selection" select="1"/>
-                        <field name="period_id" select="1"/>                        
+                        <field name="period_id" select="1"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
@@ -186,7 +186,7 @@
                 </graph>
             </field>
          </record>
-        
+
         <!--  Receipt Vouchers -->
 <!--        <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">-->
 <!--            <field name="name">Sales Receipt</field>-->
@@ -255,7 +255,7 @@
 <!--        <menuitem action="action_cheque_register" -->
 <!--            id="menu_action_cheque_register" -->
 <!--            parent="account.menu_finance_receivables"/>-->
-        
+
 <!--        <record id="action_cheque_pay" model="ir.actions.act_window">-->
 <!--            <field name="name">Vendor Payment</field>-->
 <!--            <field name="type">ir.actions.act_window</field>-->
@@ -270,7 +270,7 @@
 <!--        <menuitem action="action_cheque_pay" -->
 <!--            id="menu_action_cheque_pay" -->
 <!--            parent="account.menu_finance_payables"/>-->
-        
+
 <!--        <record id="action_cheque_pay_voucher" model="ir.actions.act_window">-->
 <!--            <field name="name">Cheques</field>-->
 <!--            <field name="type">ir.actions.act_window</field>-->
@@ -285,7 +285,7 @@
 <!--        <menuitem action="action_cheque_pay_voucher" -->
 <!--            id="menu_action_cheque_pay_voucher" -->
 <!--            parent="account.menu_finance_bank_and_cash"/>-->
-        
+
         <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>
@@ -305,7 +305,7 @@
             context="{'journal_id': active_id, 'type':type}"
             res_model="account.voucher"
             src_model="account.journal"/>
-        
+
         <record model="ir.actions.act_window" id="action_review_voucher_list">
             <field name="name">Vouchers Entries</field>
             <field name="res_model">account.voucher</field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 9900a617595..cdc5aa2c6ba 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -13,7 +13,7 @@
                     <field name="date_value"/>
                     <field name="name"/>
                     <field name="ref"/>
-                    <field domain="[('type','=','normal')]" name="analytic_account" groups="base.group_extended"/>
+                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
                     <field name="unit_amount"/>
                     <field name="unit_quantity"/>
                     <field name="total_amount"/>
@@ -89,7 +89,7 @@
                                     <field name="unit_amount"/>
                                     <field name="ref"/>
                                     <field name="sequence" groups="base.group_extended"/>
-                                    <field domain="[('type','=','normal')]" name="analytic_account" groups="base.group_extended"/>
+                                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
                                     <newline/>
                                     <field name="total_amount"/>
                                 </form>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8c5eed3b720..89dc343ea6d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -252,7 +252,7 @@
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_extended"/>
+                            <field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
@@ -312,7 +312,7 @@
                             <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_extended"/>
+                            <field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 736a0712b53..c6b589145c7 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -13,7 +13,7 @@
                     <group colspan="4">
                         <field name="partner_id" required="1"/>
                         <field name="shop_id" required="1" widget="selection"/>
-                        <field name="analytic_account"/>
+                        <field name="analytic_account" domain="[('parent_id','!=',False)]" />
                         <field name="close" required="1"/>
                     	</group>
                             <field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">